summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Dahanne2011-08-11 22:57:44 (EDT)
committer Pascal Rapicault2011-08-12 04:52:19 (EDT)
commit9177c55c6f5e400de365bf0c3af44011f529b4a5 (patch)
tree2ea454f659cf5c70c13be05f133467118a1e3041
parent1129ce7ff65f371e6cc8e5ba0f28767e3be2ecb9 (diff)
downloadrt.equinox.p2-9177c55c6f5e400de365bf0c3af44011f529b4a5.zip
rt.equinox.p2-9177c55c6f5e400de365bf0c3af44011f529b4a5.tar.gz
rt.equinox.p2-9177c55c6f5e400de365bf0c3af44011f529b4a5.tar.bz2
304594 fixed versions in few poms to be consistent with Manifests, fixed relative paths, and imported org.eclipse.compare as packages for ui.sdk
Signed-off-by: Pascal Rapicault <pascal@sonatype.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.director/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/pom.xml2
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml102
11 files changed, 63 insertions, 62 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/pom.xml b/bundles/org.eclipse.equinox.p2.director/pom.xml
index 815cf67..a76faba 100644
--- a/bundles/org.eclipse.equinox.p2.director/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.director/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.director</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.engine/pom.xml b/bundles/org.eclipse.equinox.p2.engine/pom.xml
index 59f7f9f..7869ec9 100644
--- a/bundles/org.eclipse.equinox.p2.engine/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.engine/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.engine</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.operations/pom.xml b/bundles/org.eclipse.equinox.p2.operations/pom.xml
index 6044fe1..0ef6250 100644
--- a/bundles/org.eclipse.equinox.p2.operations/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.operations</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.reconciler.dropins/pom.xml b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
index ab9c41b..cf8e147 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.reconciler.dropins</artifactId>
- <version>1.1.100-SNAPSHOT</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
index 5cc0a36..e6bc134 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.0-SNAPSHOT</version>
+ <version>2.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
index b62b178..64d4bab 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.transport.ecf</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
index 3976c89..b727475 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.sdk.scheduler</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
index 36dcf11..7b0e33b 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
@@ -10,9 +10,10 @@ Export-Package: org.eclipse.equinox.internal.p2.ui.sdk;x-internal:=true,
org.eclipse.equinox.internal.p2.ui.sdk.prefs;x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.core.runtime,
- org.eclipse.equinox.p2.ui,
- org.eclipse.compare;resolution:=optional
+ org.eclipse.equinox.p2.ui
Import-Package: javax.xml.parsers,
+ org.eclipse.compare,
+ org.eclipse.compare.structuremergeviewer,
org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.engine;version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.engine.query;version="[2.0.0,3.0.0)",
diff --git a/bundles/org.eclipse.equinox.p2.ui/pom.xml b/bundles/org.eclipse.equinox.p2.ui/pom.xml
index 498dbf5..0e85873 100644
--- a/bundles/org.eclipse.equinox.p2.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui</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.simpleconfigurator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
index 0b91db6..58ec924 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.200-SNAPSHOT</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
index 3fc48ea..32655a5 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
@@ -15,56 +15,56 @@
<packaging>pom</packaging>
<modules>
- <module>../ie.wombat.jbdiff</module>
- <module>../ie.wombat.jbdiff.test</module>
- <module>../org.eclipse.equinox.frameworkadmin</module>
- <module>../org.eclipse.equinox.frameworkadmin.equinox</module>
- <module>../org.eclipse.equinox.frameworkadmin.test</module>
- <module>../org.eclipse.equinox.p2.artifact.optimizers</module>
- <module>../org.eclipse.equinox.p2.artifact.processors</module>
- <module>../org.eclipse.equinox.p2.artifact.repository</module>
- <module>../org.eclipse.equinox.p2.console</module>
- <module>../org.eclipse.equinox.p2.core</module>
- <module>../org.eclipse.equinox.p2.core.feature</module>
- <module>../org.eclipse.equinox.p2.director</module>
- <module>../org.eclipse.equinox.p2.director.app</module>
- <module>../org.eclipse.equinox.p2.directorywatcher</module>
- <module>../org.eclipse.equinox.p2.discovery</module>
- <module>../org.eclipse.equinox.p2.discovery.compatibility</module>
- <module>../org.eclipse.equinox.p2.engine</module>
- <module>../org.eclipse.equinox.p2.extensionlocation</module>
- <module>../org.eclipse.equinox.p2.extras.feature</module>
- <module>../org.eclipse.equinox.p2.garbagecollector</module>
- <module>../org.eclipse.equinox.p2.installer</module>
- <module>../org.eclipse.equinox.p2.jarprocessor</module>
- <module>../org.eclipse.equinox.p2.metadata</module>
- <module>../org.eclipse.equinox.p2.metadata.repository</module>
- <module>../org.eclipse.equinox.p2.operations</module>
- <module>../org.eclipse.equinox.p2.publisher</module>
- <module>../org.eclipse.equinox.p2.ql</module>
- <module>../org.eclipse.equinox.p2.reconciler.dropins</module>
- <module>../org.eclipse.equinox.p2.repository</module>
- <module>../org.eclipse.equinox.p2.repository.tools</module>
- <module>../org.eclipse.equinox.p2.sar</module>
-<!-- <module>../org.eclipse.equinox.p2.tests</module>-->
-<!-- <module>../org.eclipse.equinox.p2.tests.discovery</module>-->
-<!-- <module>../org.eclipse.equinox.p2.tests.ui</module>-->
-<!-- <module>../org.eclipse.equinox.p2.tests.verifier</module>-->
- <module>../org.eclipse.equinox.p2.testserver</module>
- <module>../org.eclipse.equinox.p2.touchpoint.eclipse</module>
- <module>../org.eclipse.equinox.p2.touchpoint.natives</module>
- <module>../org.eclipse.equinox.p2.transport.ecf</module>
- <module>../org.eclipse.equinox.p2.ui</module>
- <module>../org.eclipse.equinox.p2.ui.importexport</module>
- <module>../org.eclipse.equinox.p2.ui.admin</module>
- <module>../org.eclipse.equinox.p2.ui.admin.rcp</module>
- <module>../org.eclipse.equinox.p2.ui.discovery</module>
- <module>../org.eclipse.equinox.p2.ui.sdk</module>
- <module>../org.eclipse.equinox.p2.ui.sdk.scheduler</module>
- <module>../org.eclipse.equinox.p2.updatechecker</module>
- <module>../org.eclipse.equinox.p2.updatesite</module>
- <module>../org.eclipse.equinox.simpleconfigurator</module>
- <module>../org.eclipse.equinox.simpleconfigurator.manipulator</module>
- <module>../org.eclipse.equinox.p2.publisher.eclipse</module>
+ <module>../../bundles/ie.wombat.jbdiff</module>
+ <module>../../bundles/ie.wombat.jbdiff.test</module>
+ <module>../../bundles/org.eclipse.equinox.frameworkadmin</module>
+ <module>../../bundles/org.eclipse.equinox.frameworkadmin.equinox</module>
+ <module>../../bundles/org.eclipse.equinox.frameworkadmin.test</module>
+ <module>../../bundles/org.eclipse.equinox.p2.artifact.optimizers</module>
+ <module>../../bundles/org.eclipse.equinox.p2.artifact.processors</module>
+ <module>../../bundles/org.eclipse.equinox.p2.artifact.repository</module>
+ <module>../../bundles/org.eclipse.equinox.p2.console</module>
+ <module>../../bundles/org.eclipse.equinox.p2.core</module>
+ <module>../../features/org.eclipse.equinox.p2.core.feature</module>
+ <module>../../bundles/org.eclipse.equinox.p2.director</module>
+ <module>../../bundles/org.eclipse.equinox.p2.director.app</module>
+ <module>../../bundles/org.eclipse.equinox.p2.directorywatcher</module>
+ <module>../../bundles/org.eclipse.equinox.p2.discovery</module>
+ <module>../../bundles/org.eclipse.equinox.p2.discovery.compatibility</module>
+ <module>../../bundles/org.eclipse.equinox.p2.engine</module>
+ <module>../../bundles/org.eclipse.equinox.p2.extensionlocation</module>
+ <module>../../features/org.eclipse.equinox.p2.extras.feature</module>
+ <module>../../bundles/org.eclipse.equinox.p2.garbagecollector</module>
+ <module>../../bundles/org.eclipse.equinox.p2.installer</module>
+ <module>../../bundles/org.eclipse.equinox.p2.jarprocessor</module>
+ <module>../../bundles/org.eclipse.equinox.p2.metadata</module>
+ <module>../../bundles/org.eclipse.equinox.p2.metadata.repository</module>
+ <module>../../bundles/org.eclipse.equinox.p2.operations</module>
+ <module>../../bundles/org.eclipse.equinox.p2.publisher</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ql</module>
+ <module>../../bundles/org.eclipse.equinox.p2.reconciler.dropins</module>
+ <module>../../bundles/org.eclipse.equinox.p2.repository</module>
+ <module>../../bundles/org.eclipse.equinox.p2.repository.tools</module>
+ <module>../../bundles/org.eclipse.equinox.p2.sar</module>
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests</module>-->
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.discovery</module>-->
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.ui</module>-->
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.verifier</module>-->
+ <module>../../bundles/org.eclipse.equinox.p2.testserver</module>
+ <module>../../bundles/org.eclipse.equinox.p2.touchpoint.eclipse</module>
+ <module>../../bundles/org.eclipse.equinox.p2.touchpoint.natives</module>
+ <module>../../bundles/org.eclipse.equinox.p2.transport.ecf</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.importexport</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.admin</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.admin.rcp</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.discovery</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.sdk</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.sdk.scheduler</module>
+ <module>../../bundles/org.eclipse.equinox.p2.updatechecker</module>
+ <module>../../bundles/org.eclipse.equinox.p2.updatesite</module>
+ <module>../../bundles/org.eclipse.equinox.simpleconfigurator</module>
+ <module>../../bundles/org.eclipse.equinox.simpleconfigurator.manipulator</module>
+ <module>../../bundles/org.eclipse.equinox.p2.publisher.eclipse</module>
</modules>
</project>