Revert "Apache Stratos 4.1.0 release" This reverts commit 3cc52e99d7fca3504c0dae814450c29d9c4de90d.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6b89b3d2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6b89b3d2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6b89b3d2 Branch: refs/heads/master Commit: 6b89b3d2713f0e9d1de6cbf653becb75f4115c5c Parents: 67acdae Author: Lahiru Sandaruwan <[email protected]> Authored: Fri May 22 21:25:37 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri May 22 21:25:37 2015 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.activation/pom.xml | 2 +- .../org.apache.stratos.autoscaler/pom.xml | 2 +- .../org.apache.stratos.cartridge.agent/pom.xml | 2 +- .../agent/test/JavaCartridgeAgentTest.java | 4 +- components/org.apache.stratos.cli/pom.xml | 4 +- .../src/test/python/README.md | 2 +- .../org.apache.stratos.cloud.controller/pom.xml | 2 +- components/org.apache.stratos.common/pom.xml | 2 +- .../org.apache.stratos.custom.handlers/pom.xml | 2 +- .../org.apache.stratos.deployment/pom.xml | 2 +- .../org.apache.stratos.email.sender/pom.xml | 2 +- .../org.apache.stratos.keystore.mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.apache.stratos.load.balancer/pom.xml | 2 +- .../org.apache.stratos.logging.view.ui/pom.xml | 2 +- .../org.apache.stratos.manager.styles/pom.xml | 2 +- components/org.apache.stratos.manager/pom.xml | 2 +- .../activemq-data/testBroker/KahaDB/db-1.log | Bin 33030144 -> 0 bytes .../activemq-data/testBroker/KahaDB/db.data | Bin 49152 -> 0 bytes .../activemq-data/testBroker/KahaDB/db.redo | Bin 49240 -> 0 bytes components/org.apache.stratos.messaging/pom.xml | 2 +- .../org.apache.stratos.metadata.client/pom.xml | 2 +- .../org.apache.stratos.metadata.service/pom.xml | 2 +- .../org.apache.stratos.mock.iaas.api/pom.xml | 4 +- .../org.apache.stratos.mock.iaas.client/pom.xml | 2 +- components/org.apache.stratos.mock.iaas/pom.xml | 2 +- .../pom.xml | 4 +- .../org.apache.stratos.rest.endpoint/pom.xml | 2 +- .../pom.xml | 2 +- .../org.apache.stratos.tenant.activity/pom.xml | 2 +- components/pom.xml | 2 +- .../jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 2 +- dependencies/jclouds/apis/vcloud/Readme.md | 2 +- dependencies/org.wso2.carbon.ui/pom.xml | 2 +- dependencies/pom.xml | 2 +- extensions/cep/stratos-cep-extension/pom.xml | 4 +- .../load-balancer/haproxy-extension/pom.xml | 2 +- .../load-balancer/nginx-extension/pom.xml | 2 +- extensions/load-balancer/pom.xml | 2 +- extensions/pom.xml | 2 +- .../pom.xml | 2 +- features/autoscaler/pom.xml | 2 +- .../pom.xml | 6 +-- .../pom.xml | 4 +- features/cep/pom.xml | 2 +- .../pom.xml | 2 +- features/cloud-controller/pom.xml | 2 +- .../org.apache.stratos.common.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/common/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/load-balancer/pom.xml | 2 +- features/manager/deployment/pom.xml | 2 +- .../pom.xml | 2 +- features/manager/logging-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/manager/pom.xml | 2 +- .../pom.xml | 2 +- .../org.apache.stratos.manager.feature/pom.xml | 2 +- .../pom.xml | 2 +- features/manager/stratos-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/manager/tenant-activity/pom.xml | 2 +- .../pom.xml | 2 +- features/messaging/pom.xml | 2 +- .../pom.xml | 2 +- features/mock-iaas/pom.xml | 2 +- features/pom.xml | 2 +- pom.xml | 4 +- .../modules/distribution/pom.xml | 2 +- .../distribution/src/main/license/LICENSE | 14 +++---- products/cartridge-agent/pom.xml | 2 +- .../load-balancer/modules/distribution/pom.xml | 2 +- .../distribution/src/main/license/LICENSE | 8 ++-- .../load-balancer/modules/p2-profile/pom.xml | 2 +- products/load-balancer/pom.xml | 2 +- products/pom.xml | 2 +- products/python-cartridge-agent/pom.xml | 2 +- products/stratos-cli/distribution/pom.xml | 2 +- .../distribution/src/main/license/LICENSE | 14 +++---- products/stratos-cli/pom.xml | 2 +- products/stratos/modules/distribution/pom.xml | 4 +- .../distribution/src/main/license/LICENSE | 38 +++++++++---------- products/stratos/modules/integration/pom.xml | 4 +- .../tests/StratosTestServerManager.java | 2 +- products/stratos/modules/p2-profile-gen/pom.xml | 2 +- products/stratos/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- service-stubs/pom.xml | 2 +- .../base-image/Dockerfile | 10 ++--- .../base-image/files/run | 2 +- .../cartridge-docker-images/build.sh | 2 +- .../stratos-docker-images/run-example.sh | 2 +- tools/pom.xml | 2 +- tools/puppet3/modules/agent/files/README.txt | 2 +- .../modules/python_agent/manifests/init.pp | 2 +- tools/stratos-installer/conf/setup.conf | 2 +- 106 files changed, 151 insertions(+), 151 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.activation/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.activation/pom.xml b/components/org.apache.stratos.activation/pom.xml index 5b1c25f..1c422d5 100644 --- a/components/org.apache.stratos.activation/pom.xml +++ b/components/org.apache.stratos.activation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.autoscaler/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml index fa2a327..3f0527c 100644 --- a/components/org.apache.stratos.autoscaler/pom.xml +++ b/components/org.apache.stratos.autoscaler/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.cartridge.agent/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml index 716e464..5e25e64 100644 --- a/components/org.apache.stratos.cartridge.agent/pom.xml +++ b/components/org.apache.stratos.cartridge.agent/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java index 27db6cc..3f0e73e 100644 --- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java +++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java @@ -77,7 +77,7 @@ public class JavaCartridgeAgentTest { private static final String PARTITION_ID = "partition-1"; private static final String TENANT_ID = "-1234"; private static final String SERVICE_NAME = "php"; - public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.0"; + public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.0-SNAPSHOT"; private static HashMap<String, Executor> executorList; private static ArrayList<ServerSocket> serverSocketList; private final ArtifactUpdatedEvent artifactUpdatedEvent; @@ -249,7 +249,7 @@ public class JavaCartridgeAgentTest { } log.info("Copying agent jar"); - String agentJar = "org.apache.stratos.cartridge.agent-4.1.0.jar"; + String agentJar = "org.apache.stratos.cartridge.agent-4.1.0-SNAPSHOT.jar"; String agentJarSource = getResourcesFolderPath() + "/../" + agentJar; String agentJarDest = agentHome.getCanonicalPath() + "/lib/" + agentJar; FileUtils.copyFile(new File(agentJarSource), new File(agentJarDest)); http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.cli/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml index cfd0324..eafec42 100644 --- a/components/org.apache.stratos.cli/pom.xml +++ b/components/org.apache.stratos.cli/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -110,7 +110,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.manager</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.cli/src/test/python/README.md ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/test/python/README.md b/components/org.apache.stratos.cli/src/test/python/README.md index 57cbfbb..878ad1e 100644 --- a/components/org.apache.stratos.cli/src/test/python/README.md +++ b/components/org.apache.stratos.cli/src/test/python/README.md @@ -18,7 +18,7 @@ Set the environment variables CLI_JAR, PYTHONPATH and WIREMOCK_JAR, WIREMOCK_HTT ``` # the stratos CLI_JAR -export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.0.jar +export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.0-SNAPSHOT.jar # set the PYTHONPATH to include pexpect export PYTHONPATH=$PYTHONPATH:~/stratos/components/org.apache.stratos.cli/target/pexpect-3.2 http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.cloud.controller/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml index de96f0b..06cb256 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.common/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml index 8d20eeb..d43a39a 100644 --- a/components/org.apache.stratos.common/pom.xml +++ b/components/org.apache.stratos.common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.custom.handlers/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.custom.handlers/pom.xml b/components/org.apache.stratos.custom.handlers/pom.xml index 8ac2496..e470521 100644 --- a/components/org.apache.stratos.custom.handlers/pom.xml +++ b/components/org.apache.stratos.custom.handlers/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.deployment/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.deployment/pom.xml b/components/org.apache.stratos.deployment/pom.xml index 8d813d4..623efb1 100644 --- a/components/org.apache.stratos.deployment/pom.xml +++ b/components/org.apache.stratos.deployment/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.email.sender/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.email.sender/pom.xml b/components/org.apache.stratos.email.sender/pom.xml index c7c64f7..a83576a 100644 --- a/components/org.apache.stratos.email.sender/pom.xml +++ b/components/org.apache.stratos.email.sender/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.keystore.mgt/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.keystore.mgt/pom.xml b/components/org.apache.stratos.keystore.mgt/pom.xml index 36f57b0..4027777 100644 --- a/components/org.apache.stratos.keystore.mgt/pom.xml +++ b/components/org.apache.stratos.keystore.mgt/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.kubernetes.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/pom.xml b/components/org.apache.stratos.kubernetes.client/pom.xml index f9cfa5a..921c717 100644 --- a/components/org.apache.stratos.kubernetes.client/pom.xml +++ b/components/org.apache.stratos.kubernetes.client/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.load.balancer.common/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/pom.xml b/components/org.apache.stratos.load.balancer.common/pom.xml index 2076906..b19e0a0 100644 --- a/components/org.apache.stratos.load.balancer.common/pom.xml +++ b/components/org.apache.stratos.load.balancer.common/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.load.balancer.extension.api/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.extension.api/pom.xml b/components/org.apache.stratos.load.balancer.extension.api/pom.xml index 2645d0a..c54c674 100644 --- a/components/org.apache.stratos.load.balancer.extension.api/pom.xml +++ b/components/org.apache.stratos.load.balancer.extension.api/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.stratos</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.load.balancer/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/pom.xml b/components/org.apache.stratos.load.balancer/pom.xml index 1f8c503..b723858 100644 --- a/components/org.apache.stratos.load.balancer/pom.xml +++ b/components/org.apache.stratos.load.balancer/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.logging.view.ui/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.logging.view.ui/pom.xml b/components/org.apache.stratos.logging.view.ui/pom.xml index 42db71b..f0e8463 100644 --- a/components/org.apache.stratos.logging.view.ui/pom.xml +++ b/components/org.apache.stratos.logging.view.ui/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.manager.styles/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.styles/pom.xml b/components/org.apache.stratos.manager.styles/pom.xml index f91dc11..191f5a1 100644 --- a/components/org.apache.stratos.manager.styles/pom.xml +++ b/components/org.apache.stratos.manager.styles/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.manager/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml index fa525ec..5fe23b2 100644 --- a/components/org.apache.stratos.manager/pom.xml +++ b/components/org.apache.stratos.manager/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log deleted file mode 100644 index f60d742..0000000 Binary files a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db-1.log and /dev/null differ http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data deleted file mode 100644 index 269d420..0000000 Binary files a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.data and /dev/null differ http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo b/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo deleted file mode 100644 index caa303b..0000000 Binary files a/components/org.apache.stratos.messaging/activemq-data/testBroker/KahaDB/db.redo and /dev/null differ http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.messaging/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml index 1a2d6c1..f75f11c 100644 --- a/components/org.apache.stratos.messaging/pom.xml +++ b/components/org.apache.stratos.messaging/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.metadata.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml index a2da4db..ac998c6 100644 --- a/components/org.apache.stratos.metadata.client/pom.xml +++ b/components/org.apache.stratos.metadata.client/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>org.apache.stratos.metadata.client</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.metadata.service/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.service/pom.xml b/components/org.apache.stratos.metadata.service/pom.xml index 1732302..9982467 100644 --- a/components/org.apache.stratos.metadata.service/pom.xml +++ b/components/org.apache.stratos.metadata.service/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.mock.iaas.api/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.api/pom.xml b/components/org.apache.stratos.mock.iaas.api/pom.xml index 34e9c86..a9058c6 100644 --- a/components/org.apache.stratos.mock.iaas.api/pom.xml +++ b/components/org.apache.stratos.mock.iaas.api/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.mock.iaas.api</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>Apache Stratos - Mock IaaS API</name> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.mock.iaas.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml index 2633a98..689c54e 100644 --- a/components/org.apache.stratos.mock.iaas.client/pom.xml +++ b/components/org.apache.stratos.mock.iaas.client/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>stratos-components-parent</artifactId> <groupId>org.apache.stratos</groupId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.mock.iaas/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas/pom.xml b/components/org.apache.stratos.mock.iaas/pom.xml index a8a7ae0..dd87da5 100644 --- a/components/org.apache.stratos.mock.iaas/pom.xml +++ b/components/org.apache.stratos.mock.iaas/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>stratos-components-parent</artifactId> <groupId>org.apache.stratos</groupId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.python.cartridge.agent/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml index 12ed895..871fbfe 100644 --- a/components/org.apache.stratos.python.cartridge.agent/pom.xml +++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -142,7 +142,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.rest.endpoint/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml index 1473bfa..e661dfd 100644 --- a/components/org.apache.stratos.rest.endpoint/pom.xml +++ b/components/org.apache.stratos.rest.endpoint/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.sso.redirector.ui/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.sso.redirector.ui/pom.xml b/components/org.apache.stratos.sso.redirector.ui/pom.xml index 716c773..962ab5c 100644 --- a/components/org.apache.stratos.sso.redirector.ui/pom.xml +++ b/components/org.apache.stratos.sso.redirector.ui/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/org.apache.stratos.tenant.activity/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity/pom.xml b/components/org.apache.stratos.tenant.activity/pom.xml index 85a20ac..51c3a6b 100644 --- a/components/org.apache.stratos.tenant.activity/pom.xml +++ b/components/org.apache.stratos.tenant.activity/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index 0e58b6c..7bbe37d 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml index eacdadb..8357aec 100644 --- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml +++ b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml @@ -126,6 +126,6 @@ </profiles> <scm> - <tag>4.1.0-rc1</tag> + <tag>4.0.0-rc4</tag> </scm> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/dependencies/jclouds/apis/vcloud/Readme.md ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/vcloud/Readme.md b/dependencies/jclouds/apis/vcloud/Readme.md index 2e051fa..43cfbdc 100644 --- a/dependencies/jclouds/apis/vcloud/Readme.md +++ b/dependencies/jclouds/apis/vcloud/Readme.md @@ -92,7 +92,7 @@ index 4eb34f9..8357aec 100644 - + <scm> -+ <tag>4.1.0-rc1</tag> ++ <tag>4.0.0-rc4</tag> + </scm> </project> diff --git a/home/rajkumar/workspace/apache/jclouds/jclouds-jclouds-1.8.1/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudMediaType.java b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/src/main/java/org/jclouds/vcloud/VCloudMediaType.java http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/dependencies/org.wso2.carbon.ui/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml index 508f243..0d5c342 100644 --- a/dependencies/org.wso2.carbon.ui/pom.xml +++ b/dependencies/org.wso2.carbon.ui/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 10f11d0..46bed08 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/extensions/cep/stratos-cep-extension/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/stratos-cep-extension/pom.xml b/extensions/cep/stratos-cep-extension/pom.xml index ed52c98..7fc3d25 100644 --- a/extensions/cep/stratos-cep-extension/pom.xml +++ b/extensions/cep/stratos-cep-extension/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-extensions</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -49,7 +49,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/extensions/load-balancer/haproxy-extension/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/haproxy-extension/pom.xml b/extensions/load-balancer/haproxy-extension/pom.xml index b4cf9a0..df807c3 100644 --- a/extensions/load-balancer/haproxy-extension/pom.xml +++ b/extensions/load-balancer/haproxy-extension/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-load-balancer-extensions</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>org.apache.stratos.haproxy.extension</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/extensions/load-balancer/nginx-extension/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/nginx-extension/pom.xml b/extensions/load-balancer/nginx-extension/pom.xml index a38ee51..8547b6a 100644 --- a/extensions/load-balancer/nginx-extension/pom.xml +++ b/extensions/load-balancer/nginx-extension/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-load-balancer-extensions</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <artifactId>org.apache.stratos.nginx.extension</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/extensions/load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/pom.xml b/extensions/load-balancer/pom.xml index e7688ce..ff89360 100644 --- a/extensions/load-balancer/pom.xml +++ b/extensions/load-balancer/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-extensions</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/extensions/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/pom.xml b/extensions/pom.xml index fda2893..e371d43 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml index 2ae91c9..30a6b78 100644 --- a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml +++ b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>autoscaler-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/autoscaler/pom.xml ---------------------------------------------------------------------- diff --git a/features/autoscaler/pom.xml b/features/autoscaler/pom.xml index 22d3ade..402b4cb 100644 --- a/features/autoscaler/pom.xml +++ b/features/autoscaler/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/cep/org.apache.stratos.event.processor.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/cep/org.apache.stratos.event.processor.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.feature/pom.xml index 55f55db..37caa1d 100644 --- a/features/cep/org.apache.stratos.event.processor.feature/pom.xml +++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml @@ -23,10 +23,10 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>cep-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.event.processor.feature</artifactId> <packaging>pom</packaging> @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.event.processor.server.feature</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <type>zip</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml index f88dcd1..0260e8c 100644 --- a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml +++ b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml @@ -22,11 +22,11 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>cep-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <artifactId>org.apache.stratos.event.processor.server.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Event Processor Server Feature</name> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/cep/pom.xml ---------------------------------------------------------------------- diff --git a/features/cep/pom.xml b/features/cep/pom.xml index 0a90a63..3bc6b5d 100644 --- a/features/cep/pom.xml +++ b/features/cep/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml index e1fc805..ee41fb4 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>cloud-controller-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/cloud-controller/pom.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/pom.xml b/features/cloud-controller/pom.xml index 18025f7..edffb91 100644 --- a/features/cloud-controller/pom.xml +++ b/features/cloud-controller/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/common/org.apache.stratos.common.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/org.apache.stratos.common.feature/pom.xml b/features/common/org.apache.stratos.common.feature/pom.xml index 88125a3..851dfa1 100644 --- a/features/common/org.apache.stratos.common.feature/pom.xml +++ b/features/common/org.apache.stratos.common.feature/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>common-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/common/org.apache.stratos.common.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/org.apache.stratos.common.server.feature/pom.xml b/features/common/org.apache.stratos.common.server.feature/pom.xml index 7c1f745..52322fc 100644 --- a/features/common/org.apache.stratos.common.server.feature/pom.xml +++ b/features/common/org.apache.stratos.common.server.feature/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>common-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/common/org.apache.stratos.common.ui.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/org.apache.stratos.common.ui.feature/pom.xml b/features/common/org.apache.stratos.common.ui.feature/pom.xml index a16690f..fedfeef 100644 --- a/features/common/org.apache.stratos.common.ui.feature/pom.xml +++ b/features/common/org.apache.stratos.common.ui.feature/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>common-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/common/org.apache.stratos.custom.handlers.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml index 8bb78a0..897dbad 100644 --- a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml +++ b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>common-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/common/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/pom.xml b/features/common/pom.xml index b6e29ad..036b17a 100644 --- a/features/common/pom.xml +++ b/features/common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml index de2b439..9c7d203 100644 --- a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml +++ b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>loadbalancer-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml index 07aa61b..5b93152 100644 --- a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml +++ b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>loadbalancer-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/features/load-balancer/pom.xml b/features/load-balancer/pom.xml index a587d05..49ca791 100644 --- a/features/load-balancer/pom.xml +++ b/features/load-balancer/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/manager/deployment/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/deployment/pom.xml b/features/manager/deployment/pom.xml index 942500f..138e685 100644 --- a/features/manager/deployment/pom.xml +++ b/features/manager/deployment/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml index b1c30c3..89632ab 100644 --- a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml +++ b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>logging-mgt-feature</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/manager/logging-mgt/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/logging-mgt/pom.xml b/features/manager/logging-mgt/pom.xml index 0805208..b5d58c8 100644 --- a/features/manager/logging-mgt/pom.xml +++ b/features/manager/logging-mgt/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>logging-mgt-feature</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 d3207f8..b7ffd2a 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 @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 b423be3..7b1983e 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 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/manager/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/pom.xml b/features/manager/pom.xml index 91d90ec..e2eb501 100644 --- a/features/manager/pom.xml +++ b/features/manager/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 57d693d..4b99fbf 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 @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 5e37871..3a4430b 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 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-mgt-parent-feature</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 e8b44c3..87d86ee 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 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-mgt-parent-feature</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/manager/stratos-mgt/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/pom.xml b/features/manager/stratos-mgt/pom.xml index 251b94f..7cdf66b 100644 --- a/features/manager/stratos-mgt/pom.xml +++ b/features/manager/stratos-mgt/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 995de44..dcd0fb0 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 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 index 747ab05..b74218e 100644 --- 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 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>tenant-activity-feature</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/manager/tenant-activity/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/tenant-activity/pom.xml b/features/manager/tenant-activity/pom.xml index 31441a5..5679041 100644 --- a/features/manager/tenant-activity/pom.xml +++ b/features/manager/tenant-activity/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-manager-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>tenant-activity-feature</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 65f86d6..379ad33 100644 --- a/features/messaging/org.apache.stratos.messaging.feature/pom.xml +++ b/features/messaging/org.apache.stratos.messaging.feature/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>messaging-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/messaging/pom.xml ---------------------------------------------------------------------- diff --git a/features/messaging/pom.xml b/features/messaging/pom.xml index 5f87cda..ee3e7e0 100644 --- a/features/messaging/pom.xml +++ b/features/messaging/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 c77a0a3..7f479cd 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 @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>mock-iaas-features</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/mock-iaas/pom.xml ---------------------------------------------------------------------- diff --git a/features/mock-iaas/pom.xml b/features/mock-iaas/pom.xml index 96c8423..736f1bb 100644 --- a/features/mock-iaas/pom.xml +++ b/features/mock-iaas/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index 8d614c7..5a24714 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 608df1f..eeffb26 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> <packaging>pom</packaging> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <name>Apache Stratos</name> <description>Apache Stratos is an open source polyglot Platform as a Service (PaaS) framework</description> <url>http://stratos.apache.org</url> @@ -75,7 +75,7 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf?p=stratos.git</url> - <tag>4.1.0-rc1</tag> + <tag>4.0.0-rc4</tag> </scm> <modules> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 5acb1ae..4133212 100644 --- a/products/cartridge-agent/modules/distribution/pom.xml +++ b/products/cartridge-agent/modules/distribution/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>cartidge-agent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/cartridge-agent/modules/distribution/src/main/license/LICENSE ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/license/LICENSE b/products/cartridge-agent/modules/distribution/src/main/license/LICENSE index 9be3ea3..f39282d 100644 --- a/products/cartridge-agent/modules/distribution/src/main/license/LICENSE +++ b/products/cartridge-agent/modules/distribution/src/main/license/LICENSE @@ -218,7 +218,7 @@ activemq-client-5.10.0.jar, ant-1.7.0.jar, ant-1.7.0.wso2v1.jar, ant-launcher-1.7.0.jar, -apache-stratos-cartridge-agent-4.1.0.jar, +apache-stratos-cartridge-agent-4.1.0-SNAPSHOT.jar, axiom-1.2.11.wso2v4.jar, axiom-api-1.2.11.jar, axiom-impl-1.2.11.jar, @@ -272,12 +272,12 @@ neethi-2.0.4.wso2v4.jar not-yet-commons-ssl-0.3.9.jar opencsv-1.8.wso2v1.jar org.apache.log4j-1.2.13.v200706111418.jar -org.apache.stratos.cartridge.agent-4.1.0.jar -org.apache.stratos.common-4.1.0.jar -org.apache.stratos.messaging-4.1.0.jar -org.apache.stratos.autoscaler.service.stub-4.1.0.jar -org.apache.stratos.cloud.controller.service.stub-4.1.0.jar -org.apache.stratos.manager.service.stub-4.1.0.jar +org.apache.stratos.cartridge.agent-4.1.0-SNAPSHOT.jar +org.apache.stratos.common-4.1.0-SNAPSHOT.jar +org.apache.stratos.messaging-4.1.0-SNAPSHOT.jar +org.apache.stratos.autoscaler.service.stub-4.1.0-SNAPSHOT.jar +org.apache.stratos.cloud.controller.service.stub-4.1.0-SNAPSHOT.jar +org.apache.stratos.manager.service.stub-4.1.0-SNAPSHOT.jar org.wso2.carbon.base-4.2.0.jar org.wso2.carbon.bootstrap-4.2.0.jar org.wso2.carbon.core-4.2.0.jar http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/cartridge-agent/pom.xml ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/pom.xml b/products/cartridge-agent/pom.xml index e02be19..11d5407 100644 --- a/products/cartridge-agent/pom.xml +++ b/products/cartridge-agent/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-products-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/load-balancer/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml index a08d704..42c901b 100755 --- a/products/load-balancer/modules/distribution/pom.xml +++ b/products/load-balancer/modules/distribution/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos.load.balancer</groupId> <artifactId>load-balancer-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/load-balancer/modules/distribution/src/main/license/LICENSE ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/license/LICENSE b/products/load-balancer/modules/distribution/src/main/license/LICENSE index 3964448..b308688 100644 --- a/products/load-balancer/modules/distribution/src/main/license/LICENSE +++ b/products/load-balancer/modules/distribution/src/main/license/LICENSE @@ -252,10 +252,10 @@ org.apache.felix.gogo.command_0.8.0.v201108120515.jar, org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar, org.apache.felix.gogo.shell_0.8.0.v201110170705.jar, org.apache.jasper.glassfish_2.2.2.v201205150955.jar, -org.apache.stratos.common_4.1.0.jar, -org.apache.stratos.load.balancer.common_4.1.0.jar, -org.apache.stratos.load.balancer_4.1.0.jar, -org.apache.stratos.messaging_4.1.0.jar, +org.apache.stratos.common_4.1.0.SNAPSHOT.jar, +org.apache.stratos.load.balancer.common_4.1.0.SNAPSHOT.jar, +org.apache.stratos.load.balancer_4.1.0.SNAPSHOT.jar, +org.apache.stratos.messaging_4.1.0.SNAPSHOT.jar, org.wso2.caching_4.0.3.jar, org.wso2.carbon.addressing_4.2.0.jar, org.wso2.carbon.apache.jasper.fragment_4.2.0.jar, http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/load-balancer/modules/p2-profile/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/p2-profile/pom.xml b/products/load-balancer/modules/p2-profile/pom.xml index 75cac6c..ac326c2 100755 --- a/products/load-balancer/modules/p2-profile/pom.xml +++ b/products/load-balancer/modules/p2-profile/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos.load.balancer</groupId> <artifactId>load-balancer-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml index b5fcacc..c7d6663 100755 --- a/products/load-balancer/pom.xml +++ b/products/load-balancer/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/pom.xml ---------------------------------------------------------------------- diff --git a/products/pom.xml b/products/pom.xml index 70767d7..6173678 100644 --- a/products/pom.xml +++ b/products/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/python-cartridge-agent/pom.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/pom.xml b/products/python-cartridge-agent/pom.xml index f1aab38..3321a08 100644 --- a/products/python-cartridge-agent/pom.xml +++ b/products/python-cartridge-agent/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-products-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos-cli/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/pom.xml b/products/stratos-cli/distribution/pom.xml index 356cb7f..137a48c 100644 --- a/products/stratos-cli/distribution/pom.xml +++ b/products/stratos-cli/distribution/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>apache-stratos-cli-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos-cli/distribution/src/main/license/LICENSE ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/src/main/license/LICENSE b/products/stratos-cli/distribution/src/main/license/LICENSE index d562d04..3cc27f2 100644 --- a/products/stratos-cli/distribution/src/main/license/LICENSE +++ b/products/stratos-cli/distribution/src/main/license/LICENSE @@ -267,13 +267,13 @@ neethi-2.0.4.wso2v4.jar, not-yet-commons-ssl-0.3.9.jar, opencsv-1.8.wso2v1.jar, org.apache.log4j-1.2.13.v200706111418.jar, -org.apache.stratos.autoscaler.service.stub-4.1.0.jar, -org.apache.stratos.cli-4.1.0.jar, -org.apache.stratos.cloud.controller.service.stub-4.1.0.jar, -org.apache.stratos.common-4.1.0.jar, -org.apache.stratos.manager-4.1.0.jar, -org.apache.stratos.manager.service.stub-4.1.0.jar, -org.apache.stratos.messaging-4.1.0.jar, +org.apache.stratos.autoscaler.service.stub-4.1.0-SNAPSHOT.jar, +org.apache.stratos.cli-4.1.0-SNAPSHOT.jar, +org.apache.stratos.cloud.controller.service.stub-4.1.0-SNAPSHOT.jar, +org.apache.stratos.common-4.1.0-SNAPSHOT.jar, +org.apache.stratos.manager-4.1.0-SNAPSHOT.jar, +org.apache.stratos.manager.service.stub-4.1.0-SNAPSHOT.jar, +org.apache.stratos.messaging-4.1.0-SNAPSHOT.jar, org.eclipse.equinox.http.helper-1.1.0.wso2v1.jar, org.eclipse.osgi-3.8.1.v20120830-144521.jar, org.eclipse.osgi.services-3.3.100.v20120522-1822.jar, http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos-cli/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos-cli/pom.xml b/products/stratos-cli/pom.xml index 0fac169..d669038 100644 --- a/products/stratos-cli/pom.xml +++ b/products/stratos-cli/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-products-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml index 7f97390..5465903 100755 --- a/products/stratos/modules/distribution/pom.xml +++ b/products/stratos/modules/distribution/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -467,7 +467,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.cep.extension</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.paho</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos/modules/distribution/src/main/license/LICENSE ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/license/LICENSE b/products/stratos/modules/distribution/src/main/license/LICENSE index d36751b..09eb09d 100644 --- a/products/stratos/modules/distribution/src/main/license/LICENSE +++ b/products/stratos/modules/distribution/src/main/license/LICENSE @@ -357,25 +357,25 @@ org.apache.jasper.glassfish_2.2.2.v201205150955.jar, org.apache.servicemix.bundles.jsch-agentproxy-jsch_0.0.7.1.jar, org.apache.servicemix.bundles.jsch-agentproxy-sshj_0.0.7.1.jar, org.apache.servicemix.bundles.jzlib_1.1.1.1.jar, -org.apache.stratos.activation_4.1.0.jar, -org.apache.stratos.autoscaler.service.stub_4.1.0.jar, -org.apache.stratos.autoscaler_4.1.0.jar, -org.apache.stratos.cloud.controller.service.stub_4.1.0.jar, -org.apache.stratos.cloud.controller_4.1.0.jar, -org.apache.stratos.common_4.1.0.jar, -org.apache.stratos.custom.handlers_4.1.0.jar, -org.apache.stratos.keystore.mgt_4.1.0.jar, -org.apache.stratos.kubernetes.client_4.1.0.jar, -org.apache.stratos.logging.view.ui_4.1.0.jar, -org.apache.stratos.manager.service.stub_4.1.0.jar, -org.apache.stratos.manager.service.stub_4.1.0.jar, -org.apache.stratos.manager.styles_4.1.0.jar, -org.apache.stratos.manager_4.1.0.jar, -org.apache.stratos.messaging_4.1.0.jar, -org.apache.stratos.metadata.client_4.1.0.jar, -org.apache.stratos.mock.iaas.client_4.1.0.jar, -org.apache.stratos.mock.iaas_4.1.0.jar, -org.apache.stratos.tenant.activity_4.1.0.jar, +org.apache.stratos.activation_4.1.0.SNAPSHOT.jar, +org.apache.stratos.autoscaler.service.stub_4.1.0.SNAPSHOT.jar, +org.apache.stratos.autoscaler_4.1.0.SNAPSHOT.jar, +org.apache.stratos.cloud.controller.service.stub_4.1.0.SNAPSHOT.jar, +org.apache.stratos.cloud.controller_4.1.0.SNAPSHOT.jar, +org.apache.stratos.common_4.1.0.SNAPSHOT.jar, +org.apache.stratos.custom.handlers_4.1.0.SNAPSHOT.jar, +org.apache.stratos.keystore.mgt_4.1.0.SNAPSHOT.jar, +org.apache.stratos.kubernetes.client_4.1.0.SNAPSHOT.jar, +org.apache.stratos.logging.view.ui_4.1.0.SNAPSHOT.jar, +org.apache.stratos.manager.service.stub_4.1.0.SNAPSHOT.jar, +org.apache.stratos.manager.service.stub_4.1.0.SNAPSHOT.jar, +org.apache.stratos.manager.styles_4.1.0.SNAPSHOT.jar, +org.apache.stratos.manager_4.1.0.SNAPSHOT.jar, +org.apache.stratos.messaging_4.1.0.SNAPSHOT.jar, +org.apache.stratos.metadata.client_4.1.0.SNAPSHOT.jar, +org.apache.stratos.mock.iaas.client_4.1.0.SNAPSHOT.jar, +org.apache.stratos.mock.iaas_4.1.0.SNAPSHOT.jar, +org.apache.stratos.tenant.activity_4.1.0.SNAPSHOT.jar, org.apache.ws.commons.schema.XmlSchema_1.4.7.wso2v2.jar, org.jaggeryjs.hostobjects.db_0.9.0.ALPHA4_wso2v3.jar, org.jaggeryjs.hostobjects.email_0.9.0.ALPHA4_wso2v3.jar, http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos/modules/integration/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml index 6beac20..da97156 100755 --- a/products/stratos/modules/integration/pom.xml +++ b/products/stratos/modules/integration/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -85,7 +85,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.messaging</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java index 765467c..4e7f404 100755 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java @@ -47,7 +47,7 @@ public class StratosTestServerManager extends TestServerManager { private static final Log log = LogFactory.getLog(StratosTestServerManager.class); private final static String CARBON_ZIP = SampleApplicationsTest.class.getResource("/").getPath() + - "/../../../distribution/target/apache-stratos-4.1.0.zip"; + "/../../../distribution/target/apache-stratos-4.1.0-SNAPSHOT.zip"; private final static int PORT_OFFSET = 0; private static final String ACTIVEMQ_BIND_ADDRESS = "tcp://localhost:61617"; private static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml"; http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 612c162..b16921f 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/products/stratos/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml index 7c64257..103fdd4 100755 --- a/products/stratos/pom.xml +++ b/products/stratos/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-products-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 a04e80f..714937c 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-service-stubs-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 c088ca8..13b1605 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 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-service-stubs-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/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 e989dff..74111b9 100644 --- a/service-stubs/org.apache.stratos.manager.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.manager.service.stub/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-service-stubs-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/service-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml index 81d673c..ac5cc93 100644 --- a/service-stubs/pom.xml +++ b/service-stubs/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> - <version>4.1.0</version> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/tools/docker-images/cartridge-docker-images/base-image/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile index 4f9c557..1d1dfb0 100644 --- a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile +++ b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile @@ -48,13 +48,13 @@ RUN pip install yapsy # ------------------------- WORKDIR /mnt/ -ADD packs/apache-stratos-python-cartridge-agent-4.1.0.zip /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip -RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip -d /mnt/apache-stratos-python-cartridge-agent-4.1.0/ -RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip +ADD packs/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip +RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip -d /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/ +RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip -RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.0/payload +RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/payload -RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.0/extensions/bash/* +RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/extensions/bash/* RUN mkdir -p /var/log/apache-stratos/ RUN touch /var/log/apache-stratos/cartridge-agent-extensions.log http://git-wip-us.apache.org/repos/asf/stratos/blob/6b89b3d2/tools/docker-images/cartridge-docker-images/base-image/files/run ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/base-image/files/run b/tools/docker-images/cartridge-docker-images/base-image/files/run index b3d9f8f..042856a 100755 --- a/tools/docker-images/cartridge-docker-images/base-image/files/run +++ b/tools/docker-images/cartridge-docker-images/base-image/files/run @@ -26,7 +26,7 @@ source /root/.bashrc -export STRATOS_VERSION="4.1.0" +export STRATOS_VERSION="4.1.0-SNAPSHOT" export PCA_HOME="/mnt/apache-stratos-python-cartridge-agent-${STRATOS_VERSION}" set -o posix ; set | sed -e ':a;N;$!ba;s/\n/,/g' > ${PCA_HOME}/payload/launch-params
