Fix: Include parent pom when building a maven repository
When creating a maven repository, it is necessary to include the parent
pom into the set of artifacts. We therefore include
org.eclipse:org.eclipse.gemini.dbaccess.parent
Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=391632
Change-Id: I6d611ceed3c7e3d8b734f5dcda9854a1b4606825
Signed-off-by: Juergen G. Kissner <juergen.kissner@sap.com>
diff --git a/derby/org.apache.derby/pom.xml b/derby/org.apache.derby/pom.xml
index 88d895e..02c7f59 100644
--- a/derby/org.apache.derby/pom.xml
+++ b/derby/org.apache.derby/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
diff --git a/derby/org.eclipse.gemini.dbaccess.derby/pom.xml b/derby/org.eclipse.gemini.dbaccess.derby/pom.xml
index 6ccf258..95ac788 100644
--- a/derby/org.eclipse.gemini.dbaccess.derby/pom.xml
+++ b/derby/org.eclipse.gemini.dbaccess.derby/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
diff --git a/gemini.dbaccess.feature/pom.xml b/gemini.dbaccess.feature/pom.xml
index dc5d2f6..e4790ad 100644
--- a/gemini.dbaccess.feature/pom.xml
+++ b/gemini.dbaccess.feature/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
@@ -26,4 +26,12 @@
<artifactId>org.eclipse.gemini.dbaccess.feature</artifactId>
<packaging>eclipse-feature</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
+
</project>
diff --git a/gemini.dbaccess.h2.feature/pom.xml b/gemini.dbaccess.h2.feature/pom.xml
index 5bc96d8..27c38d9 100644
--- a/gemini.dbaccess.h2.feature/pom.xml
+++ b/gemini.dbaccess.h2.feature/pom.xml
@@ -18,12 +18,19 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
<artifactId>org.eclipse.gemini.dbaccess.h2.feature</artifactId>
<packaging>eclipse-feature</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/gemini.dbaccess.hsqldb.feature/pom.xml b/gemini.dbaccess.hsqldb.feature/pom.xml
index 5c7145c..ca6f8dd 100644
--- a/gemini.dbaccess.hsqldb.feature/pom.xml
+++ b/gemini.dbaccess.hsqldb.feature/pom.xml
@@ -18,12 +18,19 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
<artifactId>org.eclipse.gemini.dbaccess.hsqldb.feature</artifactId>
<packaging>eclipse-feature</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/gemini.dbaccess.mysql.feature/pom.xml b/gemini.dbaccess.mysql.feature/pom.xml
index 0ec2ac5..e59525e 100644
--- a/gemini.dbaccess.mysql.feature/pom.xml
+++ b/gemini.dbaccess.mysql.feature/pom.xml
@@ -18,11 +18,18 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
<artifactId>org.eclipse.gemini.dbaccess.mysql.feature</artifactId>
<packaging>eclipse-feature</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/gemini.dbaccess.targetdef/pom.xml b/gemini.dbaccess.targetdef/pom.xml
index 707ad9a..54eb0da 100644
--- a/gemini.dbaccess.targetdef/pom.xml
+++ b/gemini.dbaccess.targetdef/pom.xml
@@ -15,13 +15,20 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
<artifactId>org.eclipse.gemini.dbaccess.targetdef</artifactId>
<packaging>pom</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
<build>
<plugins>
diff --git a/gemini.dbaccess.updatesite/pom.xml b/gemini.dbaccess.updatesite/pom.xml
index 6765624..4e9fb3a 100644
--- a/gemini.dbaccess.updatesite/pom.xml
+++ b/gemini.dbaccess.updatesite/pom.xml
@@ -5,12 +5,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
<artifactId>org.eclipse.gemini.dbaccess.updatesite</artifactId>
<packaging>eclipse-update-site</packaging>
-
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
\ No newline at end of file
diff --git a/h2/org.eclipse.gemini.dbaccess.h2/pom.xml b/h2/org.eclipse.gemini.dbaccess.h2/pom.xml
index eb842a1..580bafe 100644
--- a/h2/org.eclipse.gemini.dbaccess.h2/pom.xml
+++ b/h2/org.eclipse.gemini.dbaccess.h2/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
diff --git a/h2/org.h2/pom.xml b/h2/org.h2/pom.xml
index 50b3a55..932712b 100644
--- a/h2/org.h2/pom.xml
+++ b/h2/org.h2/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
@@ -26,4 +26,11 @@
<artifactId>org.h2</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/hsqldb/org.eclipse.gemini.dbaccess.hsqldb/pom.xml b/hsqldb/org.eclipse.gemini.dbaccess.hsqldb/pom.xml
index a32ec70..50a3431 100644
--- a/hsqldb/org.eclipse.gemini.dbaccess.hsqldb/pom.xml
+++ b/hsqldb/org.eclipse.gemini.dbaccess.hsqldb/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
diff --git a/hsqldb/org.hsqldb/pom.xml b/hsqldb/org.hsqldb/pom.xml
index 34da9b9..b9ed260 100644
--- a/hsqldb/org.hsqldb/pom.xml
+++ b/hsqldb/org.hsqldb/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
@@ -26,4 +26,11 @@
<artifactId>org.hsqldb</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/mvn_parent/pom.xml b/mvn_parent/pom.xml
index d73df1c..5912f03 100644
--- a/mvn_parent/pom.xml
+++ b/mvn_parent/pom.xml
@@ -20,7 +20,7 @@
</prerequisites>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -29,7 +29,7 @@
<properties>
<tycho-version>0.12.0</tycho-version>
<repositorylocation>target/maven_repository</repositorylocation>
- <skip-deploy>true</skip-deploy>
+ <skip-deploy>false</skip-deploy>
</properties>
<modules>
@@ -73,7 +73,7 @@
<!-- The deploy step is not used by Tycho. However, when mvn
deploy is called in order to build maven repository, we do not want to include
- the feature artefact in the maven repository. Therefore the "skip" is used"
+ the feature artifact in the maven repository. Therefore the "skip" is used"
-->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
diff --git a/mysql/com.mysql.jdbc/pom.xml b/mysql/com.mysql.jdbc/pom.xml
index 6a24ac3..181cb47 100644
--- a/mysql/com.mysql.jdbc/pom.xml
+++ b/mysql/com.mysql.jdbc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
@@ -25,4 +25,12 @@
<artifactId>com.mysql.jdbc</artifactId>
<version>0.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/mysql/org.eclipse.gemini.dbaccess.mysql/pom.xml b/mysql/org.eclipse.gemini.dbaccess.mysql/pom.xml
index 1443c06..b63ae8c 100644
--- a/mysql/org.eclipse.gemini.dbaccess.mysql/pom.xml
+++ b/mysql/org.eclipse.gemini.dbaccess.mysql/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
diff --git a/org.eclipse.gemini.dbaccess.util/pom.xml b/org.eclipse.gemini.dbaccess.util/pom.xml
index fbb87ba..40d61e8 100644
--- a/org.eclipse.gemini.dbaccess.util/pom.xml
+++ b/org.eclipse.gemini.dbaccess.util/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
diff --git a/osgi.enterprise/pom.xml b/osgi.enterprise/pom.xml
index b89cd7e..9a5f7e1 100644
--- a/osgi.enterprise/pom.xml
+++ b/osgi.enterprise/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../mvn_parent</relativePath>
</parent>
@@ -27,4 +27,12 @@
<artifactId>osgi.enterprise</artifactId>
<version>4.2.0.201003190513</version>
<packaging>eclipse-plugin</packaging>
+
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/samples/org.eclipse.gemini.dbaccess.samples/pom.xml b/samples/org.eclipse.gemini.dbaccess.samples/pom.xml
index 10c6039..04352bf 100644
--- a/samples/org.eclipse.gemini.dbaccess.samples/pom.xml
+++ b/samples/org.eclipse.gemini.dbaccess.samples/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
@@ -26,4 +26,11 @@
<artifactId>org.eclipse.gemini.dbaccess.samples</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
diff --git a/test/org.eclipse.gemini.dbaccess.test/pom.xml b/test/org.eclipse.gemini.dbaccess.test/pom.xml
index 5996a57..57d87c3 100644
--- a/test/org.eclipse.gemini.dbaccess.test/pom.xml
+++ b/test/org.eclipse.gemini.dbaccess.test/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.eclipse</groupId>
- <artifactId>gemini.dbaccess.parent</artifactId>
+ <artifactId>org.eclipse.gemini.dbaccess.parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../mvn_parent</relativePath>
</parent>
@@ -48,4 +48,11 @@
</plugins>
</build>
+ <!-- This properties is not used by Tycho. It is used to include this project
+ into the maven repository when mvn deploy is called. The parent pom contains
+ the default value.
+ -->
+ <properties>
+ <skip-deploy>true</skip-deploy>
+ </properties>
</project>
