diff options
author | Krzysztof Daniel | 2014-02-07 18:06:25 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2014-02-16 21:00:37 +0000 |
commit | beb7dfaa019b509869388fe2588411e28a13422e (patch) | |
tree | 35aa6899fd2f63e62041cf832930f3600d2237cc | |
parent | b087b40f8c839c12744439ac8a6ca945bae59035 (diff) | |
download | rt.equinox.p2-beb7dfaa019b509869388fe2588411e28a13422e.tar.gz rt.equinox.p2-beb7dfaa019b509869388fe2588411e28a13422e.tar.xz rt.equinox.p2-beb7dfaa019b509869388fe2588411e28a13422e.zip |
bug 419647: React to ECF feature restructuringI20140218-0800
Replaces direct inclusion of ECF bundles in P2 features with feature
inclusion.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=419647
Change-Id: Ie11ca39a3da89ad61fe54f8eff9d2e5f6dd55ebc
Signed-off-by: Krzysztof Daniel <krzysztof.daniel@gmail.com>
-rw-r--r-- | features/org.eclipse.equinox.p2.core.feature/feature.xml | 96 | ||||
-rw-r--r-- | features/org.eclipse.equinox.p2.core.feature/pom.xml | 5 | ||||
-rw-r--r-- | features/org.eclipse.equinox.p2.sdk/feature.xml | 183 | ||||
-rw-r--r-- | features/org.eclipse.equinox.p2.sdk/pom.xml | 5 |
4 files changed, 23 insertions, 266 deletions
diff --git a/features/org.eclipse.equinox.p2.core.feature/feature.xml b/features/org.eclipse.equinox.p2.core.feature/feature.xml index 634c8d333..0dc324d70 100644 --- a/features/org.eclipse.equinox.p2.core.feature/feature.xml +++ b/features/org.eclipse.equinox.p2.core.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.equinox.p2.core.feature" label="%featureName" - version="1.2.100.qualifier" + version="1.3.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.0.qualifier"> @@ -19,6 +19,14 @@ %license </license> + <requires> + <import feature="org.eclipse.ecf.core.ssl.feature" version="1.0.0" match="compatible"/> + <import feature="org.eclipse.ecf.filetransfer.feature" version="3.9.0" match="compatible"/> + <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.8.0" match="compatible"/> + <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" version="1.0.0" match="compatible"/> + <import feature="org.eclipse.ecf.filetransfer.ssl.feature" version="1.0.0" match="compatible"/> + </requires> + <plugin id="org.eclipse.equinox.p2.artifact.repository" download-size="0" @@ -118,64 +126,6 @@ unpack="false"/> <plugin - id="org.eclipse.ecf" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.filetransfer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.identity" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.ssl" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.ssl" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.apache.commons.codec" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.logging" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.frameworkadmin" download-size="0" install-size="0" @@ -260,32 +210,4 @@ fragment="true" unpack="false"/> - <plugin - id="org.eclipse.ecf.provider.filetransfer.httpclient4" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpclient" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpcore" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> </feature> diff --git a/features/org.eclipse.equinox.p2.core.feature/pom.xml b/features/org.eclipse.equinox.p2.core.feature/pom.xml index 84df75c60..f5d40c342 100644 --- a/features/org.eclipse.equinox.p2.core.feature/pom.xml +++ b/features/org.eclipse.equinox.p2.core.feature/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012,2014 Eclipse Foundation. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ Contributors: Igor Fedorenko - initial implementation + Krzysztof Daniel - 419647: React to ECF feature restructuring --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -19,7 +20,7 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.core.feature</artifactId> - <version>1.2.100-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> diff --git a/features/org.eclipse.equinox.p2.sdk/feature.xml b/features/org.eclipse.equinox.p2.sdk/feature.xml index cde705d4b..17eea2492 100644 --- a/features/org.eclipse.equinox.p2.sdk/feature.xml +++ b/features/org.eclipse.equinox.p2.sdk/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.equinox.p2.sdk" label="%featureName" - version="3.8.100.qualifier" + version="3.9.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.0.qualifier"> @@ -19,37 +19,13 @@ %license </license> - <includes - id="org.eclipse.equinox.p2.discovery.feature" - version="0.0.0"/> - - <plugin - id="org.apache.commons.codec" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.codec.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.logging" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.logging.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <includes id="org.eclipse.equinox.p2.discovery.feature" version="0.0.0"/> + <includes id="org.eclipse.equinox.p2.core.feature" version="0.0.0"/> + <includes id="org.eclipse.ecf.core.ssl.source.feature" version="0.0.0" /> + <includes id="org.eclipse.ecf.filetransfer.source.feature" version="0.0.0" /> + <includes id="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="0.0.0" /> + <includes id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="0.0.0" /> + <includes id="org.eclipse.ecf.filetransfer.ssl.source.feature" version="0.0.0" /> <plugin id="org.eclipse.equinox.p2.artifact.repository" @@ -430,92 +406,6 @@ unpack="false"/> <plugin - id="org.eclipse.ecf" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.filetransfer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.filetransfer.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.identity" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.identity.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.ssl" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.ssl.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.ssl" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.ssl.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.simpleconfigurator" download-size="0" install-size="0" @@ -635,63 +525,6 @@ unpack="false"/> <plugin - id="org.eclipse.ecf.provider.filetransfer.httpclient4" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.httpclient4.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpclient" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpclient.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpcore" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpcore.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.p2.discovery.source" download-size="0" install-size="0" diff --git a/features/org.eclipse.equinox.p2.sdk/pom.xml b/features/org.eclipse.equinox.p2.sdk/pom.xml index 28201771a..c99ffaa5a 100644 --- a/features/org.eclipse.equinox.p2.sdk/pom.xml +++ b/features/org.eclipse.equinox.p2.sdk/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012,2014 Eclipse Foundation. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ Contributors: Igor Fedorenko - initial implementation + Krzysztof Daniel - 419647: React to ECF feature restructuring --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -19,6 +20,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.sdk</artifactId> - <version>3.8.100-SNAPSHOT</version> + <version>3.9.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> |