Repository: stratos Updated Branches: refs/heads/master bef7f66df -> 70b2d64c6
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/stratos/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml index 71ebd0c..175f51d 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -19,6 +19,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</artifactId> @@ -26,11 +27,9 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-profile-gen</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Profile Generation</name> - <url>http://apache.org</url> <build> <plugins> @@ -310,7 +309,6 @@ <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>1.5.3</version> <executions> <execution> <id>2-p2-repo-generation</id> @@ -325,10 +323,10 @@ <publishArtifactRepository>true</publishArtifactRepository> <featureArtifacts> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.patch.version.4.2.1} @@ -343,10 +341,10 @@ org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.patch.version.4.2.1} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version} + org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.version} + org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.patch.version.4.2.4} @@ -355,21 +353,21 @@ org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.jaxws.webapp.mgt.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.jaxws.webapp.mgt.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef>org.wso2.store:org.wso2.store.feature:${store.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.version} + org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:${carbon.platform.patch.version.4.2.1} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.version} + org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.version} + org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.patch.version.4.2.1} @@ -381,12 +379,13 @@ org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.platform.patch.version.4.2.3} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version} + org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.kernel.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version} + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version} + org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.patch.version.4.2.1} @@ -451,24 +450,24 @@ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.stream.manager.feature:1.0.0 </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.databridge.datareceiver.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.databridge.datareceiver.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.databridge.streamdefn.registry.server.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.databridge.streamdefn.registry.server.feature:${carbon.kernel.version} </featureArtifactDef> <!--Cassandra--> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.cassandra.server.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.cassandra.server.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.cassandra.mgt.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.cassandra.mgt.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.cassandra.dataaccess.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.cassandra.dataaccess.feature:${carbon.kernel.version} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.cassandra.common.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.cassandra.common.feature:${carbon.kernel.version} </featureArtifactDef> <!-- Stratos features --> @@ -626,11 +625,11 @@ </feature> <feature> <id>org.wso2.carbon.jaxws.webapp.mgt.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.registry.ui.menu.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.identity.sso.saml.feature.group</id> @@ -670,7 +669,7 @@ </feature--> <feature> <id>org.wso2.carbon.transport.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.event.server.feature.group</id> @@ -678,11 +677,11 @@ </feature> <feature> <id>org.wso2.carbon.event.common.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.captcha.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.apache.stratos.tenant.activity.server.feature.group</id> @@ -796,7 +795,7 @@ </feature> <feature> <id>org.wso2.carbon.jaxws.webapp.mgt.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.security.mgt.server.feature.group</id> @@ -816,7 +815,7 @@ </feature> <feature> <id>org.wso2.carbon.registry.ui.menu.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.registry.resource.properties.feature.group</id> @@ -863,11 +862,11 @@ </feature> <feature> <id>org.wso2.carbon.jaxws.webapp.mgt.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.module.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.logging.mgt.feature.group</id> @@ -887,7 +886,7 @@ </feature> <feature> <id>org.wso2.carbon.transport.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.databridge.datapublisher.feature.group</id> @@ -899,7 +898,7 @@ </feature> <feature> <id>org.wso2.carbon.registry.ui.menu.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.registry.resource.properties.feature.group</id> @@ -1001,11 +1000,11 @@ </feature> <feature> <id>org.wso2.carbon.jaxws.webapp.mgt.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.registry.ui.menu.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.identity.sso.saml.feature.group</id> @@ -1033,7 +1032,7 @@ </feature> <feature> <id>org.wso2.carbon.transport.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.event.server.feature.group</id> @@ -1041,11 +1040,11 @@ </feature> <feature> <id>org.wso2.carbon.event.common.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.captcha.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.user.mgt.feature.group</id> @@ -1117,7 +1116,7 @@ </feature> <feature> <id>org.wso2.carbon.module.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.logging.mgt.feature.group</id> @@ -1159,29 +1158,29 @@ </feature> <feature> <id>org.wso2.carbon.databridge.datareceiver.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.databridge.streamdefn.registry.server.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <!--Cassandra--> <feature> <id>org.wso2.carbon.cassandra.server.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.cassandra.mgt.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.cassandra.dataaccess.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <feature> <id>org.wso2.carbon.cassandra.common.feature.group</id> - <version>${carbon.platform.version}</version> + <version>${carbon.kernel.version}</version> </feature> <!-- Stratos features --> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/products/stratos/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml index 728990f..ec38c41 100755 --- a/products/stratos/pom.xml +++ b/products/stratos/pom.xml @@ -16,18 +16,18 @@ ~ 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>stratos</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Product</name> - <url>http://apache.org</url> <description>Apache Stratos Product Parent</description> <modules> @@ -36,217 +36,9 @@ <module>modules/integration</module> </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2</artifactId> - <version>1.6.1.wso2v1</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom.wso2</groupId> - <artifactId>axiom</artifactId> - <version>1.2.11.wso2v2</version> - </dependency> - <dependency> - <groupId>org.apache.derby.wso2</groupId> - <artifactId>derby</artifactId> - <version>10.3.2.1wso2v1</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.core</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.ui</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.core</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.mgt.ui.search</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.ui.search</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.mgt.ui.resources</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.ui.resources</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.registry.ui.common</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>1.0.3</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>1.0.0</version> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.http.servlet</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.http.helper</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.equinox.jsp.jasper</artifactId> - <version>1.0.1.R33x_v20070816</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>javax.servlet.jsp</artifactId> - <version>2.0.0.v200706191603</version> - </dependency> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.apache.jasper</artifactId> - <version>5.5.17.v200706111724</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet-api.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt</artifactId> - <version>${eclipse.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.win32.win32.x86</artifactId> - <version>${eclipse.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jface</groupId> - <artifactId>org.eclipse.jface</artifactId> - <version>${eclipse.version}</version> - </dependency> - - <!-- Dependencies required for Cloud Manager --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.captcha.mgt</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.admin.mgt</artifactId> - <version>${carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt.email.sender</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt.axis2</artifactId> - <version>${stratos.component.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.theme.mgt</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.redirector.servlet</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.batik.wso2</groupId> - <artifactId>batik</artifactId> - <version>1.7.0.wso2v1</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - <version>1.0.10</version> - <executions> - <execution> - <id>generate-scr-scrdescriptor</id> - <goals> - <goal>scr</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - <profiles> <profile> + <id>default</id> <activation> <property> <name>sign</name> @@ -271,42 +63,4 @@ </build> </profile> </profiles> - - <properties> - <rampart.mar.version>1.6.1-wso2v8</rampart.mar.version> - <features-dashboard.war.version>1.0.0</features-dashboard.war.version> - <carbon.version>4.2.0</carbon.version> - <synapse.version>2.1.2.wso2v3</synapse.version> - <stratos.manager.version>${project.version}</stratos.manager.version> - <stratos.component.version>2.1.0</stratos.component.version> - <stratos.component.patch.version>2.1.3</stratos.component.patch.version> - <eclipse.version>3.2.0</eclipse.version> - <servlet-api.version>2.4</servlet-api.version> - <shoppingcart.version>2.1.0</shoppingcart.version> - <shoppingcart.global.version>2.1.0</shoppingcart.global.version> - <carbon.kernel.version>4.2.0</carbon.kernel.version> - <version.synapse>2.1.1-wso2v3</version.synapse> - <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version> - <carbon.platform.version>4.2.0</carbon.platform.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> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <opencsv.version>1.8</opencsv.version> - <poi.version>3.0-FINAL</poi.version> - <axis2.transport.version>1.1.0-wso2v8</axis2.transport.version> - <axis2.wso2.version>1.6.1.wso2v8</axis2.wso2.version> - <axiom.osgi.version>1.2.11.wso2v4</axiom.osgi.version> - <axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range> - <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> - </properties> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml index 4d66803..44250c8 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml @@ -19,22 +19,19 @@ --> <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-service-stubs-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId> <packaging>bundle</packaging> <name>Apache Stratos - Autoscaler Service Stub</name> - <url>http://apache.org</url> <build> <plugins> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -51,7 +48,7 @@ <arg line="-uri src/main/resources/AutoscalerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.autoscaler.stub -ns2p http://policy.exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.exception,http://application.exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.exception,http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.autoscale.policy,http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.deployment.policy,http://partition.common.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.partition,http://exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.exception,http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.deployment.partition,http://pojo.applications.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.pojo,http://pojo.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.pojo,http://kubernetes.exception.a utoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.exception,http://impl.services.autoscaler.stratos.apache.org=org.apache.stratos.autoscaler.stub.impl,http://common.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub,http://kubernetes.common.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.kubernetes"/> - <classpath refid="maven.dependency.classpath"/> + <classpath refid="maven.dependency.classpath"/> <classpath refid="maven.compile.classpath"/> <classpath refid="maven.runtime.classpath"/> </java> @@ -83,7 +80,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> <configuration> <instructions> @@ -136,5 +132,4 @@ <artifactId>neethi</artifactId> </dependency> </dependencies> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml index 2e1248b..68bb7c9 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml @@ -17,22 +17,21 @@ ~ 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-service-stubs-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId> <packaging>bundle</packaging> <name>Apache Stratos - Cloud Controller Service Stub</name> - <url>http://apache.org</url> + <build> <plugins> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -81,7 +80,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> <configuration> <instructions> @@ -130,5 +128,4 @@ <artifactId>neethi</artifactId> </dependency> </dependencies> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/service-stubs/org.apache.stratos.manager.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml index 7b7b1ba..64e3724 100644 --- a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml @@ -17,22 +17,21 @@ ~ 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-service-stubs-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.manager.service.stub</artifactId> <packaging>bundle</packaging> <name>Apache Stratos - Manager Service Stub</name> - <url>http://apache.org</url> <build> - <plugins> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -46,16 +45,19 @@ <configuration> <tasks> <path id="wsdl2java.classpath"> - <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" /> - <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar" /> - <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" /> + <pathelement + location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar"/> + <pathelement + location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.client.version}/axis2-client-${axis2.wso2.client.version}.jar"/> + <pathelement + location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar"/> </path> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <arg line="-uri src/main/resources/StratosManagerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.manager.service.stub -ns2p http://impl.services.manager.stratos.apache.org=org.apache.stratos.manager.service.stub.impl,http://domain.manager.stratos.apache.org/xsd=org.apache.stratos.manager.service.stub.domain,http://exception.manager.stratos.apache.org/xsd=org.apache.stratos.manager.service.stub.exceptions,http://signup.application.domain.messaging.stratos.apache.org/xsd=org.apache.stratos.manager.service.stub.domain.application.signup"; /> - <classpath refid="wsdl2java.classpath" /> - <classpath refid="maven.dependency.classpath" /> - <classpath refid="maven.compile.classpath" /> - <classpath refid="maven.runtime.classpath" /> + <arg line="-uri src/main/resources/StratosManagerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.manager.service.stub -ns2p http://impl.services.manager.stratos.apache.org=org.apache.stratos.manager.service.stub.impl,http://domain.manager.stratos.apache.org/xsd=org.apache.stratos.manager.service.stub.domain,http://exception.manager.stratos.apache.org/xsd=org.apache.stratos.manager.service.stub.exceptions,http://signup.application.domain.messaging.stratos.apache.org/xsd=org.apache.stratos.manager.service.stub.domain.application.signup"/> + <classpath refid="wsdl2java.classpath"/> + <classpath refid="maven.dependency.classpath"/> + <classpath refid="maven.compile.classpath"/> + <classpath refid="maven.runtime.classpath"/> </java> </tasks> </configuration> @@ -82,10 +84,9 @@ </execution> </executions> </plugin> - <plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> <configuration> <instructions> @@ -112,7 +113,7 @@ <groupId>org.apache.axis2.wso2</groupId> <artifactId>axis2</artifactId> </dependency> - <dependency> + <dependency> <groupId>org.apache.axis2.wso2</groupId> <artifactId>axis2-client</artifactId> </dependency> @@ -121,4 +122,4 @@ <artifactId>wsdl4j</artifactId> </dependency> </dependencies> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/service-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml index 13a7b3c..726dbc6 100644 --- a/service-stubs/pom.xml +++ b/service-stubs/pom.xml @@ -18,21 +18,21 @@ ~ 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-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-service-stubs-parent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Service Stubs</name> <url>http://apache.org</url> - <modules> + <modules> <module>org.apache.stratos.cloud.controller.service.stub</module> <module>org.apache.stratos.manager.service.stub</module> <module>org.apache.stratos.autoscaler.service.stub</module> @@ -43,69 +43,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> </plugin> </plugins> </build> - - <dependencyManagement> - <dependencies> - <!--axis2 dependency--> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2</artifactId> - <version>${axis2.wso2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis2.wso2</groupId> - <artifactId>axis2-client</artifactId> - <version>${axis2.wso2.client.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>1.1.1</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> - <!--exclusions> - <exclusion> - <groupId>org.apache.neethi</groupId> - <artifactId>neethi</artifactId> - </exclusion> - </exclusions--> - </dependency> - </dependencies> - </dependencyManagement> - - <properties> - <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version> - <axis2.wso2.client.version>${axis2.wso2.version}</axis2.wso2.client.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> - <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version> - <orbit.version.axiom>1.2.11.wso2v3</orbit.version.axiom> - <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version> - </properties> - -</project> - - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml deleted file mode 100644 index 0d04e62..0000000 --- a/tools/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - 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-parent</artifactId> - <version>4.1.2-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>stratos-tools</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Tools</name> - <description>Apache Stratos plafrom tools</description> - <url>http://apache.org</url> - - <modules/> -</project> -
