diff options
43 files changed, 104 insertions, 48 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml index 3ee50ae1b..b8cb5b78e 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.frameworkadmin.equinox</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml index 14275340c..c21afaa4e 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId> - <version>1.1.0.qualifier</version> + <version>1.1.100.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.console/pom.xml b/bundles/org.eclipse.equinox.p2.console/pom.xml index f1d09e28e..c8e949b1d 100644 --- a/bundles/org.eclipse.equinox.p2.console/pom.xml +++ b/bundles/org.eclipse.equinox.p2.console/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.console</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</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 037ea71af..1135dcf35 100644 --- a/bundles/org.eclipse.equinox.p2.core/pom.xml +++ b/bundles/org.eclipse.equinox.p2.core/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.core</artifactId> - <version>2.0.0.qualifier</version> + <version>2.1.0.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.director.app/pom.xml b/bundles/org.eclipse.equinox.p2.director.app/pom.xml index 4451f7ce6..aaa8792da 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/pom.xml +++ b/bundles/org.eclipse.equinox.p2.director.app/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.director.app</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.director/pom.xml b/bundles/org.eclipse.equinox.p2.director/pom.xml index 5c1fd845c..f9a289b15 100644 --- a/bundles/org.eclipse.equinox.p2.director/pom.xml +++ b/bundles/org.eclipse.equinox.p2.director/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.director</artifactId> - <version>2.0.0.qualifier</version> + <version>2.1.0.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml index aa29c9b7a..602e8d4be 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.directorywatcher</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml index 4b043d736..fa2482274 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.discovery.compatiblity</artifactId> - <version>1.0.0.qualifier</version> + <version>1.0.1.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.discovery/pom.xml index e306864d2..f0221f39b 100644 --- a/bundles/org.eclipse.equinox.p2.discovery/pom.xml +++ b/bundles/org.eclipse.equinox.p2.discovery/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.discovery</artifactId> - <version>1.0.0.qualifier</version> + <version>1.0.100.qualifier</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 e1e8b1367..a51bfb5d2 100644 --- a/bundles/org.eclipse.equinox.p2.engine/pom.xml +++ b/bundles/org.eclipse.equinox.p2.engine/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.engine</artifactId> - <version>2.0.100.qualifier</version> + <version>2.1.0.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml b/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml index 0f9c3a18b..2f15d23f5 100644 --- a/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml +++ b/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.extensionlocation</artifactId> - <version>1.2.0.qualifier</version> + <version>1.2.100.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml b/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml index 0633ff4ae..468b523fe 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.garbagecollector</artifactId> - <version>1.0.100.qualifier</version> + <version>1.0.200.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.installer/pom.xml b/bundles/org.eclipse.equinox.p2.installer/pom.xml index 929d3c928..aff45ec7c 100644 --- a/bundles/org.eclipse.equinox.p2.installer/pom.xml +++ b/bundles/org.eclipse.equinox.p2.installer/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.installer</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/pom.xml b/bundles/org.eclipse.equinox.p2.metadata.generator/pom.xml index 53585eb04..34a15d079 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/pom.xml +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.metadata.generator</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml index af77333e7..5533aaecc 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.metadata.repository</artifactId> - <version>1.1.0.qualifier</version> + <version>1.2.0.qualifier</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/bundles/org.eclipse.equinox.p2.metadata/pom.xml b/bundles/org.eclipse.equinox.p2.metadata/pom.xml index 7e143b390..133753926 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/pom.xml +++ b/bundles/org.eclipse.equinox.p2.metadata/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.metadata</artifactId> - <version>2.0.0.qualifier</version> + <version>2.1.0.qualifier</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 961f543ed..5277c335a 100644 --- a/bundles/org.eclipse.equinox.p2.operations/pom.xml +++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.operations</artifactId> - <version>2.0.0.qualifier</version> + <version>2.1.0.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.ql/pom.xml b/bundles/org.eclipse.equinox.p2.ql/pom.xml index cffd94b54..af8396b14 100644 --- a/bundles/org.eclipse.equinox.p2.ql/pom.xml +++ b/bundles/org.eclipse.equinox.p2.ql/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.ql</artifactId> - <version>2.0.0.qualifier</version> + <version>2.0.100.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml index cbea1abdd..a18645175 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml +++ b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.repository.tools</artifactId> - <version>2.0.0.qualifier</version> + <version>2.0.100.qualifier</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 3e15abe1c..df8ce6caf 100644 --- a/bundles/org.eclipse.equinox.p2.repository/pom.xml +++ b/bundles/org.eclipse.equinox.p2.repository/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.repository</artifactId> - <version>2.0.0.qualifier</version> + <version>2.1.0.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF index 69950b7ef..a79e57f79 100644 --- a/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Sar Plug-in Bundle-SymbolicName: org.eclipse.equinox.p2.sar;singleton:=true -Bundle-Version: 0.1.0 +Bundle-Version: 0.1.0.qualifier Import-Package: org.osgi.framework;version="1.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.4, diff --git a/bundles/org.eclipse.equinox.p2.sar/pom.xml b/bundles/org.eclipse.equinox.p2.sar/pom.xml index 1ae60841e..af9562d6d 100644 --- a/bundles/org.eclipse.equinox.p2.sar/pom.xml +++ b/bundles/org.eclipse.equinox.p2.sar/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.sar</artifactId> - <version>0.1.0</version> + <version>0.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml index e379caacc..01db2a5e6 100644 --- a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml +++ b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.tests.discovery</artifactId> - <version>3.4.0.qualifier</version> + <version>1.0.0.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml index 9dcaf0c0d..bb522f18e 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml +++ b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.tests.ui</artifactId> - <version>1.0.0.qualifier</version> + <version>1.0.100.qualifier</version> <packaging>eclipse-test-plugin</packaging> <build> diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml index 85e7d1869..4c2fdd0e2 100644 --- a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml +++ b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.tests.verifier</artifactId> - <version>1.0.0.qualifier</version> + <version>1.0.100.qualifier</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 df9cdf874..8e90ff9df 100644 --- a/bundles/org.eclipse.equinox.p2.tests/pom.xml +++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.tests</artifactId> - <version>1.2.0.qualifier</version> + <version>1.3.0.qualifier</version> <packaging>eclipse-test-plugin</packaging> <build> diff --git a/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF index 3e35f7599..f30b51f98 100644 --- a/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.testserver/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testserver Bundle-SymbolicName: org.eclipse.equinox.p2.testserver;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.equinox.p2.testserver.Activator Bundle-Vendor: Eclipse Bundle-RequiredExecutionEnvironment: J2SE-1.5, diff --git a/bundles/org.eclipse.equinox.p2.testserver/pom.xml b/bundles/org.eclipse.equinox.p2.testserver/pom.xml index c512ff098..2b76eed8b 100644 --- a/bundles/org.eclipse.equinox.p2.testserver/pom.xml +++ b/bundles/org.eclipse.equinox.p2.testserver/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.testserver</artifactId> - <version>1.0.0</version> + <version>1.0.0-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 1196437a4..a16ea9b8c 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.touchpoint.eclipse</artifactId> - <version>2.0.0.qualifier</version> + <version>2.1.0.qualifier</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 1d86bdb60..32cc7c5fe 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.touchpoint.natives</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml b/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml index c329656b1..68cd981f3 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml +++ b/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.ui.admin</artifactId> - <version>1.0.0.qualifier</version> + <version>1.0.100.qualifier</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 5689df805..9bc5d8131 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml +++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.ui.sdk.scheduler</artifactId> - <version>1.0.0.qualifier</version> + <version>1.0.100.qualifier</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 b57ed505e..283da57ea 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.ui.sdk</artifactId> - <version>1.0.100.qualifier</version> + <version>1.0.200.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.ui/pom.xml b/bundles/org.eclipse.equinox.p2.ui/pom.xml index f0b782eb6..dc127afdc 100644 --- a/bundles/org.eclipse.equinox.p2.ui/pom.xml +++ b/bundles/org.eclipse.equinox.p2.ui/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.ui</artifactId> - <version>2.0.0.qualifier</version> + <version>2.1.0.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml b/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml index fe21958bb..69b052792 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml +++ b/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.updatechecker</artifactId> - <version>1.1.100.qualifier</version> + <version>1.1.200.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.updatesite/pom.xml b/bundles/org.eclipse.equinox.p2.updatesite/pom.xml index 7bf1c8aa9..465e97f7a 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/pom.xml +++ b/bundles/org.eclipse.equinox.p2.updatesite/pom.xml @@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.updatesite</artifactId> - <version>1.0.200.qualifier</version> + <version>1.0.300.qualifier</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/features/org.eclipse.equinox.p2.core.feature/pom.xml b/features/org.eclipse.equinox.p2.core.feature/pom.xml new file mode 100644 index 000000000..77581179e --- /dev/null +++ b/features/org.eclipse.equinox.p2.core.feature/pom.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.equinox.p2-parent</artifactId> + <groupId>org.eclipse</groupId> + <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath> + </parent> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.equinox.p2.core.feature</artifactId> + <version>1.0.0.qualifier</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/features/org.eclipse.equinox.p2.discovery.feature/pom.xml b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml new file mode 100644 index 000000000..6e247e4b0 --- /dev/null +++ b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.equinox.p2-parent</artifactId> + <groupId>org.eclipse</groupId> + <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath> + </parent> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId> + <version>1.0.100.qualifier</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/features/org.eclipse.equinox.p2.extras.feature/feature.xml b/features/org.eclipse.equinox.p2.extras.feature/feature.xml index bb2a3c5d2..e6ca64df2 100644 --- a/features/org.eclipse.equinox.p2.extras.feature/feature.xml +++ b/features/org.eclipse.equinox.p2.extras.feature/feature.xml @@ -23,10 +23,6 @@ id="org.eclipse.equinox.p2.core.feature" version="0.0.0"/> - <requires> - <import feature="org.eclipse.equinox.core.feature" version="1.0.0" match="compatible"/> - </requires> - <plugin id="org.eclipse.equinox.p2.operations" download-size="0" diff --git a/features/org.eclipse.equinox.p2.extras.feature/pom.xml b/features/org.eclipse.equinox.p2.extras.feature/pom.xml new file mode 100644 index 000000000..02e40cb71 --- /dev/null +++ b/features/org.eclipse.equinox.p2.extras.feature/pom.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.equinox.p2-parent</artifactId> + <groupId>org.eclipse</groupId> + <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath> + </parent> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.equinox.p2.extras.feature</artifactId> + <version>1.0.0.qualifier</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/features/org.eclipse.equinox.p2.sdk/pom.xml b/features/org.eclipse.equinox.p2.sdk/pom.xml new file mode 100644 index 000000000..d53b10f0e --- /dev/null +++ b/features/org.eclipse.equinox.p2.sdk/pom.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.equinox.p2-parent</artifactId> + <groupId>org.eclipse</groupId> + <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath> + </parent> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.equinox.p2.sdk</artifactId> + <version>1.0.0.qualifier</version> + <packaging>eclipse-feature</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 8623236c5..e7da0c9d6 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 @@ -25,6 +25,7 @@ <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> @@ -32,6 +33,7 @@ <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> @@ -46,10 +48,13 @@ <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.ui</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.admin</module> <module>../org.eclipse.equinox.p2.ui.admin.rcp</module> @@ -58,7 +63,6 @@ <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.p2.user.ui</module> <module>../org.eclipse.equinox.simpleconfigurator</module> <module>../org.eclipse.equinox.simpleconfigurator.manipulator</module> </modules> diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml index 2da2b2c47..663aaf856 100644 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml +++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml @@ -13,13 +13,13 @@ <repository> <id>helios</id> <layout>p2</layout> - <url>http://download.eclipse.org/eclipse/updates/3.6-I-builds</url> - </repository> - <repository> - <id>galileoTest</id> - <layout>p2</layout> - <url>file:/Users/Pascal/Downloads/eclipse-testing/eclipse-junit-tests-I20100312-0800</url> + <url>http://download.eclipse.org/releases/indigo</url> </repository> +<!-- <repository>--> +<!-- <id>galileoTest</id>--> +<!-- <layout>p2</layout>--> +<!-- <url>file:/Users/Pascal/Downloads/eclipse-testing/eclipse-junit-tests-I20100312-0800</url>--> +<!-- </repository>--> </repositories> <build> |