Repository: stratos Updated Branches: refs/heads/master 8534d35ad -> 4118b564b
Improved pom structure in dependency wrappers, moved kernel dbscripts to CARBON_HOME/dbscripts Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4118b564 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4118b564 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4118b564 Branch: refs/heads/master Commit: 4118b564b33a7c466883c20e831ccbf7fff64003 Parents: 8534d35 Author: Akila Perera <[email protected]> Authored: Fri Aug 21 17:06:50 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Fri Aug 21 17:07:21 2015 +0530 ---------------------------------------------------------------------- dependencies/fabric8/kubernetes-api/pom.xml | 315 +++++++++---------- dependencies/fabric8/pom.xml | 8 +- dependencies/guice-assistedinject/pom.xml | 16 +- dependencies/guice-multibindings/pom.xml | 14 +- dependencies/guice/pom.xml | 14 +- dependencies/jclouds/cloudstack/pom.xml | 13 +- dependencies/jclouds/ec2/pom.xml | 15 +- .../google-cloud-storage/pom.xml | 14 +- .../google-compute-engine/pom.xml | 16 +- .../google-jclouds-labs/googlecloud/pom.xml | 16 +- .../jclouds/google-jclouds-labs/oauth/pom.xml | 14 +- .../jclouds/google-jclouds-labs/pom.xml | 3 +- dependencies/jclouds/jclouds-blobstore/pom.xml | 15 +- .../jclouds/jclouds-bouncycastle/pom.xml | 13 +- dependencies/jclouds/jclouds-compute/pom.xml | 19 +- dependencies/jclouds/jclouds-core/pom.xml | 13 +- dependencies/jclouds/jclouds-enterprise/pom.xml | 13 +- dependencies/jclouds/jclouds-joda/pom.xml | 13 +- dependencies/jclouds/jclouds-netty/pom.xml | 15 +- dependencies/jclouds/jclouds-sshj/pom.xml | 13 +- dependencies/jclouds/openstack-common/pom.xml | 13 +- dependencies/jclouds/openstack-keystone/pom.xml | 13 +- dependencies/jclouds/openstack-neutron/pom.xml | 13 +- dependencies/jclouds/openstack-nova/pom.xml | 13 +- dependencies/jclouds/pom.xml | 1 - dependencies/jclouds/sts/pom.xml | 13 +- dependencies/rocoto/pom.xml | 35 +-- dependencies/sshj/pom.xml | 17 +- pom.xml | 12 + .../modules/distribution/src/assembly/bin.xml | 41 ++- 30 files changed, 362 insertions(+), 381 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/fabric8/kubernetes-api/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml index 6c4ac71..4d2194a 100644 --- a/dependencies/fabric8/kubernetes-api/pom.xml +++ b/dependencies/fabric8/kubernetes-api/pom.xml @@ -16,165 +16,164 @@ permissions and limitations under the License. --> -<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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> +<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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-dependencies-fabric8</artifactId> + <version>4.1.2-SNAPSHOT</version> + </parent> - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependencies-fabric8</artifactId> - <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <artifactId>kubernetes-api</artifactId> + <packaging>bundle</packaging> + <name>Fabric8 :: Kubernetes API</name> + <description> + This is a wrapper bundle for Fabric8 Kubernetes API for exposing proper bundle import + & export statements and packaging apache cxf dependencies which cannot be imported into + carbon runtime as separate bundles at the moment. + </description> - <artifactId>kubernetes-api</artifactId> - <packaging>bundle</packaging> - <name>Fabric8 :: Kubernetes API</name> - <description> - This is a wrapper bundle for Fabric8 Kubernetes API for exposing proper bundle import - & export statements and packaging apache cxf dependencies which cannot be imported into - carbon runtime as separate bundles at the moment. - </description> + <dependencies> + <dependency> + <groupId>io.fabric8</groupId> + <artifactId>kubernetes-api</artifactId> + <version>${kubernetes.api.version}</version> + </dependency> + <dependency> + <groupId>io.fabric8</groupId> + <artifactId>cxf-utils</artifactId> + <version>${kubernetes.api.version}</version> + </dependency> + <dependency> + <groupId>io.fabric8</groupId> + <artifactId>kubernetes-model</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.12</version> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20140107</version> + </dependency> + <dependency> + <groupId>net.oauth.core</groupId> + <artifactId>oauth</artifactId> + <version>20100527</version> + </dependency> + <dependency> + <groupId>dnsjava</groupId> + <artifactId>dnsjava</artifactId> + <version>2.1.7</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-client</artifactId> + <version>9.1.5.v20140505</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>9.1.5.v20140505</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>9.1.5.v20140505</version> + </dependency> + <!-- testing --> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>1.7.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.7.12</version> + <scope>test</scope> + </dependency> + <!-- lets force the codegen to run first --> + <dependency> + <groupId>io.fabric8</groupId> + <artifactId>kubernetes-codegen</artifactId> + <version>${kubernetes.api.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <dependencies> - <dependency> - <groupId>io.fabric8</groupId> - <artifactId>kubernetes-api</artifactId> - <version>${kubernetes.api.version}</version> - </dependency> - <dependency> - <groupId>io.fabric8</groupId> - <artifactId>cxf-utils</artifactId> - <version>${kubernetes.api.version}</version> - </dependency> - <dependency> - <groupId>io.fabric8</groupId> - <artifactId>kubernetes-model</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.1</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>2.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.12</version> - </dependency> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20140107</version> - </dependency> - <dependency> - <groupId>net.oauth.core</groupId> - <artifactId>oauth</artifactId> - <version>20100527</version> - </dependency> - <dependency> - <groupId>dnsjava</groupId> - <artifactId>dnsjava</artifactId> - <version>2.1.7</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-client</artifactId> - <version>9.1.5.v20140505</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>9.1.5.v20140505</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>9.1.5.v20140505</version> - </dependency> - <!-- testing --> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <version>1.7.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.12</version> - <scope>test</scope> - </dependency> - <!-- lets force the codegen to run first --> - <dependency> - <groupId>io.fabric8</groupId> - <artifactId>kubernetes-codegen</artifactId> - <version>${kubernetes.api.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <version>2.3.7</version> - <configuration> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package> - io.fabric8.kubernetes.api.*;version=${kubernetes.api.version}, - io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version}, - io.fabric8.kubernetes.internal.*, - </Export-Package> - <Import-Package> - !javax.xml.bind.annotation.adapters, - org.osgi.framework, - *;resolution:=optional - </Import-Package> - <DynamicImport-Package>*</DynamicImport-Package> - <Embed-Dependency> - jackson-annotations,jackson-core,jackson-databind,jackson-jaxrs-base,jackson-jaxrs-json-provider, - jackson-module-jaxb-annotations,jackson-dataformat-yaml,javax.annotation-api,javax.ws.rs-api, - jetty-io,jetty-util,json,oauth,xmlschema-core,fabric8-utils,cxf-utils, - cxf-rt-rs-client,cxf-rt-transports-http,cxf-rt-frontend-jaxrs,cxf-core,dnsjava - </Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <executions> - <execution> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>io.fabric8.kubernetes.api.Example</mainClass> - <classpathScope>test</classpathScope> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <version>2.3.7</version> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Export-Package> + io.fabric8.kubernetes.api.*;version=${kubernetes.api.version}, + io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version}, + io.fabric8.kubernetes.internal.*, + </Export-Package> + <Import-Package> + !javax.xml.bind.annotation.adapters, + org.osgi.framework, + *;resolution:=optional + </Import-Package> + <DynamicImport-Package>*</DynamicImport-Package> + <Embed-Dependency> + jackson-annotations,jackson-core,jackson-databind,jackson-jaxrs-base,jackson-jaxrs-json-provider, + jackson-module-jaxb-annotations,jackson-dataformat-yaml,javax.annotation-api,javax.ws.rs-api, + jetty-io,jetty-util,json,oauth,xmlschema-core,fabric8-utils,cxf-utils, + cxf-rt-rs-client,cxf-rt-transports-http,cxf-rt-frontend-jaxrs,cxf-core,dnsjava + </Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>io.fabric8.kubernetes.api.Example</mainClass> + <classpathScope>test</classpathScope> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/fabric8/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/pom.xml b/dependencies/fabric8/pom.xml index 4667c82..7fcbd21 100644 --- a/dependencies/fabric8/pom.xml +++ b/dependencies/fabric8/pom.xml @@ -18,13 +18,12 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<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/maven-v4_0_0.xsd";> - +<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/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -50,5 +49,4 @@ </plugin> </plugins> </build> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/guice-assistedinject/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/guice-assistedinject/pom.xml b/dependencies/guice-assistedinject/pom.xml index 6f65a37..04da48c 100644 --- a/dependencies/guice-assistedinject/pom.xml +++ b/dependencies/guice-assistedinject/pom.xml @@ -23,23 +23,20 @@ <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>guice-assistedinject</artifactId> <packaging>bundle</packaging> <name>Guice Assistedinject</name> - <version>3.0</version> - <description> - This bundle will expose com.google.inject.assistedinject - </description> + <version>${guice.assistedinject.version}</version> + <description>This bundle will expose com.google.inject.assistedinject</description> <dependencies> <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-assistedinject</artifactId> - <version>3.0</version> + <version>${guice.assistedinject.version}</version> </dependency> </dependencies> <build> @@ -53,10 +50,11 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> - <Export-Package>com.google.inject.assistedinject; version="3.0"</Export-Package> + <Export-Package>com.google.inject.assistedinject; version="${guice.assistedinject.version}" + </Export-Package> <Import-Package> !com.google.inject.assistedinject.*, - com.google.inject.*;version="[3.0,4.0)", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -65,4 +63,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/guice-multibindings/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/guice-multibindings/pom.xml b/dependencies/guice-multibindings/pom.xml index 598d239..f0499a8 100644 --- a/dependencies/guice-multibindings/pom.xml +++ b/dependencies/guice-multibindings/pom.xml @@ -23,23 +23,20 @@ <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>guice-multibindings</artifactId> <packaging>bundle</packaging> <name>Google Guice - Extensions - MultiBindings</name> - <version>3.0</version> - <description> - This bundle will expose com.google.inject.multibindings - </description> + <version>${guice.multibindings.version}</version> + <description>This bundle will expose com.google.inject.multibindings</description> <dependencies> <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-multibindings</artifactId> - <version>3.0</version> + <version>${guice.multibindings.version}</version> </dependency> </dependencies> <build> @@ -53,7 +50,8 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> - <Export-Package>com.google.inject.multibindings; version="3.0"</Export-Package> + <Export-Package>com.google.inject.multibindings; version="${guice.multibindings.version}" + </Export-Package> <Import-Package> *;resolution:=optional </Import-Package> @@ -63,4 +61,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/guice/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/guice/pom.xml b/dependencies/guice/pom.xml index f0ca81e..eed1ee1 100644 --- a/dependencies/guice/pom.xml +++ b/dependencies/guice/pom.xml @@ -23,21 +23,20 @@ <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>guice</artifactId> <packaging>bundle</packaging> <name>Guice</name> - <version>3.0</version> + <version>${guice.version}</version> <description>This OSGi bundle wraps guice 3.0 jar files.</description> <dependencies> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <version>3.0</version> + <version>${guice.version}</version> </dependency> </dependencies> <build> @@ -51,10 +50,11 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> - <Export-Package>com.google.inject*;version="3.0";-split-package:=merge-first</Export-Package> + <Export-Package>com.google.inject*;version="${guice.version}";-split-package:=merge-first + </Export-Package> <Import-Package> - javax.inject;version="1", - org.aopalliance*;version="[1.0,2)", + javax.inject;version="${javax.inject.imp.pkg.version}", + org.aopalliance*;version="${aopalliance.imp.pkg.version}", com.google.inject.internal.asm.util.*;resolution:=optional, *;resolution:=optional </Import-Package> @@ -64,4 +64,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/cloudstack/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/cloudstack/pom.xml b/dependencies/jclouds/cloudstack/pom.xml index 5428251..97b4a95 100644 --- a/dependencies/jclouds/cloudstack/pom.xml +++ b/dependencies/jclouds/cloudstack/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>cloudstack</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds cloudstack core</name> <description>jclouds components to access cloudstack</description> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>cloudstack</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -81,10 +80,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.cloudstack*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.cloudstack*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/ec2/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/ec2/pom.xml b/dependencies/jclouds/ec2/pom.xml index 2aa0d3e..bf4530b 100644 --- a/dependencies/jclouds/ec2/pom.xml +++ b/dependencies/jclouds/ec2/pom.xml @@ -19,16 +19,15 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>ec2</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds ec2 api</name> <description>jclouds components to access an implementation of EC2</description> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>ec2</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -81,10 +80,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.ec2*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.ec2*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml b/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml index dbc3124..cb5fa2c 100644 --- a/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml @@ -19,24 +19,24 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-google</artifactId> - <version>1.9.1</version> + <groupId>org.apache.stratos</groupId> + <artifactId>google-jclouds-labs</artifactId> + <version>4.1.2-SNAPSHOT</version> </parent> - <groupId>org.apache.stratos</groupId> + <modelVersion>4.0.0</modelVersion> <artifactId>google-cloud-storage</artifactId> <name>jclouds Google Cloud Storage provider</name> <description>jclouds components to access Google Cloud Storage</description> + <version>${jclouds.version}</version> <packaging>bundle</packaging> <dependencies> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>google-cloud-storage</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -87,7 +87,7 @@ </Private-Package> <Import-Package> org.jclouds.*; version="${jclouds.version}", - com.google.inject.*;version="[3.0,4.0)", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <Include-Resource> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml b/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml index 33ebee1..39002d4 100644 --- a/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml @@ -19,24 +19,24 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-google</artifactId> - <version>1.9.1</version> + <groupId>org.apache.stratos</groupId> + <artifactId>google-jclouds-labs</artifactId> + <version>4.1.2-SNAPSHOT</version> </parent> - <groupId>org.apache.stratos</groupId> + <modelVersion>4.0.0</modelVersion> <artifactId>google-compute-engine</artifactId> <name>jclouds Google Compute Engine provider</name> <description>jclouds components to access GoogleCompute</description> + <version>${jclouds.version}</version> <packaging>bundle</packaging> <dependencies> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>google-compute-engine</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -91,7 +91,7 @@ </Private-Package> <Import-Package> org.jclouds.*; version="${jclouds.version}", - com.google.inject.*;version="[3.0,4.0)", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <Include-Resource> @@ -104,4 +104,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml b/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml index 652e70d..0ca28cd 100644 --- a/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml @@ -19,24 +19,24 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-google</artifactId> - <version>1.9.1</version> + <groupId>org.apache.stratos</groupId> + <artifactId>google-jclouds-labs</artifactId> + <version>4.1.2-SNAPSHOT</version> </parent> - <groupId>org.apache.stratos</groupId> + <modelVersion>4.0.0</modelVersion> <artifactId>googlecloud</artifactId> <name>jclouds Google Cloud Core</name> <description>jclouds components common to Google Cloud products</description> + <version>${jclouds.version}</version> <packaging>bundle</packaging> <dependencies> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>googlecloud</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -58,7 +58,7 @@ </Private-Package> <Import-Package> org.jclouds.*; version="${jclouds.version}", - com.google.inject.*;version="[3.0,4.0)", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <Include-Resource> @@ -70,4 +70,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml b/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml index f14d2dc..1a177a9 100644 --- a/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml @@ -19,24 +19,24 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-google</artifactId> - <version>1.9.1</version> + <groupId>org.apache.stratos</groupId> + <artifactId>google-jclouds-labs</artifactId> + <version>4.1.2-SNAPSHOT</version> </parent> - <groupId>org.apache.stratos</groupId> + <modelVersion>4.0.0</modelVersion> <artifactId>oauth</artifactId> <name>jclouds OAuth Core</name> <description>jclouds components to access OAuth</description> + <version>${jclouds.version}</version> <packaging>bundle</packaging> <dependencies> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>oauth</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -58,7 +58,7 @@ </Private-Package> <Import-Package> org.jclouds*;version="${jclouds.version}", - com.google.inject.*;version="[3.0,4.0)", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <Include-Resource> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/google-jclouds-labs/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/google-jclouds-labs/pom.xml b/dependencies/jclouds/google-jclouds-labs/pom.xml index 5bbf09a..5dcd9cc 100644 --- a/dependencies/jclouds/google-jclouds-labs/pom.xml +++ b/dependencies/jclouds/google-jclouds-labs/pom.xml @@ -21,9 +21,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-blobstore/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-blobstore/pom.xml b/dependencies/jclouds/jclouds-blobstore/pom.xml index 7ab604c..0fd463e 100644 --- a/dependencies/jclouds/jclouds-blobstore/pom.xml +++ b/dependencies/jclouds/jclouds-blobstore/pom.xml @@ -19,16 +19,15 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>jclouds-blobstore</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components blobstore</name> <packaging>bundle</packaging> <description>jclouds components to access blobstore</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-blobstore</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -81,10 +80,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.blobstore*;version="1.9.1"</Export-Package> + <Export-Package>org.jclouds.blobstore*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="1.9.1", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-bouncycastle/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-bouncycastle/pom.xml b/dependencies/jclouds/jclouds-bouncycastle/pom.xml index 2854e5d..a7636cb 100644 --- a/dependencies/jclouds/jclouds-bouncycastle/pom.xml +++ b/dependencies/jclouds/jclouds-bouncycastle/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jclouds-bouncycastle</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components bouncycastle</name> <packaging>bundle</packaging> <description>jclouds bouncycastle EncryptionService Module</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-bouncycastle</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -53,10 +52,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.encryption.bouncycastle*;version="1.9.1"</Export-Package> + <Export-Package>org.jclouds.encryption.bouncycastle*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="1.9.1", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-compute/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-compute/pom.xml b/dependencies/jclouds/jclouds-compute/pom.xml index f2cbeb8..9864966 100644 --- a/dependencies/jclouds/jclouds-compute/pom.xml +++ b/dependencies/jclouds/jclouds-compute/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jclouds-compute</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components compute</name> <packaging>bundle</packaging> <description>jclouds bouncycastle EncryptionService Module</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-compute</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -82,14 +81,14 @@ <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Export-Package>org.jclouds.cim*;version=${project.version};-noimport:=true, - org.jclouds.compute*;version=${project.version};-noimport:=true, - org.jclouds.net*;version=${project.version};-noimport:=true, - org.jclouds.ovf*;version=${project.version};-noimport:=true, - org.jclouds.ssh*;version=${project.version};-noimport:=true + org.jclouds.compute*;version="${jclouds.version}";-noimport:=true, + org.jclouds.net*;version="${jclouds.version}";-noimport:=true, + org.jclouds.ovf*;version="${jclouds.version}";-noimport:=true, + org.jclouds.ssh*;version="${jclouds.version}";-noimport:=true </Export-Package> <Import-Package> - org.jclouds*;version="1.9.1", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-core/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-core/pom.xml b/dependencies/jclouds/jclouds-core/pom.xml index f38b4af..bea8768 100644 --- a/dependencies/jclouds/jclouds-core/pom.xml +++ b/dependencies/jclouds/jclouds-core/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jclouds-core</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components Core</name> <packaging>bundle</packaging> <description>Core components to access jclouds services</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -82,10 +81,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds*;version="1.9.1"</Export-Package> + <Export-Package>org.jclouds*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.nnsoft.guice.rocoto*;version="[6.1,7)", - com.google.inject.*;version="[3.0,4.0)", + org.nnsoft.guice.rocoto*;version="${rocoto.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <Bundle-Activator>org.jclouds.osgi.Activator</Bundle-Activator> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-enterprise/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-enterprise/pom.xml b/dependencies/jclouds/jclouds-enterprise/pom.xml index 054f129..b85f623 100644 --- a/dependencies/jclouds/jclouds-enterprise/pom.xml +++ b/dependencies/jclouds/jclouds-enterprise/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jclouds-enterprise</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components enterprise</name> <packaging>bundle</packaging> <description>jclouds enterprise configuration</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-enterprise</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -53,10 +52,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.enterprise*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.enterprise*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="1.9.1", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-joda/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-joda/pom.xml b/dependencies/jclouds/jclouds-joda/pom.xml index 0e60714..448deec 100644 --- a/dependencies/jclouds/jclouds-joda/pom.xml +++ b/dependencies/jclouds/jclouds-joda/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jclouds-joda</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components joda</name> <packaging>bundle</packaging> <description>jclouds enterprise configuration</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-joda</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -53,10 +52,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.date.joda*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.date.joda*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="1.9.1", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-netty/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-netty/pom.xml b/dependencies/jclouds/jclouds-netty/pom.xml index bd5f0b2..5f034bb 100644 --- a/dependencies/jclouds/jclouds-netty/pom.xml +++ b/dependencies/jclouds/jclouds-netty/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jclouds-netty</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components netty</name> <packaging>bundle</packaging> <description>jclouds netty payload module</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-netty</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -53,11 +52,11 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.netty*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.netty*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - org.jboss.netty*;version="[3.3,4)", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + org.jboss.netty*;version="${netty.imp.pkg.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/jclouds-sshj/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/jclouds-sshj/pom.xml b/dependencies/jclouds/jclouds-sshj/pom.xml index c1566a4..3e02f5a 100644 --- a/dependencies/jclouds/jclouds-sshj/pom.xml +++ b/dependencies/jclouds/jclouds-sshj/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jclouds-sshj</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds Components sshj</name> <packaging>bundle</packaging> <description>jclouds sshj ssh client</description> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-sshj</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -53,10 +52,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.sshj*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.sshj*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/openstack-common/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-common/pom.xml b/dependencies/jclouds/openstack-common/pom.xml index 703313c..fe28da7 100644 --- a/dependencies/jclouds/openstack-common/pom.xml +++ b/dependencies/jclouds/openstack-common/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>openstack-common</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds OpenStack Components Core</name> <description>jclouds Core components to access OpenStack apis</description> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.common</groupId> <artifactId>openstack-common</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -53,10 +52,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.openstack*;version="${project.version}";-noimport:=true</Export-Package> + <Export-Package>org.jclouds.openstack*;version="${jclouds.version}";-noimport:=true</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/openstack-keystone/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-keystone/pom.xml b/dependencies/jclouds/openstack-keystone/pom.xml index e0e4572..d49847b 100644 --- a/dependencies/jclouds/openstack-keystone/pom.xml +++ b/dependencies/jclouds/openstack-keystone/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>openstack-keystone</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds openstack-keystone api</name> <description>jclouds components to access an implementation of OpenStack Keystone</description> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -82,10 +81,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.openstack*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.openstack*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/openstack-neutron/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-neutron/pom.xml b/dependencies/jclouds/openstack-neutron/pom.xml index f7559fd..0ddf1d3 100644 --- a/dependencies/jclouds/openstack-neutron/pom.xml +++ b/dependencies/jclouds/openstack-neutron/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>openstack-neutron</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds openstack-neutron api</name> <description>jclouds components to access an implementation of OpenStack Neutron</description> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-neutron</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -81,10 +80,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.openstack.neutron.v2*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.openstack.neutron.v2*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/openstack-nova/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/pom.xml b/dependencies/jclouds/openstack-nova/pom.xml index bfc88b6..8317d9a 100644 --- a/dependencies/jclouds/openstack-nova/pom.xml +++ b/dependencies/jclouds/openstack-nova/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>openstack-nova</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>Apache jclouds :: OpenStack :: Nova API</name> <description>jclouds components to access an implementation of OpenStack Nova</description> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-nova</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -81,10 +80,10 @@ <instructions> <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.jclouds.openstack.nova.v2_0*;version="${project.version}"</Export-Package> + <Export-Package>org.jclouds.openstack.nova.v2_0*;version="${jclouds.version}"</Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/pom.xml b/dependencies/jclouds/pom.xml index c458e92..be32b17 100644 --- a/dependencies/jclouds/pom.xml +++ b/dependencies/jclouds/pom.xml @@ -23,7 +23,6 @@ <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/jclouds/sts/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/sts/pom.xml b/dependencies/jclouds/sts/pom.xml index 9459e34..ed030ab 100644 --- a/dependencies/jclouds/sts/pom.xml +++ b/dependencies/jclouds/sts/pom.xml @@ -22,13 +22,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-dependents</artifactId> + <artifactId>stratos-dependencies-jclouds</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>sts</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> <name>jclouds sts api</name> <description>jclouds components to access an implementation of Security Token Service (STS)</description> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>sts</artifactId> - <version>1.9.1</version> + <version>${jclouds.version}</version> </dependency> </dependencies> @@ -82,11 +81,11 @@ <Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Export-Package> - org.jclouds.aws*;version="${project.version}",org.jclouds.sts*;version="${project.version}" + org.jclouds.aws*;version="${jclouds.version}",org.jclouds.sts*;version="${jclouds.version}" </Export-Package> <Import-Package> - org.jclouds*;version="${project.version}", - com.google.inject.*;version="[3.0,4.0)", + org.jclouds*;version="${jclouds.version}", + com.google.inject.*;version="${guice.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/rocoto/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/rocoto/pom.xml b/dependencies/rocoto/pom.xml index 3ea8ba7..19505a5 100644 --- a/dependencies/rocoto/pom.xml +++ b/dependencies/rocoto/pom.xml @@ -19,20 +19,26 @@ --> <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.99soft</groupId> - <artifactId>oss-parent</artifactId> - <version>7</version> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-dependents</artifactId> + <version>4.1.2-SNAPSHOT</version> </parent> - <groupId>org.apache.stratos</groupId> + + <modelVersion>4.0.0</modelVersion> <artifactId>rocoto</artifactId> - <version>6.1</version> + <version>${rocoto.version}</version> <packaging>bundle</packaging> <name>99soft :: Rocoto</name> - <description> - Add some spice to Google Guice through configuration files! - </description> + <description>Add some spice to Google Guice through configuration files!</description> + + <dependencies> + <dependency> + <groupId>org.99soft.guice</groupId> + <artifactId>rocoto</artifactId> + <version>${rocoto.version}</version> + </dependency> + </dependencies> <build> <plugins> @@ -46,13 +52,13 @@ <instructions> <Bundle-Name>${project.name}</Bundle-Name> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.nnsoft.guice*;version="${project.version}"</Export-Package> + <Export-Package>org.nnsoft.guice*;version="${rocoto.version}"</Export-Package> <Import-Package> javax.*, !com.google.inject*, *;resolution:=optional </Import-Package> - <Fragment-Host>guice;bundle-version="[3.0.0,4)"</Fragment-Host> + <Fragment-Host>guice;bundle-version="${guice.imp.pkg.version}"</Fragment-Host> <DynamicImport-Package>*</DynamicImport-Package> </instructions> <unpackBundle>true</unpackBundle> @@ -60,11 +66,4 @@ </plugin> </plugins> </build> - <dependencies> - <dependency> - <groupId>org.99soft.guice</groupId> - <artifactId>rocoto</artifactId> - <version>6.1</version> - </dependency> - </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/dependencies/sshj/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/sshj/pom.xml b/dependencies/sshj/pom.xml index 656105c..94d0e2e 100644 --- a/dependencies/sshj/pom.xml +++ b/dependencies/sshj/pom.xml @@ -23,7 +23,6 @@ <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -31,16 +30,16 @@ <packaging>bundle</packaging> <name>sshj</name> <description>SSHv2 library for Java</description> - <version>0.8.1</version> + <version>${net.schmizz.sshj.version}</version> <dependencies> <dependency> <groupId>net.schmizz</groupId> <artifactId>sshj</artifactId> - <version>0.8.1</version> + <version>${net.schmizz.sshj.version}</version> </dependency> - </dependencies> + <build> <plugins> <plugin> @@ -52,13 +51,13 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Name>${project.artifactId}</Bundle-Name> - <Export-Package>net.schmizz.*</Export-Package> + <Export-Package>net.schmizz.*;version="${net.schmizz.sshj.version}"</Export-Package> <Import-Package> !net.schmizz.*, javax.crypto*, - com.jcraft.jzlib*;version="[1.0,2)", - org.slf4j*;version="[1.6,2)", - org.bouncycastle*;version="[1.45.0,2)", + com.jcraft.jzlib*;version="${jzlib.imp.pkg.version}", + org.slf4j*;version="${slf4j.imp.pkg.version}", + org.bouncycastle*;version="${bouncycastle.imp.pkg.version}", *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -67,4 +66,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b126275..580ee1c 100644 --- a/pom.xml +++ b/pom.xml @@ -558,5 +558,17 @@ <gson.version>2.3.1</gson.version> <carbon.deployment.version>4.2.3</carbon.deployment.version> <carbon.ui.stratos.version>4.2.0-stratosv2</carbon.ui.stratos.version> + <guice.version>3.0</guice.version> + <guice.assistedinject.version>3.0</guice.assistedinject.version> + <guice.multibindings.version>3.0</guice.multibindings.version> + <javax.inject.imp.pkg.version>1</javax.inject.imp.pkg.version> + <aopalliance.imp.pkg.version>[1.0,2)</aopalliance.imp.pkg.version> + <guice.imp.pkg.version>[3.0,4.0)</guice.imp.pkg.version> + <rocoto.version>6.1</rocoto.version> + <net.schmizz.sshj.version>0.8.1</net.schmizz.sshj.version> + <jzlib.imp.pkg.version>[1.0,2)</jzlib.imp.pkg.version> + <slf4j.imp.pkg.version>[1.6,2)</slf4j.imp.pkg.version> + <bouncycastle.imp.pkg.version>[1.45.0,2)</bouncycastle.imp.pkg.version> + <netty.imp.pkg.version>[3.3,4)</netty.imp.pkg.version> </properties> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4118b564/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index ff8400e..31b84c7 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -198,7 +198,7 @@ </includes> </fileSet> <fileSet> - <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/</directory> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts</directory> <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> <excludes> <exclude>**/identity/**</exclude> @@ -213,19 +213,13 @@ </includes> </fileSet> <fileSet> - <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/</directory> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity</directory> <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory> <includes> <include>**/**.sql</include> </includes> </fileSet> - <fileSet> - <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> - <includes> - <include>**/**.sql</include> - </includes> - </fileSet> + <!-- copy cxf runtime --> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory> @@ -265,13 +259,6 @@ </includes> </fileSet> <fileSet> - <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory> - <includes> - <include>**/**.sql</include> - </includes> - </fileSet> - <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002</directory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> <includes> @@ -359,6 +346,21 @@ <!-- Additional configuration for kernel patches --> <fileSet> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <includes> + <include>**/db2.sql</include> + <include>**/mysql.sql</include> + </includes> + </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003/dbscripts</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + <includes> + <include>**/mysql_cluster.sql</include> + </includes> + </fileSet> + <fileSet> <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0009/lib</directory> <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory> <includes> @@ -379,13 +381,6 @@ <include>**/org.wso2.ciphertool-1.0.0-wso2v2.jar</include> </includes> </fileSet> - <fileSet> - <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003/dbscripts</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory> - <includes> - <include>**/mysql_cluster.sql</include> - </includes> - </fileSet> <!-- Jaggery modules --> <fileSet>
