Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2014-12-13 01:39:37 +0000
committerMarkus Knauer2014-12-15 22:52:52 +0000
commitc880263dcd06c5f8bc9aac87e96c589b124c1ae0 (patch)
tree6b28896948298404881fffa68363e7caea02f8c0 /packages
parent50f9b36ffbf3eb45bec6bc146e967948cad779e3 (diff)
downloadorg.eclipse.epp.packages-c880263dcd06c5f8bc9aac87e96c589b124c1ae0.tar.gz
org.eclipse.epp.packages-c880263dcd06c5f8bc9aac87e96c589b124c1ae0.tar.xz
org.eclipse.epp.packages-c880263dcd06c5f8bc9aac87e96c589b124c1ae0.zip
Use Tycho for creating the package archives including symbolic links
- Revert the change that used to be required to fix bug 424769 with symbolic links in tar archives. - Update to Tycho to 0.23.0-SNAPSHOT (temporary solution). - Use maven-antrun-plugin for copying the artifacts. Bug 455101: Use tycho zipping feature instead of createArchive.sh script https://bugs.eclipse.org/bugs/show_bug.cgi?id=455101 Signed-off-by: Pascal Rapicault <pascal@rapicorp.com> Change-Id: I7467f450af212b00a04b002fbe25919b994756e1
Diffstat (limited to 'packages')
-rw-r--r--packages/org.eclipse.epp.package.automotive.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.automotive.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.committers.feature/p2.inf3
-rw-r--r--packages/org.eclipse.epp.package.committers.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.cpp.feature/p2.inf2
-rw-r--r--packages/org.eclipse.epp.package.cpp.product/pom.xml58
-rw-r--r--packages/org.eclipse.epp.package.dsl.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.dsl.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.java.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.java.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.jee.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.jee.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.modeling.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.modeling.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.parallel.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.parallel.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.php.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.php.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.rcp.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.rcp.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.reporting.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.reporting.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.scout.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.scout.product/pom.xml57
-rw-r--r--packages/org.eclipse.epp.package.testing.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.testing.product/pom.xml57
26 files changed, 62 insertions, 729 deletions
diff --git a/packages/org.eclipse.epp.package.automotive.feature/p2.inf b/packages/org.eclipse.epp.package.automotive.feature/p2.inf
index 658d1fbd..d19b4101 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.automotive.feature/p2.inf
@@ -7,5 +7,5 @@ requires.1.name=org.eclipse.platform.ide
#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.automotive.product/pom.xml b/packages/org.eclipse.epp.package.automotive.product/pom.xml
index 0be77007..69768e4c 100644
--- a/packages/org.eclipse.epp.package.automotive.product/pom.xml
+++ b/packages/org.eclipse.epp.package.automotive.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.committers.feature/p2.inf b/packages/org.eclipse.epp.package.committers.feature/p2.inf
index e2db9686..f7a855c9 100644
--- a/packages/org.eclipse.epp.package.committers.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.committers.feature/p2.inf
@@ -19,5 +19,4 @@ properties.1.value=false
#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
diff --git a/packages/org.eclipse.epp.package.committers.product/pom.xml b/packages/org.eclipse.epp.package.committers.product/pom.xml
index 15979e5b..cb6411ce 100644
--- a/packages/org.eclipse.epp.package.committers.product/pom.xml
+++ b/packages/org.eclipse.epp.package.committers.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/p2.inf b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
index fac46f8b..827da8e6 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
@@ -82,5 +82,3 @@ requires.17.namespace=org.eclipse.equinox.p2.iu
requires.17.name=org.eclipse.linuxtools.lttng2.ust.feature.group
requires.17.optional=true
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
diff --git a/packages/org.eclipse.epp.package.cpp.product/pom.xml b/packages/org.eclipse.epp.package.cpp.product/pom.xml
index a3d004c3..808838e8 100644
--- a/packages/org.eclipse.epp.package.cpp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp.product/pom.xml
@@ -64,70 +64,18 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/p2.inf b/packages/org.eclipse.epp.package.dsl.feature/p2.inf
index 97971d0c..0035aebb 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.dsl.feature/p2.inf
@@ -7,5 +7,5 @@ requires.1.name=org.eclipse.platform.ide
requires.1.greedy=true
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.dsl.product/pom.xml b/packages/org.eclipse.epp.package.dsl.product/pom.xml
index 5d4f7102..b1907f30 100644
--- a/packages/org.eclipse.epp.package.dsl.product/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.java.feature/p2.inf b/packages/org.eclipse.epp.package.java.feature/p2.inf
index faa61eab..19d9014a 100644
--- a/packages/org.eclipse.epp.package.java.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.java.feature/p2.inf
@@ -16,5 +16,5 @@ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http$
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars);
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.java.product/pom.xml b/packages/org.eclipse.epp.package.java.product/pom.xml
index 24851f21..fe04462c 100644
--- a/packages/org.eclipse.epp.package.java.product/pom.xml
+++ b/packages/org.eclipse.epp.package.java.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.jee.feature/p2.inf b/packages/org.eclipse.epp.package.jee.feature/p2.inf
index 17eb7bd3..b85acde5 100644
--- a/packages/org.eclipse.epp.package.jee.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.feature/p2.inf
@@ -19,5 +19,5 @@ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http$
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars);\
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars);
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.jee.product/pom.xml b/packages/org.eclipse.epp.package.jee.product/pom.xml
index 6177b3a5..a7da537b 100644
--- a/packages/org.eclipse.epp.package.jee.product/pom.xml
+++ b/packages/org.eclipse.epp.package.jee.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/p2.inf b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
index e65b951e..3bbc9ede 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
@@ -7,8 +7,8 @@ requires.1.name=org.eclipse.platform.ide
#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
instructions.configure=\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/mars/,name:Modeling Package Updates for Eclipse Mars);\
diff --git a/packages/org.eclipse.epp.package.modeling.product/pom.xml b/packages/org.eclipse.epp.package.modeling.product/pom.xml
index 9a538cdf..c355fb73 100644
--- a/packages/org.eclipse.epp.package.modeling.product/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/p2.inf b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
index 502df24b..bbc151cf 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
@@ -27,5 +27,5 @@ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http$
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/ptp/updates/mars);
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.parallel.product/pom.xml b/packages/org.eclipse.epp.package.parallel.product/pom.xml
index 6deb10de..86319f5a 100644
--- a/packages/org.eclipse.epp.package.parallel.product/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.php.feature/p2.inf b/packages/org.eclipse.epp.package.php.feature/p2.inf
index 95044a30..3adb1b4e 100644
--- a/packages/org.eclipse.epp.package.php.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.php.feature/p2.inf
@@ -19,7 +19,7 @@ properties.1.value=false
#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.php.product/pom.xml b/packages/org.eclipse.epp.package.php.product/pom.xml
index cff1e107..2763b3ce 100644
--- a/packages/org.eclipse.epp.package.php.product/pom.xml
+++ b/packages/org.eclipse.epp.package.php.product/pom.xml
@@ -67,66 +67,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/p2.inf b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
index 95044a30..3adb1b4e 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
@@ -19,7 +19,7 @@ properties.1.value=false
#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);\
#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.rcp.product/pom.xml b/packages/org.eclipse.epp.package.rcp.product/pom.xml
index b4815a6d..4d5e4467 100644
--- a/packages/org.eclipse.epp.package.rcp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/p2.inf b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
index 658d1fbd..d19b4101 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
@@ -7,5 +7,5 @@ requires.1.name=org.eclipse.platform.ide
#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.reporting.product/pom.xml b/packages/org.eclipse.epp.package.reporting.product/pom.xml
index 539e874e..af37c171 100644
--- a/packages/org.eclipse.epp.package.reporting.product/pom.xml
+++ b/packages/org.eclipse.epp.package.reporting.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.scout.feature/p2.inf b/packages/org.eclipse.epp.package.scout.feature/p2.inf
index eca5871c..fe70b978 100644
--- a/packages/org.eclipse.epp.package.scout.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.scout.feature/p2.inf
@@ -20,5 +20,5 @@ properties.1.value=false
#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/mars/);
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.scout.product/pom.xml b/packages/org.eclipse.epp.package.scout.product/pom.xml
index d027d545..f95b12cb 100644
--- a/packages/org.eclipse.epp.package.scout.product/pom.xml
+++ b/packages/org.eclipse.epp.package.scout.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>
diff --git a/packages/org.eclipse.epp.package.testing.feature/p2.inf b/packages/org.eclipse.epp.package.testing.feature/p2.inf
index 8344878b..6d7f0ad0 100644
--- a/packages/org.eclipse.epp.package.testing.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.testing.feature/p2.inf
@@ -28,5 +28,5 @@ properties.1.value=false
-properties.0.name = org.eclipse.equinox.p2.type.product
-properties.0.value = true
+
+
diff --git a/packages/org.eclipse.epp.package.testing.product/pom.xml b/packages/org.eclipse.epp.package.testing.product/pom.xml
index 953965e9..9a4de4f2 100644
--- a/packages/org.eclipse.epp.package.testing.product/pom.xml
+++ b/packages/org.eclipse.epp.package.testing.product/pom.xml
@@ -68,66 +68,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <products>
- <product>
- <id>${project.artifactId}</id>
- <rootFolder>eclipse</rootFolder>
- </product>
- </products>
- <profile>${project.artifactId}</profile>
- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>archiving</id>
- <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash -->
- <activation>
- <activeByDefault>false</activeByDefault>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable>
- <arguments>
- <argument>${eclipse.epp.archiveDirectory}</argument>
- <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument>
- <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>eclipse-sign-mac</id>
<build>
<plugins>

Back to the top