From ac5a0fc4ac53fe300c6a74a013d2671988201f3c Mon Sep 17 00:00:00 2001
From: Pascal Rapicault (Ericsson)
Date: Wed, 21 Nov 2012 11:37:20 -0500
Subject: Re-enable p2 build to work standalone

---
 .../pom.xml                                        |  2 +-
 bundles/org.eclipse.equinox.frameworkadmin/pom.xml |  2 +-
 bundles/org.eclipse.equinox.p2.core/pom.xml        |  2 +-
 .../org.eclipse.equinox.p2.jarprocessor/pom.xml    |  2 +-
 .../build.properties                               |  7 ++--
 bundles/org.eclipse.equinox.p2.metadata/pom.xml    |  2 +-
 .../build.properties                               |  3 +-
 bundles/org.eclipse.equinox.p2.ql/build.properties | 15 ++------
 .../pom.xml                                        |  2 +-
 bundles/org.eclipse.equinox.p2.repository/pom.xml  |  2 +-
 bundles/org.eclipse.equinox.p2.tests/pom.xml       | 44 +++++++++++-----------
 .../pom.xml                                        |  2 +-
 .../pom.xml                                        |  2 +-
 bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml      |  2 +-
 .../org.eclipse.equinox.simpleconfigurator/pom.xml |  2 +-
 15 files changed, 40 insertions(+), 51 deletions(-)

(limited to 'bundles')

diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
index 1a61df72c..0ba20869d 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.frameworkadmin.equinox</artifactId>
-  <version>1.0.400-SNAPSHOT</version>
+  <version>1.0.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
index b7771f242..3647f1c7c 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.frameworkadmin</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.core/pom.xml b/bundles/org.eclipse.equinox.p2.core/pom.xml
index 6714ce8df..75b19cc6c 100644
--- a/bundles/org.eclipse.equinox.p2.core/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.core/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.p2.core</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml b/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
index 3c3d615ad..987124c33 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.p2.jarprocessor</artifactId>
-  <version>1.0.200-SNAPSHOT</version>
+  <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.metadata/build.properties b/bundles/org.eclipse.equinox.p2.metadata/build.properties
index 4cccd09dd..8c846e50c 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/build.properties
+++ b/bundles/org.eclipse.equinox.p2.metadata/build.properties
@@ -7,15 +7,14 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Ericsson AB (Pascal Rapicault) - enable standalone p2 build
 ###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               plugin.properties,\
-               OSGI-INF/
-src.includes = about.html,\
-               OSGI-INF/
+               plugin.properties
+src.includes = about.html
 javacTarget=jsr14
 javacSource=1.5
diff --git a/bundles/org.eclipse.equinox.p2.metadata/pom.xml b/bundles/org.eclipse.equinox.p2.metadata/pom.xml
index cd7520012..52f187087 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.p2.metadata</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.publisher/build.properties b/bundles/org.eclipse.equinox.p2.publisher/build.properties
index 719d06a48..e4f241449 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/build.properties
+++ b/bundles/org.eclipse.equinox.p2.publisher/build.properties
@@ -7,6 +7,7 @@
 # 
 #  Contributors:
 #      EclipseSource - initial API and implementation
+#      Ericsson AB (Pascal Rapicault) - enable standalone p2 build
 ###############################################################################
 source.. = src/
 output.. = bin/
@@ -15,9 +16,7 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                profiles/,\
-               plugin.xml,\
                plugin.properties
-src.includes = about.html
 javacWarnings..=+unusedThrown
 javacTarget=jsr14
 javacSource=1.5
diff --git a/bundles/org.eclipse.equinox.p2.ql/build.properties b/bundles/org.eclipse.equinox.p2.ql/build.properties
index 9c67d204e..9d4334c4e 100644
--- a/bundles/org.eclipse.equinox.p2.ql/build.properties
+++ b/bundles/org.eclipse.equinox.p2.ql/build.properties
@@ -7,24 +7,15 @@
 #
 # Contributors:
 #     Cloudsmith Inc. - initial API and implementation
+#     Ericsson AB (Pascal Rapicault) - enable standalone p2 build
 ###############################################################################
-
-# <copyright>
-# </copyright>
-#
-# $Id: build.properties,v 1.4 2010/02/19 12:13:14 thallgren Exp $
-
 bin.includes = .,\
                META-INF/,\
                plugin.properties,\
-               about.html,\
-               OSGI-INF/
-jars.compile.order = .
+               about.html
 source.. = src/
 output.. = bin/
 src.includes = about.html,\
-               model/,\
-               OSGI-INF/
+               model/
 javacTarget=jsr14
-javacSource=1.5
 javacWarnings..=+fieldHiding
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
index aee714568..86f5775bd 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
-  <version>2.0.100-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.repository/pom.xml b/bundles/org.eclipse.equinox.p2.repository/pom.xml
index fbce7c397..29dcb5ca2 100644
--- a/bundles/org.eclipse.equinox.p2.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.p2.repository</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index e70df7134..c92785f1c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -24,7 +24,7 @@
 
 	<groupId>org.eclipse</groupId>
 	<artifactId>org.eclipse.equinox.p2.tests</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<properties>
@@ -34,27 +34,27 @@
 	<build>
 		<plugins>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<configuration>
-						<target>
-			                <ant antfile="${basedir}/download.eclipse.platform.for.p2.migration.tests.xml">
-			                  <target name="download.eclipse.platform"/>
-			                </ant>
-			              </target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-antrun-plugin</artifactId> -->
+<!-- 				<version>1.6</version> -->
+<!-- 				<executions> -->
+<!-- 					<execution> -->
+<!-- 						<id>compile</id> -->
+<!-- 						<phase>compile</phase> -->
+<!-- 						<configuration> -->
+<!-- 						<target> -->
+<!-- 			                <ant antfile="${basedir}/download.eclipse.platform.for.p2.migration.tests.xml"> -->
+<!-- 			                  <target name="download.eclipse.platform"/> -->
+<!-- 			                </ant> -->
+<!-- 			              </target> -->
+<!-- 						</configuration> -->
+<!-- 						<goals> -->
+<!-- 							<goal>run</goal> -->
+<!-- 						</goals> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 			</plugin> -->
 
 
 			<plugin>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
index e6bc134b6..4ea094139 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.p2.touchpoint.eclipse</artifactId>
-  <version>2.1.100-SNAPSHOT</version>
+  <version>2.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
index e626031ed..53bfcdfe4 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.p2.touchpoint.natives</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
index d00a1e133..e2d39e356 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
@@ -11,6 +11,6 @@
 	</parent>
 	<groupId>org.eclipse</groupId>
 	<artifactId>org.eclipse.equinox.p2.ui.sdk</artifactId>
-	<version>1.0.200-SNAPSHOT</version>
+	<version>1.0.300-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
index 58ec924ca..0f43dca1b 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse</groupId>
   <artifactId>org.eclipse.equinox.simpleconfigurator</artifactId>
-  <version>1.0.300-SNAPSHOT</version>
+  <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
-- 
cgit v1.2.1