Repository: stratos Updated Branches: refs/heads/stratos-4.1.x e687adadd -> a5a7aba0b
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml index 13b57ba..9c23923 100755 --- a/products/stratos/modules/distribution/pom.xml +++ b/products/stratos/modules/distribution/pom.xml @@ -36,53 +36,43 @@ <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart</artifactId> - <version>${rampart.mar.version}</version> <type>mar</type> </dependency> <dependency> <groupId>bouncycastle</groupId> <artifactId>bcprov-jdk15</artifactId> - <version>132</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.mediator.bridge</artifactId> - <version>${carbon.kernel.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.10.0</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> - <version>1.0.1</version> </dependency> <dependency> <groupId>org.fusesource.hawtbuf</groupId> <artifactId>hawtbuf</artifactId> - <version>1.9</version> </dependency> <dependency> <groupId>org.eclipse.paho</groupId> <artifactId>mqtt-client</artifactId> - <version>0.4.0</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.cep300.extension</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.wso2.carbon.ui</artifactId> - <version>${carbon.ui.stratos.version}</version> </dependency> </dependencies> @@ -91,7 +81,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>maven-buildnumber-plugin</artifactId> - <version>0.9.4</version> <configuration> <format>{0,date,dd MMM yyyy}</format> <items> @@ -285,4 +274,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/distribution/src/main/conf/etc/launch.ini ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/etc/launch.ini b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini index 53dbec5..23a315c 100644 --- a/products/stratos/modules/distribution/src/main/conf/etc/launch.ini +++ b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini @@ -22,12 +22,12 @@ # @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework # "*" can be used together with @null to clear System Properties that match a prefix name. -osgi.*=@null -org.osgi.*=@null -eclipse.*=@null +osgi.* = @null +org.osgi.* = @null +eclipse.* = @null -osgi.parentClassloader=app -osgi.contextClassLoaderParent=app +osgi.parentClassloader = app +osgi.contextClassLoaderParent = app # When osgi.clean is set to "true", any cached data used by the OSGi framework # will be wiped clean. This will clean the caches used to store bundle @@ -38,7 +38,7 @@ osgi.contextClassLoaderParent=app # true, if you manually start a bundle, it would not be available when # you re-start the system. To avid this, copy the bundle jar to the plugins # folder, before you re-start the system. -osgi.clean=true +osgi.clean = true # Uncomment the following line to turn on Eclipse Equinox debugging. # You may also edit the osgi-debug.options file and fine tune the debugging @@ -46,7 +46,7 @@ osgi.clean=true #osgi.debug=./repository/conf/osgi-debug.options # Following system property allows us to control the public JDK packages exported through the system bundle. -org.osgi.framework.system.packages=javax.accessibility,\ +org.osgi.framework.system.packages = javax.accessibility,\ javax.lang.model.type, \ javax.activity,\ javax.crypto,\ @@ -121,6 +121,9 @@ javax.transaction,\ javax.transaction.xa,\ javax.xml.namespace,\ javax.xml.parsers,\ +javax.xml.stream,\ +javax.xml.stream.events,\ +javax.xml.stream.util,\ javax.xml.transform,\ javax.xml.transform.stream,\ javax.xml.transform.dom,\ @@ -256,8 +259,16 @@ org.apache.xml.resolver.readers,\ org.apache.xml.resolver.etc,\ org.apache.xml.resolver.apps,\ javax.xml.ws,\ +javax.xml.ws.handler,\ +javax.xml.ws.handler.soap,\ +javax.xml.ws.http,\ +javax.xml.ws.soap,\ +javax.xml.ws.spi,\ +javax.xml.ws.spi.http,\ +javax.xml.ws.wsaddressing,\ javax.xml.bind,\ javax.xml.bind.annotation,\ +javax.xml.bind.annotation.adapters,\ javax.annotation,\ javax.jws,\ javax.jws.soap,\ @@ -266,4 +277,3 @@ com.sun.xml.internal.messaging.saaj.soap.ver1_1,\ com.sun.xml.internal.messaging.saaj.soap,\ com.sun.tools.internal.ws.spi,\ org.wso2.carbon.bootstrap - http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/integration/test-common/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-common/pom.xml b/products/stratos/modules/integration/test-common/pom.xml index 016949b..4da23fa 100755 --- a/products/stratos/modules/integration/test-common/pom.xml +++ b/products/stratos/modules/integration/test-common/pom.xml @@ -32,13 +32,20 @@ <dependencies> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon.automation</groupId> @@ -94,33 +101,19 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-all</artifactId> - <version>5.10.0</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents.wso2</groupId> - <artifactId>httpcore</artifactId> - <version>${httpcore.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents.wso2</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.metadata.client</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.mock.iaas.client</artifactId> - <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/integration/test-integration/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/pom.xml b/products/stratos/modules/integration/test-integration/pom.xml index 427b60b..642b333 100755 --- a/products/stratos/modules/integration/test-integration/pom.xml +++ b/products/stratos/modules/integration/test-integration/pom.xml @@ -37,11 +37,6 @@ <artifactId>commons-exec</artifactId> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.wso2.carbon.automation</groupId> <artifactId>org.wso2.carbon.automation.test.utils</artifactId> </dependency> @@ -104,28 +99,23 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-all</artifactId> - <version>5.10.0</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents.wso2</groupId> + <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>${httpcore.version}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents.wso2</groupId> + <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.mock.iaas.client</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> @@ -139,7 +129,6 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.integration.common</artifactId> - <version>${project.version}</version> </dependency> </dependencies> @@ -223,7 +212,8 @@ </plugin> </plugins> </build> + <properties> <suiteFile>${basedir}/src/test/resources/test-suite-all.xml</suiteFile> </properties> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 3091253..704b2a1 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -332,7 +332,7 @@ org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.patch.version.4.2.1} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.ntask.feature:${carbon.platform.patch.version.4.2.1} + org.wso2.carbon:org.wso2.carbon.ntask.core.feature:${carbon.platform.patch.version.4.2.1} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.patch.version.4.2.2} @@ -355,7 +355,7 @@ <featureArtifactDef> 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>org.wso2.store:org.wso2.store.feature:${wso2.store.version} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.kernel.version} @@ -406,26 +406,28 @@ org.wso2.carbon:org.wso2.carbon.idp.mgt.feature:${carbon.platform.patch.version.4.2.3} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.stratos.common.feature:2.2.2 + org.wso2.carbon:org.wso2.carbon.stratos.common.feature:${wso2.carbon.stratos.common.feature.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:4.2.2 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.patch.version.4.2.2} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:4.2.2 + org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:${carbon.platform.patch.version.4.2.2} </featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:4.2.0 + org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:${carbon.platform.version.4.2.0} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:4.2.3 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.platform.patch.version.4.2.3} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.platform.patch.version.4.2.2} </featureArtifactDef> - <featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:0.9.0.ALPHA4.wso2v3 + <featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:${jaggeryjs.version} </featureArtifactDef> - <featureArtifactDef>caramel:caramel.feature:1.0.1</featureArtifactDef> + <featureArtifactDef>caramel:caramel.feature:${caramel.version}</featureArtifactDef> <featureArtifactDef> - org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:4.2.1 + org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${carbon.platform.patch.version.4.2.1} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.logging.mgt.feature:${carbon.platform.patch.version.4.2.2} @@ -435,19 +437,26 @@ </featureArtifactDef> <!--CEP--> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.input.adaptor.feature:1.0.0 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.input.adaptor.feature:${carbon.event.processor.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.output.adaptor.feature:1.0.0 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.output.adaptor.feature:${carbon.event.processor.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.builder.feature:1.0.0 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.builder.feature:${carbon.event.processor.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.formatter.feature:1.0.0 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.formatter.feature:${carbon.event.processor.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.tracer.feature:1.0.0 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.tracer.feature:${carbon.event.processor.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.statistics.feature:1.0.0 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.statistics.feature:${carbon.event.processor.version} </featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.stream.manager.feature:1.0.0 + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.event.stream.manager.feature:${carbon.event.processor.version} </featureArtifactDef> <featureArtifactDef> org.wso2.carbon:org.wso2.carbon.databridge.datareceiver.feature:${carbon.kernel.version} @@ -501,7 +510,6 @@ <featureArtifactDef> org.apache.stratos:org.apache.stratos.manager.styles.feature:${project.version} </featureArtifactDef> - <!-- Mock IaaS features --> <featureArtifactDef> org.apache.stratos:org.apache.stratos.mock.iaas.api.feature:${project.version} </featureArtifactDef> @@ -614,7 +622,7 @@ <features> <feature> <id>org.wso2.store.feature.group</id> - <version>${store.version}</version> + <version>${wso2.store.version}</version> </feature> <feature> <id>org.wso2.carbon.webapp.mgt.feature.group</id> @@ -649,22 +657,10 @@ <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> - <id>org.wso2.carbon.ntask.feature.group</id> + <id>org.wso2.carbon.ntask.core.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> - <id>org.apache.stratos.common.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.manager.styles.feature.group</id> - <version>${project.version}</version> - </feature> - <!--feature> - <id>org.wso2.carbon.transaction.manager.feature.group</id> - <version>${carbon.platform.patch.version.4.2.1}</version> - </feature--> - <feature> <id>org.wso2.carbon.transport.mgt.server.feature.group</id> <version>${carbon.kernel.version}</version> </feature> @@ -681,22 +677,6 @@ <version>${carbon.kernel.version}</version> </feature> <feature> - <id>org.apache.stratos.manager.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.rest.endpoint.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.metadata.service.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.messaging.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id> <version>${carbon.platform.patch.version.4.2.2}</version> </feature> @@ -706,59 +686,84 @@ </feature> <feature> <id>org.jaggeryjs.feature.group</id> - <version>0.9.0.ALPHA4.wso2v3</version> + <version>${jaggeryjs.version}</version> </feature> <feature> <id>caramel.feature.group</id> - <version>1.0.1</version> + <version>${caramel.version}</version> </feature> <feature> <id> org.wso2.carbon.identity.application.authentication.framework.server.feature.group </id> - <version>4.2.2</version> + <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> <id>org.wso2.carbon.identity.oauth.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.identity.provider.server.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.idp.mgt.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.stratos.common.feature.group</id> - <version>2.2.2</version> + <version>${wso2.carbon.stratos.common.feature.version}</version> </feature> <feature> <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id> - <version>4.2.2</version> + <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> <id>org.wso2.carbon.identity.relying.party.server.feature.group</id> - <version>4.2.2</version> + <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> <id>org.wso2.carbon.identity.application.mgt.feature.group</id> - <version>4.2.0</version> + <version>${carbon.platform.version.4.2.0}</version> </feature> <feature> <id>org.wso2.carbon.identity.core.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.identity.user.profile.server.feature.group</id> - <version>4.2.2</version> + <version>${carbon.platform.patch.version.4.2.2}</version> </feature> - <!-- User Management features --> <feature> <id>org.wso2.carbon.user.mgt.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> + + <!-- Stratos features --> + <feature> + <id>org.apache.stratos.common.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.manager.styles.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.manager.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.rest.endpoint.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.metadata.service.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.messaging.feature.group</id> + <version>${project.version}</version> + </feature> <feature> <id>org.apache.stratos.custom.handlers.feature.group</id> <version>${project.version}</version> @@ -783,6 +788,10 @@ <deleteOldProfileFiles>true</deleteOldProfileFiles> <features> <feature> + <id>org.wso2.carbon.ntask.core.feature.group</id> + <version>${carbon.platform.patch.version.4.2.1}</version> + </feature> + <feature> <id>org.wso2.carbon.webapp.mgt.feature.group</id> <version>${carbon.deployment.version}</version> </feature> @@ -795,14 +804,6 @@ <version>${carbon.platform.patch.version.4.2.4}</version> </feature> <feature> - <id>org.apache.stratos.autoscaler.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.messaging.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> <id>org.wso2.carbon.registry.core.feature.group</id> <version>${carbon.platform.patch.version.4.2.2}</version> </feature> @@ -814,6 +815,16 @@ <id>org.wso2.carbon.registry.resource.properties.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> + + <!-- Stratos features --> + <feature> + <id>org.apache.stratos.autoscaler.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.messaging.feature.group</id> + <version>${project.version}</version> + </feature> <feature> <id>org.apache.stratos.common.feature.group</id> <version>${project.version}</version> @@ -838,10 +849,6 @@ <deleteOldProfileFiles>true</deleteOldProfileFiles> <features> <feature> - <id>org.apache.stratos.common.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> <id>org.wso2.carbon.webapp.mgt.feature.group</id> <version>${carbon.deployment.version}</version> </feature> @@ -862,10 +869,6 @@ <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> - <id>org.apache.stratos.cloud.controller.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> <id>org.wso2.carbon.service.mgt.server.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> @@ -897,6 +900,16 @@ <id>org.wso2.carbon.event.server.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> + + <!-- Stratos features --> + <feature> + <id>org.apache.stratos.cloud.controller.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.common.feature.group</id> + <version>${project.version}</version> + </feature> </features> </configuration> </execution> @@ -933,6 +946,12 @@ <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> + <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id> + <version>${carbon.platform.patch.version.4.2.2}</version> + </feature> + + <!-- Stratos features --> + <feature> <id>org.apache.stratos.common.feature.group</id> <version>${project.version}</version> </feature> @@ -944,10 +963,6 @@ <id>org.apache.stratos.messaging.feature.group</id> <version>${project.version}</version> </feature> - <feature> - <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id> - <version>4.2.2</version> - </feature> </features> </configuration> </execution> @@ -969,7 +984,7 @@ <features> <feature> <id>org.wso2.store.feature.group</id> - <version>${store.version}</version> + <version>${wso2.store.version}</version> </feature> <feature> <id>org.wso2.carbon.webapp.mgt.feature.group</id> @@ -1004,7 +1019,7 @@ <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> - <id>org.wso2.carbon.ntask.feature.group</id> + <id>org.wso2.carbon.ntask.core.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> @@ -1041,55 +1056,55 @@ </feature> <feature> <id>org.jaggeryjs.feature.group</id> - <version>0.9.0.ALPHA4.wso2v3</version> + <version>${jaggeryjs.version}</version> </feature> <feature> <id>caramel.feature.group</id> - <version>1.0.1</version> + <version>${caramel.version}</version> </feature> <feature> <id> org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group </id> - <version>4.2.1</version> + <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> <id> org.wso2.carbon.identity.application.authentication.framework.server.feature.group </id> - <version>4.2.2</version> + <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> <id>org.wso2.carbon.identity.oauth.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.identity.provider.server.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.idp.mgt.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.stratos.common.feature.group</id> - <version>2.2.2</version> + <version>${wso2.carbon.stratos.common.feature.version}</version> </feature> <feature> <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id> - <version>4.2.2</version> + <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> <id>org.wso2.carbon.identity.relying.party.server.feature.group</id> - <version>4.2.2</version> + <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> <id>org.wso2.carbon.identity.application.mgt.feature.group</id> - <version>4.2.0</version> + <version>${carbon.platform.version.4.2.0}</version> </feature> <feature> <id>org.wso2.carbon.identity.core.feature.group</id> - <version>4.2.3</version> + <version>${carbon.platform.patch.version.4.2.3}</version> </feature> <feature> <id>org.wso2.carbon.module.mgt.server.feature.group</id> @@ -1107,31 +1122,31 @@ <!--CEP features--> <feature> <id>org.wso2.carbon.event.input.adaptor.feature.group</id> - <version>1.0.0</version> + <version>${carbon.event.processor.version}</version> </feature> <feature> <id>org.wso2.carbon.event.output.adaptor.feature.group</id> - <version>1.0.0</version> + <version>${carbon.event.processor.version}</version> </feature> <feature> <id>org.wso2.carbon.event.builder.feature.group</id> - <version>1.0.0</version> + <version>${carbon.event.processor.version}</version> </feature> <feature> <id>org.wso2.carbon.event.formatter.feature.group</id> - <version>1.0.0</version> + <version>${carbon.event.processor.version}</version> </feature> <feature> <id>org.wso2.carbon.event.tracer.feature.group</id> - <version>1.0.0</version> + <version>${carbon.event.processor.version}</version> </feature> <feature> <id>org.wso2.carbon.event.statistics.feature.group</id> - <version>1.0.0</version> + <version>${carbon.event.processor.version}</version> </feature> <feature> <id>org.wso2.carbon.event.stream.manager.feature.group</id> - <version>1.0.0</version> + <version>${carbon.event.processor.version}</version> </feature> <feature> <id>org.wso2.carbon.databridge.datareceiver.feature.group</id> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml index ff1396f..69874e0 100755 --- a/products/stratos/pom.xml +++ b/products/stratos/pom.xml @@ -35,32 +35,4 @@ <module>modules/distribution</module> <module>modules/integration</module> </modules> - - <profiles> - <profile> - <id>default</id> - <activation> - <property> - <name>sign</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/service-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml index 49f1181..d8dc84c 100644 --- a/service-stubs/pom.xml +++ b/service-stubs/pom.xml @@ -30,20 +30,10 @@ <artifactId>stratos-service-stubs-parent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Service Stubs</name> - <url>http://apache.org</url> <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> </modules> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file +</project>
