http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml index f7fd973..1748287 100644 --- a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml +++ b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml @@ -18,10 +18,8 @@ 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";> - <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> @@ -36,50 +34,11 @@ <url>http://apache.org</url> <description/> - <dependencies> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpasyncclient</artifactId> - <version>4.0-beta3</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> - <version>4.3.5</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.3.5</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> - <version>4.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-nio</artifactId> - <version>4.2.4</version> - </dependency> - </dependencies> - <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -99,7 +58,7 @@ <bundles> <bundleDef>org.apache.stratos:org.apache.stratos.metadata.client:${project.version} </bundleDef> - <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef> + <bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef> <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef> <bundleDef>org.apache.httpcomponents:httpclient-osgi:4.3.5</bundleDef> <bundleDef>org.apache.httpcomponents:httpcore-osgi:4.3.2</bundleDef> @@ -110,4 +69,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml index e0427b4..af13e6e 100644 --- a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml +++ b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml @@ -18,8 +18,8 @@ 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-manager-features</artifactId> @@ -46,9 +46,9 @@ <version>2.6.2</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> </dependency> <dependency> <groupId>org.apache.cxf.xjc-utils</groupId> @@ -56,9 +56,9 @@ <version>2.6.2</version> </dependency> <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.7</version> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> </dependency> <dependency> <groupId>org.apache.cxf.xjcplugins</groupId> @@ -166,16 +166,15 @@ <version>1.1.1</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> </dependency> <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> @@ -216,14 +215,11 @@ <artifactId>carbon-cxf</artifactId> <version>1.0.0</version> </dependency> - - <dependency> + <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.ws.stub</artifactId> <version>4.2.0</version> </dependency> - - <!--dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId> @@ -239,7 +235,7 @@ <resource> <directory>${project.build.directory}/web-app/</directory> </resource> - <resource> + <resource> <directory>src/main/resources</directory> </resource> </resources> @@ -289,11 +285,13 @@ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> </properties> </adviceFile> - <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}</bundleDef> - </bundles> + <bundles> + <bundleDef> + org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version} + </bundleDef> + </bundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef> </importFeatures> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/pom.xml b/features/manager/pom.xml index 818d89d..d1f4fb7 100644 --- a/features/manager/pom.xml +++ b/features/manager/pom.xml @@ -20,121 +20,23 @@ <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-features-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-manager-features</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Manager Features Aggregator Module</name> <description>features</description> - <url>http://apache.org</url> <modules> <module>stratos-mgt</module> - <module>deployment</module> - <module>tenant-activity</module> - <module>logging-mgt</module> <module>rest-endpoint/org.apache.stratos.rest.endpoint.feature</module> <module>styles/org.apache.stratos.manager.styles.feature</module> <module>metadata-service/org.apache.stratos.metadata.service.feature</module> <module>metadata-service/org.apache.stratos.metadata.client.feature</module> </modules> - - <properties> - <stratos.version>2.1.0</stratos.version> - <synapse.version>2.1.0-wso2v6</synapse.version> - <carbon.version>4.2.0</carbon.version> - <quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version> - <carbon.p2.plugin.version>1.5</carbon.p2.plugin.version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.sample.installer</artifactId> - <version>${stratos.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.redirector.servlet</artifactId> - <version>2.2.1</version> - </dependency> - <!-- dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId> - <version>2.2.0</version> - </dependency --> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.stratos.landing.page.deployer</artifactId> - <version>${stratos.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.throttling.agent</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.activity</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.throttling.agent.stub</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.usage.agent</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.dispatcher</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.quartz-scheduler.wso2</groupId> - <artifactId>quartz</artifactId> - <version>${quartz.wso2.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.task</artifactId> - <version>${wso2carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.application.upload</artifactId> - <version>${wso2carbon.version}</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-tasks</artifactId> - <version>${synapse.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.sso.redirector.ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.google.analytics.ui</artifactId> - <version>${stratos.version}</version> - </dependency> - </dependencies> - </dependencyManagement> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml index 1de9117..b9a2183 100644 --- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml +++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml @@ -20,7 +20,7 @@ <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-manager-features</artifactId> @@ -28,7 +28,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.rest.endpoint.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - RESTful admin services feature</name> @@ -176,7 +175,6 @@ <artifactId>aopalliance</artifactId> <version>1.0</version> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> @@ -293,7 +291,7 @@ </bundleDef> </bundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef> </importFeatures> </configuration> </execution> @@ -301,4 +299,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml index 96cbec8..b8806f2 100644 --- a/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.feature/pom.xml @@ -18,36 +18,25 @@ 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-mgt-parent-feature</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.manager.feature</artifactId> + <artifactId>org.apache.stratos.manager.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Management Composite Feature</name> - <url>http://apache.org</url> <description>This feature contains the core bundles required for Stratos Manager</description> - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.manager.server.feature</artifactId> - <version>${project.version}</version> - <type>zip</type> - </dependency> - </dependencies> - <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>p2-feature-generation</id> @@ -59,10 +48,14 @@ <id>org.apache.stratos.manager</id> <propertiesFile>../../../../etc/feature.properties</propertiesFile> <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}</bundleDef> + <bundleDef> + org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version} + </bundleDef> </bundles> <includedFeatures> - <includedFeatureDef>org.apache.stratos:org.apache.stratos.manager.server.feature:${project.version}</includedFeatureDef> + <includedFeatureDef> + org.apache.stratos:org.apache.stratos.manager.server.feature:${project.version} + </includedFeatureDef> </includedFeatures> </configuration> </execution> @@ -70,4 +63,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml index 9ce4307..e98f95e 100644 --- a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml @@ -17,68 +17,24 @@ 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-mgt-parent-feature</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.manager.server.feature</artifactId> + <artifactId>org.apache.stratos.manager.server.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Management Core Feature</name> - <url>http://apache.org</url> <description>This feature contains the core bundles required for Stratos Manager</description> - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.manager</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.andes.wso2</groupId> - <artifactId>andes-client</artifactId> - <version>0.13.wso2v8</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.manager.service.stub</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.gitblit</groupId> - <artifactId>gitblit</artifactId> - <version>1.2.0.wso2v1</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <version>2.1.0.wso2v1</version> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.49.wso2v1</version> - </dependency> - </dependencies> - <build> <plugins> - <plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> @@ -106,7 +62,6 @@ <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>p2-feature-generation</id> @@ -125,9 +80,13 @@ </adviceFile> <bundles> <bundleDef>org.apache.stratos:org.apache.stratos.manager:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}</bundleDef> + <bundleDef> + org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version} + </bundleDef> <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v8</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}</bundleDef> + <bundleDef> + org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version} + </bundleDef> <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef> <bundleDef>com.google.code.gson:gson:2.1</bundleDef> <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef> @@ -140,4 +99,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/stratos-mgt/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/pom.xml b/features/manager/stratos-mgt/pom.xml index 8acd9ac..cd8fc94 100644 --- a/features/manager/stratos-mgt/pom.xml +++ b/features/manager/stratos-mgt/pom.xml @@ -16,25 +16,22 @@ # KIND, either express or implied. See the License for the # 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-mgt-parent-feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Stratos Management Aggregator Module</name> - <url>http://apache.org</url> <modules> <module>org.apache.stratos.manager.server.feature</module> <module>org.apache.stratos.manager.feature</module> </modules> - -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml index 20ecbdd..fd3fe60 100644 --- a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml +++ b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml @@ -17,36 +17,26 @@ ~ 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";> - - <parent> +<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-manager-features</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.manager.styles.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - stratos manager admin theme</name> - <url>http://apache.org</url> - <description /> + <description/> - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.manager.styles</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>p2-feature-generation</id> @@ -64,10 +54,11 @@ </properties> </adviceFile> <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.manager.styles:${project.version}</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.manager.styles:${project.version} + </bundleDef> </bundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core.ui:${carbon.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core.ui:${carbon.kernel.version}</importFeatureDef> </importFeatures> </configuration> </execution> @@ -75,5 +66,4 @@ </plugin> </plugins> </build> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml deleted file mode 100644 index 890a2f6..0000000 --- a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file - # distributed with this work for additional information - # regarding copyright ownership. The ASF licenses this file - # to you under the Apache License, Version 2.0 (the - # "License"); you may not use this file except in compliance - # with the License. You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, - # software distributed under the License is distributed on an - # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - # KIND, either express or implied. See the License for the - # 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";> - - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>tenant-activity-feature</artifactId> - <version>4.1.2-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.tenant.activity.server.feature</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Tenant activity Server Feature</name> - <url>http://stratos.org</url> - <description>This feature contains the core bundles required for API management back end - </description> - - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.activity</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - - </executions> - </plugin> - - - <plugin> - <groupId>org.wso2.maven</groupId> - <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> - <executions> - <execution> - <id>4-p2-feature-generation</id> - <phase>package</phase> - <goals> - <goal>p2-feature-gen</goal> - </goals> - <configuration> - <id>org.apache.stratos.tenant.activity.server</id> - <propertiesFile>../../../etc/feature.properties</propertiesFile> - <adviceFile> - <properties> - <propertyDef>org.wso2.carbon.p2.category.type:server - </propertyDef> - <propertyDef>org.eclipse.equinox.p2.type.group:false - </propertyDef> - </properties> - </adviceFile> - <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity:${project.version}</bundleDef> - </bundles> - <importBundles> - </importBundles> - <importFeatures> - </importFeatures> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/tenant-activity/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/tenant-activity/pom.xml b/features/manager/tenant-activity/pom.xml deleted file mode 100644 index f7ed884..0000000 --- a/features/manager/tenant-activity/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file - # distributed with this work for additional information - # regarding copyright ownership. The ASF licenses this file - # to you under the Apache License, Version 2.0 (the - # "License"); you may not use this file except in compliance - # with the License. You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, - # software distributed under the License is distributed on an - # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - # KIND, either express or implied. See the License for the - # 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";> - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-manager-features</artifactId> - <version>4.1.2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>tenant-activity-feature</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Tenant activity Feature Aggregator Module</name> - <url>http://apache.org</url> - <modules> - <module>org.apache.stratos.tenant.activity.server.feature</module> - </modules> -</project> - http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/messaging/org.apache.stratos.messaging.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/messaging/org.apache.stratos.messaging.feature/pom.xml b/features/messaging/org.apache.stratos.messaging.feature/pom.xml index 11b0c1b..abeeb41 100644 --- a/features/messaging/org.apache.stratos.messaging.feature/pom.xml +++ b/features/messaging/org.apache.stratos.messaging.feature/pom.xml @@ -18,36 +18,25 @@ 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>messaging-features</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.messaging.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Messaging Feature</name> - <url>http://apache.org</url> - <description /> - - <dependencies> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson2.version}</version> - </dependency> - </dependencies> + <description/> <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -65,8 +54,9 @@ </properties> </adviceFile> <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}</bundleDef> - <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version} + </bundleDef> + <bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef> <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef> <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef> <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef> @@ -77,4 +67,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/messaging/pom.xml ---------------------------------------------------------------------- diff --git a/features/messaging/pom.xml b/features/messaging/pom.xml index 42d7dfa..e737ff1 100644 --- a/features/messaging/pom.xml +++ b/features/messaging/pom.xml @@ -17,21 +17,20 @@ ~ 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>messaging-features</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Messaging Module</name> - <url>http://apache.org</url> <modules> <module>org.apache.stratos.messaging.feature</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml index d28a5da..d3537b9 100644 --- a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml +++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml @@ -20,15 +20,13 @@ <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>mock-iaas-features</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.mock.iaas.api.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Mock IaaS API Feature</name> @@ -288,7 +286,7 @@ </bundleDef> </bundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef> </importFeatures> </configuration> </execution> @@ -296,4 +294,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/mock-iaas/pom.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/pom.xml b/features/mock-iaas/pom.xml index 4a91343..510470c 100644 --- a/features/mock-iaas/pom.xml +++ b/features/mock-iaas/pom.xml @@ -18,9 +18,9 @@ ~ 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/xsd/maven-4.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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> @@ -28,7 +28,6 @@ <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>mock-iaas-features</artifactId> <name>Apache Stratos - Mock IaaS Features</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index 2906f15..5ab4888 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,7 +20,6 @@ <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-parent</artifactId> @@ -52,18 +51,4 @@ </plugin> </plugins> </build> - - <properties> - <wso2carbon.version>4.2.0</wso2carbon.version> - <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version> - <synapse.wso2.version>2.1.1-wso2v4</synapse.wso2.version> - <google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version> - <google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version> - <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version> - <sun.jersey.version>1.12</sun.jersey.version> - <gson2.version>2.2</gson2.version> - <google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version> - <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version> - <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version> - </properties> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 580ee1c..3fe343c 100644 --- a/pom.xml +++ b/pom.xml @@ -17,10 +17,8 @@ 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";> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache</groupId> @@ -85,7 +83,6 @@ <module>extensions</module> <module>features</module> <module>products</module> - <module>tools</module> </modules> <repositories> @@ -116,6 +113,29 @@ </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>central</id> + <name>Maven Plugin Repository</name> + <url>http://repo1.maven.org/maven2</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <updatePolicy>never</updatePolicy> + </releases> + </pluginRepository> + <pluginRepository> + <id>wso2-maven2-repository-1</id> + <url>http://dist.wso2.org/maven2</url> + </pluginRepository> + <pluginRepository> + <id>wso2-maven2-repository-2</id> + <url>http://dist.wso2.org/snapshots/maven2</url> + </pluginRepository> + </pluginRepositories> + <profiles> <profile> <id>pedantic</id> @@ -124,10 +144,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> @@ -208,10 +224,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> @@ -378,16 +390,60 @@ </profile> </profiles> - <pluginRepositories> - <pluginRepository> - <id>wso2-maven2-repository-1</id> - <url>http://dist.wso2.org/maven2</url> - </pluginRepository> - <pluginRepository> - <id>wso2-maven2-repository-2</id> - <url>http://dist.wso2.org/snapshots/maven2</url> - </pluginRepository> - </pluginRepositories> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis2.wso2</groupId> + <artifactId>axis2</artifactId> + <version>${axis2.wso2.version}</version> + </dependency> + <dependency> + <groupId>wsdl4j.wso2</groupId> + <artifactId>wsdl4j</artifactId> + <version>${wsdl4j.wso2.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons.logging.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.schema.wso2</groupId> + <artifactId>XmlSchema</artifactId> + <version>${xmlschema.wso2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom.wso2</groupId> + <artifactId>axiom</artifactId> + <version>${axiom.wso2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.neethi.wso2</groupId> + <artifactId>neethi</artifactId> + <version>${neethi.wso2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis2.wso2</groupId> + <artifactId>axis2-client</artifactId> + <version>${axis2.wso2.client.version}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr.annotations</artifactId> + <version>${scr.annotations.version}</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>${guice.version}</version> + </dependency> + </dependencies> + </dependencyManagement> <build> <extensions> @@ -437,11 +493,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - <source>1.6</source> - <target>1.6</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -490,6 +541,21 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.3</version> + <configuration> + <encoding>UTF-8</encoding> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.4.0</version> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-scr-plugin</artifactId> <version>1.7.2</version> @@ -509,14 +575,12 @@ <extensions>true</extensions> <configuration> <obrRepository>NONE</obrRepository> - <!--<instructions> - <_include>-osgi.bnd</_include> - </instructions>--> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> + <version>2.4</version> <executions> <execution> <id>attach-sources</id> @@ -535,12 +599,59 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> + <version>2.5.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.8</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + </plugin> + <plugin> + <groupId>org.wso2.maven</groupId> + <artifactId>carbon-p2-plugin</artifactId> + <version>1.5.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.9.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.18.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.7</version> + </plugin> + <plugin> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-java2wsdl-maven-plugin</artifactId> + <version>1.6.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.6</version> </plugin> </plugins> </pluginManagement> @@ -548,27 +659,75 @@ <properties> <!-- Carbon related versions --> - <wso2carbon.version>4.2.0</wso2carbon.version> - <carbon.platform.package.import.version.range>[4.2.0, 5.0.0)</carbon.platform.package.import.version.range> - <carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version> - <axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version> + <carbon.kernel.version>4.2.0</carbon.kernel.version> + <carbon.deployment.version>4.2.3</carbon.deployment.version> + <carbon.ui.stratos.version>4.2.0-stratosv2</carbon.ui.stratos.version> + <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version> + <carbon.platform.patch.version.4.2.1>4.2.1</carbon.platform.patch.version.4.2.1> + <carbon.platform.patch.version.4.2.2>4.2.2</carbon.platform.patch.version.4.2.2> + <carbon.platform.patch.version.4.2.3>4.2.3</carbon.platform.patch.version.4.2.3> + <carbon.platform.patch.version.4.2.4>4.2.4</carbon.platform.patch.version.4.2.4> + <carbon.platform.patch.version.4.2.5>4.2.5</carbon.platform.patch.version.4.2.5> + <carbon.platform.patch.version.4.2.6>4.2.6</carbon.platform.patch.version.4.2.6> + <carbon.platform.patch.version.4.2.7>4.2.7</carbon.platform.patch.version.4.2.7> + <carbon.platform.patch.version.4.2.8>4.2.8</carbon.platform.patch.version.4.2.8> + + <!-- 3rd party library versions --> + <synapse.wso2.feature.version>2.1.2-wso2v3</synapse.wso2.feature.version> + <sun.jersey.version>1.12</sun.jersey.version> + <google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version> + <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version> + <axis2.wso2.client.version>1.6.1.wso2v10</axis2.wso2.client.version> + <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version> + <junit.version>4.11</junit.version> + <version.commons.logging>1.1.1</version.commons.logging> + <orbit.version.geronimo-jms_1.1_spec>1.1.0.wso2v1</orbit.version.geronimo-jms_1.1_spec> + <commons-httpclient.version>3.0.1</commons-httpclient.version> + <json.wso2.version>2.0.0.wso2v1</json.wso2.version> + <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version> + <rampart.wso2.version>1.6.1.wso2v9</rampart.wso2.version> + <wsdl4j.wso2.version>1.6.2.wso2v4</wsdl4j.wso2.version> + <version.commons.logging>1.1.1</version.commons.logging> + <xmlschema.wso2.version>1.4.7.wso2v2</xmlschema.wso2.version> + <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version> <jclouds.version>1.9.1</jclouds.version> <kubernetes.api.version>2.2.16</kubernetes.api.version> <store.version>1.0.1</store.version> <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> + <drools.version>5.5.0.Final</drools.version> + <slf4j.version>1.7.6</slf4j.version> + <wiremock.version>1.46</wiremock.version> + <quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version> + <json.wso2.version>2.0.0.wso2v1</json.wso2.version> + <kaptcha.wso2.version>2.3.0.wso2v1</kaptcha.wso2.version> + <rampart.mar.version>1.6.1-wso2v8</rampart.mar.version> + <opencsv.version>1.8</opencsv.version> + <poi.version>3.0-FINAL</poi.version> + <servlet-api.version>2.4</servlet-api.version> + <log4j.version>1.2.17</log4j.version> + <commons.logging.version>1.1</commons.logging.version> + <quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version> + <siddhi.version>2.0.0-wso2v5</siddhi.version> + <siddhi.event.processor.version>1.0.0</siddhi.event.processor.version> + <scr.annotations.version>1.9.12</scr.annotations.version> + + <!-- OSGi import ranges --> + <axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range> <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> + <imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet> + <carbon.platform.package.import.version.range>[4.2.0, 5.0.0)</carbon.platform.package.import.version.range> + <aopalliance.imp.pkg.version>[1.0,2)</aopalliance.imp.pkg.version> + <guice.imp.pkg.version>[3.0,4.0)</guice.imp.pkg.version> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/cartridge-agent/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/pom.xml b/products/cartridge-agent/modules/distribution/pom.xml index 09849e0..2422a29 100644 --- a/products/cartridge-agent/modules/distribution/pom.xml +++ b/products/cartridge-agent/modules/distribution/pom.xml @@ -17,9 +17,9 @@ ~ 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>cartidge-agent</artifactId> @@ -27,29 +27,15 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>apache-stratos-cartridge-agent</artifactId> <name>Apache Stratos - Cartridge Agent Distribution</name> - <repositories> - <repository> - <id>wso2-nexus</id> - <name>WSO2 internal Repository</name> - <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url> - <releases> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>ignore</checksumPolicy> - </releases> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.cartridge.agent</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.cartridge.agent</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> @@ -57,7 +43,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <archive> <manifest> @@ -67,18 +52,19 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <archiverConfig> - <fileMode>420</fileMode> - <directoryMode>493</directoryMode> - <defaultDirectoryMode>493</defaultDirectoryMode> - </archiverConfig> - <appendAssemblyId>false</appendAssemblyId> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <archiverConfig> + <fileMode>420</fileMode> + <directoryMode>493</directoryMode> + <defaultDirectoryMode>493</defaultDirectoryMode> + </archiverConfig> + <appendAssemblyId>false</appendAssemblyId> + </configuration> <executions> <execution> <phase>package</phase> @@ -90,4 +76,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml index 4c5ed14..1c8486b 100644 --- a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml +++ b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml @@ -17,8 +17,8 @@ ~ under the License. --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> <id>bin</id> <formats> @@ -84,7 +84,7 @@ <include>start-servers.sh</include> <include>clean.sh</include> <include>mount-volumes.sh</include> - <include>member-activated.sh</include> + <include>member-activated.sh</include> <include>member-started.sh</include> <include>member-terminated.sh</include> <include>member-suspended.sh</include> @@ -121,7 +121,7 @@ <outputDirectory>/</outputDirectory> <fileMode>0600</fileMode> </fileSet> - <fileSet> + <fileSet> <directory>${project.basedir}/src/main/notice</directory> <outputDirectory>/</outputDirectory> <fileMode>0600</fileMode> @@ -130,17 +130,17 @@ <dependencySets> <dependencySet> <excludes> - <exclude>*:annotations*</exclude> - <exclude>*:icu4j*</exclude> - <exclude>*:jaxen*</exclude> - <exclude>*:jboss-transaction-api*</exclude> - <exclude>*:wrapper*</exclude> - <exclude>*:xom*</exclude> - <exclude>slf4j.wso2:slf4j</exclude> - </excludes> + <exclude>*:annotations*</exclude> + <exclude>*:icu4j*</exclude> + <exclude>*:jaxen*</exclude> + <exclude>*:jboss-transaction-api*</exclude> + <exclude>*:wrapper*</exclude> + <exclude>*:xom*</exclude> + <exclude>slf4j.wso2:slf4j</exclude> + </excludes> <outputDirectory>/lib</outputDirectory> <useProjectArtifact>true</useProjectArtifact> <scope>runtime</scope> </dependencySet> </dependencySets> -</assembly> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/cartridge-agent/pom.xml ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/pom.xml b/products/cartridge-agent/pom.xml index f9b42bb..fe75d1c 100644 --- a/products/cartridge-agent/pom.xml +++ b/products/cartridge-agent/pom.xml @@ -17,22 +17,20 @@ ~ 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";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-products-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>cartidge-agent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Cartridge Agent Product</name> - <url>http://apache.org</url> <modules> <module>modules/distribution</module> </modules> -</project> - +</project> \ No newline at end of file
