You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/11/17 17:32:28 UTC
[5/5] stratos git commit: Closing STRATOS-1623: pom refactoring,
fix OSGi imports/exports
Closing STRATOS-1623: pom refactoring, fix OSGi imports/exports
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a5a7aba0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a5a7aba0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a5a7aba0
Branch: refs/heads/stratos-4.1.x
Commit: a5a7aba0b56b8aeeee17ed8c3f619db45863019c
Parents: e687ada
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Nov 17 22:01:49 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Nov 17 22:01:49 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 186 +--
.../networkpartition/AllAtOnceAlgorithm.java | 2 +-
.../autoscaler/internal/ASBundleActivater.java | 41 -
.../org.apache.stratos.cartridge.agent/pom.xml | 41 +-
components/org.apache.stratos.cli/pom.xml | 18 +-
.../org.apache.stratos.cloud.controller/pom.xml | 224 ++--
.../internal/ServiceReferenceHolder.java | 4 +-
.../controller/registry/RegistryManager.java | 4 +-
components/org.apache.stratos.common/pom.xml | 129 +-
.../org.apache.stratos.custom.handlers/pom.xml | 67 +-
.../pom.xml | 31 +-
.../pom.xml | 49 +-
.../pom.xml | 4 +-
.../org.apache.stratos.load.balancer/pom.xml | 70 +-
.../org.apache.stratos.manager.styles/pom.xml | 80 +-
components/org.apache.stratos.manager/pom.xml | 99 +-
.../src/conf/tenant-resource-policy.xml | 22 -
.../manager/context/StratosManagerContext.java | 19 +-
.../StratosManagerServiceComponent.java | 1 +
.../manager/registry/RegistryManager.java | 2 +-
.../src/scripts/append_zone_file.sh | 44 -
components/org.apache.stratos.messaging/pom.xml | 69 +-
.../org.apache.stratos.metadata.client/pom.xml | 23 +-
.../org.apache.stratos.metadata.service/pom.xml | 82 +-
.../service/oauth2/ValidationServiceClient.java | 18 +-
.../service/registry/MetadataApiRegistry.java | 4 +-
.../org.apache.stratos.mock.iaas.api/pom.xml | 65 +-
.../org.apache.stratos.mock.iaas.client/pom.xml | 65 +-
components/org.apache.stratos.mock.iaas/pom.xml | 40 +-
.../pom.xml | 30 +-
.../org.apache.stratos.rest.endpoint/pom.xml | 76 +-
.../handlers/ComponentSynchronizerHandler.java | 11 +-
.../oauth2/ValidationServiceClient.java | 12 +-
dependencies/fabric8/kubernetes-api/pom.xml | 73 +-
dependencies/guice-assistedinject/pom.xml | 6 +-
dependencies/guice-multibindings/pom.xml | 4 +-
dependencies/guice/pom.xml | 4 +-
dependencies/jclouds/cloudstack/pom.xml | 5 +-
dependencies/jclouds/ec2/pom.xml | 5 +-
.../google-cloud-storage/pom.xml | 5 +-
.../google-compute-engine/pom.xml | 5 +-
.../google-jclouds-labs/googlecloud/pom.xml | 5 +-
.../jclouds/google-jclouds-labs/oauth/pom.xml | 5 +-
dependencies/jclouds/jclouds-blobstore/pom.xml | 5 +-
.../jclouds/jclouds-bouncycastle/pom.xml | 8 +-
dependencies/jclouds/jclouds-compute/pom.xml | 5 +-
dependencies/jclouds/jclouds-core/pom.xml | 5 +-
dependencies/jclouds/jclouds-enterprise/pom.xml | 5 +-
dependencies/jclouds/jclouds-joda/pom.xml | 5 +-
dependencies/jclouds/jclouds-netty/pom.xml | 7 +-
dependencies/jclouds/jclouds-sshj/pom.xml | 5 +-
dependencies/jclouds/openstack-common/pom.xml | 5 +-
dependencies/jclouds/openstack-keystone/pom.xml | 5 +-
dependencies/jclouds/openstack-neutron/pom.xml | 5 +-
dependencies/jclouds/openstack-nova/pom.xml | 5 +-
dependencies/jclouds/sts/pom.xml | 5 +-
dependencies/org.wso2.carbon.ui/pom.xml | 2 +-
dependencies/rocoto/pom.xml | 5 +-
dependencies/sshj/pom.xml | 9 +-
.../stratos-cep-extension/wso2cep-3.0.0/pom.xml | 15 +-
.../stratos-cep-extension/wso2cep-3.1.0/pom.xml | 15 +-
.../artifacts/metering-dashboard/capps/pom.xml | 8 +-
.../monitoring-dashboard/capps/pom.xml | 8 +-
extensions/das/pom.xml | 5 +-
.../load-balancer/modules/aws-extension/pom.xml | 15 +-
.../modules/haproxy-extension/pom.xml | 9 +-
.../load-balancer/modules/lvs-extension/pom.xml | 9 +-
.../modules/nginx-extension/pom.xml | 9 +-
.../pom.xml | 34 +-
.../pom.xml | 6 +-
.../pom.xml | 8 +-
.../pom.xml | 90 +-
.../org.apache.stratos.common.feature/pom.xml | 4 +-
.../pom.xml | 12 +-
.../pom.xml | 15 +-
.../pom.xml | 8 +-
.../pom.xml | 27 +-
.../pom.xml | 19 +-
.../pom.xml | 195 ---
.../pom.xml | 196 +--
.../pom.xml | 28 +-
.../pom.xml | 5 +-
.../pom.xml | 20 +-
.../pom.xml | 69 +-
features/pom.xml | 14 +-
pom.xml | 1166 +++++++++++++++++-
.../modules/distribution/pom.xml | 3 +-
.../load-balancer/modules/distribution/pom.xml | 13 +-
.../modules/p2-profile-gen/pom.xml | 40 +-
products/load-balancer/pom.xml | 30 +-
.../modules/integration/test-common/pom.xml | 14 +-
.../integration/test-integration/pom.xml | 10 +-
products/python-cli/pom.xml | 2 +-
.../stratos-cli/modules/distribution/pom.xml | 3 +-
products/stratos/modules/distribution/pom.xml | 13 +-
.../distribution/src/main/conf/etc/launch.ini | 26 +-
.../modules/integration/test-common/pom.xml | 23 +-
.../integration/test-integration/pom.xml | 18 +-
products/stratos/modules/p2-profile-gen/pom.xml | 219 ++--
products/stratos/pom.xml | 30 +-
service-stubs/pom.xml | 12 +-
101 files changed, 2523 insertions(+), 1777 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 9e95472..1a74b82 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -35,153 +35,142 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${carbon.kernel.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ntask.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.messaging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>3.3</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-decisiontables</artifactId>
- <version>${drools.version}</version>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
- <version>3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-decisiontables</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>stringtemplate</artifactId>
- <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-jsr94</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>knowledge-internal-api</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>knowledge-api</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>2.1.3.Final</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-verifier</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-templates</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
- <artifactId>ecj</artifactId>
- <version>3.5.1</version>
</dependency>
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
- <version>1.1.3.1</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
- <version>1.1.4c</version>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <version>2.1.2</version>
</dependency>
<dependency>
- <groupId>jsr94</groupId>
- <artifactId>jsr94</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>com.nimbusds.wso2</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ntask.core</artifactId>
- <scope>provided</scope>
- <version>${carbon.kernel.version}</version>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.oauth</artifactId>
- <version>4.2.3</version>
+ <groupId>jsr94</groupId>
+ <artifactId>jsr94</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>4.2.3</version>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
</dependency>
<dependency>
- <groupId>com.nimbusds.wso2</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>2.26.1.wso2v2</version>
+ <groupId>org.apache.amber.wso2</groupId>
+ <artifactId>amber</artifactId>
</dependency>
</dependencies>
@@ -200,21 +189,39 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>org.apache.stratos.autoscaler.internal.*</Private-Package>
- <Export-Package>!org.apache.stratos.autoscaler.internal.*,org.apache.stratos.autoscaler.*
+ <Export-Package>
+ !org.apache.stratos.autoscaler.internal.*,
+ !org.apache.stratos.autoscaler.stub.*,
+ org.apache.stratos.autoscaler.*
</Export-Package>
<Import-Package>
- org.apache.stratos.common.services.*; version="${project.version}",
- org.apache.stratos.common.threading.*; version="${project.version}",
- org.apache.stratos.common.client.*; version="${project.version}",
- org.apache.stratos.common.partition.*; version="${project.version}",
- org.apache.stratos.common.constants.*; version="${project.version}",
- org.apache.stratos.common.*; version="${project.version}",
- org.apache.stratos.cloud.controller.stub.*; version="${project.version}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.identity.application.mgt.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.identity.oauth.stub.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.ntask.core.*;version="0.0.0",
+
+ org.apache.stratos.common.*;version="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.cloud.controller.stub.*;version="${project.version}",
+
+ org.apache.commons.logging.*; version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.configuration.*;version="${commons.configuration.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
+ com.nimbusds.jose.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
+ com.nimbusds.jwt.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
+ org.apache.amber.*;version="${amber.version}"
*;resolution:=optional
</Import-Package>
- <Bundle-Activator>org.apache.stratos.autoscaler.internal.ASBundleActivater</Bundle-Activator>
<DynamicImport-Package>*</DynamicImport-Package>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Dependency>
+ antlr,antlr-runtime,drools-compiler,drools-core,drools-decisiontables,drools-jsr94,
+ drools-templates,drools-verifier,ecj,itext,jsr94,knowledge-api,knowledge-internal-api,
+ stringtemplate,xmlpull,xpp3_min,xstream;scope=compile|runtime
+ </Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
</instructions>
</configuration>
@@ -236,6 +243,7 @@
</executions>
</plugin>
</plugins>
+
<resources>
<resource>
<directory>src/main/rules</directory>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
index 3d5dc24..f1b52f7 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
@@ -18,11 +18,11 @@
*/
package org.apache.stratos.autoscaler.algorithms.networkpartition;
-import edu.emory.mathcs.backport.java.util.Arrays;
import org.apache.stratos.autoscaler.algorithms.NetworkPartitionAlgorithm;
import org.apache.stratos.autoscaler.pojo.policy.PolicyManager;
import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy;
+import java.util.Arrays;
import java.util.List;
public class AllAtOnceAlgorithm implements NetworkPartitionAlgorithm {
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java
deleted file mode 100644
index 0ae2a61..0000000
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.autoscaler.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class ASBundleActivater implements BundleActivator {
-
- private static final Log log = LogFactory.getLog(ASBundleActivater.class);
-
- @Override
- public void start(BundleContext context) throws Exception {
- if (log.isDebugEnabled())
- log.debug("AutoScaler bundle is activated.");
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- if (log.isDebugEnabled())
- log.debug("AutoScaler bundle is deActivated.");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 07cef19..0f45bbf 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -31,43 +31,26 @@
<name>Apache Stratos - Cartridge Agent</name>
<description>Apache Stratos Cartridge Agent</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
- <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs.wso2</groupId>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.0.wso2v1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -76,37 +59,43 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit.wso2</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>2.3.1.wso2v2</version>
+ <version>${eclipse.jgit.wso2.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.49.wso2v1</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 e5add46..e05709a 100644
--- a/components/org.apache.stratos.cli/pom.xml
+++ b/components/org.apache.stratos.cli/pom.xml
@@ -36,58 +36,47 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.securevault</groupId>
<artifactId>org.wso2.securevault</artifactId>
- <version>1.0.0-wso2v2</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.3.0.wso2v1</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>2.11</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.1</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.4.0</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -97,14 +86,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -266,4 +254,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 c330e21..69ff89f 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,199 +30,221 @@
<packaging>bundle</packaging>
<name>Apache Stratos - Cloud Controller</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- !org.apache.stratos.cloud.controller.internal.*,
- !org.apache.stratos.cloud.controller.stub.*,
- org.apache.stratos.cloud.controller.*,
- </Export-Package>
- <Private-Package>
- org.apache.stratos.cloud.controller.internal.*,
- </Private-Package>
- <Import-Package>
- !org.apache.stratos.cloud.controller.*,
- org.apache.stratos.mock.iaas.*,
- org.apache.commons.*,
- org.wso2.carbon.utils.*,
- org.apache.stratos.common.*; version="${project.version}",
- org.apache.stratos.kubernetes.client.*; version="${project.version}",
- org.jclouds.aws.ec2.*; version=${jclouds.version},
- org.jclouds.ec2.*; version=${jclouds.version},
- org.jclouds.compute.*; version=${jclouds.version},
- org.jclouds.domain.*; version=${jclouds.version},
- org.jclouds.googlecomputeengine*; version=${jclouds.version},
- org.jclouds.googlecloud.*; version=${jclouds.version},
- org.jclouds*; version=${jclouds.version},
- *; resolution:=optional
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- <Axis2Deployer>CloudControllerDeployer</Axis2Deployer>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
- <configuration>
- <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
- <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
- <serviceName>CloudControllerService</serviceName>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>java2wsdl</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.kubernetes.client</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.securevault</groupId>
+ <artifactId>org.wso2.securevault</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.securevault</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.ntask.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.analytics.hive.stub</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.messaging</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.kubernetes.client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.mock.iaas</artifactId>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.mock.iaas.client</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.version}</version>
</dependency>
+
+ <!-- Misc -->
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec.wso2</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<!-- jclouds dependencies -->
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>cloudstack</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-enterprise</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>ec2</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>aws-ec2</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-nova</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-scriptbuilder</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>google-compute-engine</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Export-Package>
+ !org.apache.stratos.cloud.controller.internal.*,
+ !org.apache.stratos.cloud.controller.stub.*,
+ org.apache.stratos.cloud.controller.*
+ </Export-Package>
+ <Private-Package>
+ org.apache.stratos.cloud.controller.internal.*
+ </Private-Package>
+ <Import-Package>
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.agent.thrift.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.securevault.*;version="0.0.0",
+ org.wso2.carbon.ntask.core.*;version="0.0.0",
+ org.wso2.carbon.caching.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.mock.iaas.*;version="${project.version}",
+ org.apache.stratos.mock.iaas.client.*;version="${project.version}",
+ org.apache.stratos.common.*;version="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.kubernetes.client.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.apache.commons.codec.*;version="${commons.codec.imp.pkg.version.range}",
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
+ io.fabric8.kubernetes.*;version=${kubernetes.api.version},
+ org.jclouds.aws.ec2.*;version=${jclouds.version},
+ org.jclouds.ec2.*;version=${jclouds.version},
+ org.jclouds.compute.*;version=${jclouds.version},
+ org.jclouds.domain.*;version=${jclouds.version},
+ org.jclouds.googlecomputeengine*;version=${jclouds.version},
+ org.jclouds.googlecloud.*;version=${jclouds.version},
+ org.jclouds*;version=${jclouds.version},
+ *; resolution:=optional
+ </Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ <Axis2Deployer>CloudControllerDeployer</Axis2Deployer>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
+ <configuration>
+ <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
+ <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
+ <serviceName>CloudControllerService</serviceName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java2wsdl</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
index bd3485f..ff65c1c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
@@ -34,7 +34,7 @@ public class ServiceReferenceHolder {
private static volatile ServiceReferenceHolder instance;
private TaskService taskService;
- private Registry registry;
+ private UserRegistry registry;
private AxisConfiguration axisConfiguration;
private DistributedObjectProvider distributedObjectProvider;
private HazelcastInstance hazelcastInstance;
@@ -74,7 +74,7 @@ public class ServiceReferenceHolder {
registry = governanceSystemRegistry;
}
- public Registry getRegistry() {
+ public UserRegistry getRegistry() {
return registry;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
index b935eaa..750a0be 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
@@ -23,7 +23,7 @@ package org.apache.stratos.cloud.controller.registry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.internal.ServiceReferenceHolder;
+import org.apache.stratos.cloud.controller.internal.ServiceReferenceHolder;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.Resource;
@@ -141,7 +141,7 @@ public class RegistryManager {
}
private UserRegistry getRegistry() throws RegistryException {
- return ServiceReferenceHolder.getInstance().getRegistryService().getGovernanceSystemRegistry();
+ return ServiceReferenceHolder.getInstance().getRegistry();
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 e9047fc..4da58c3 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -29,104 +29,121 @@
<packaging>bundle</packaging>
<name>Apache Stratos - Common</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.apache.stratos.common.*,
- org.apache.stratos.common.constants.*,
- org.apache.stratos.common.domain.*,
- org.apache.stratos.common.client.*,
- org.apache.stratos.common.services.*,
- org.apache.stratos.common.statistics.publisher.*,
- org.apache.stratos.common.concurrent.locks.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.registry.core.*;version=1.0.1,
- org.wso2.carbon.user.core.*,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.mgt</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.securevault</groupId>
+ <artifactId>org.wso2.securevault</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
+
+ <!-- Misc -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>${carbon.kernel.version}</version>
- </dependency>
- <dependency>
<groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6.0.wso2v1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>commons-codec.wso2</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Private-Package>org.apache.stratos.common.internal.*</Private-Package>
+ <Export-Package>
+ !org.apache.stratos.common.internal.*,
+ org.apache.stratos.common.*
+ </Export-Package>
+ <Import-Package>
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.user.mgt.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.agent.thrift.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.user.api.*;version="${carbon.user.api.imp.pkg.version.range}",
+ org.wso2.securevault.*;version="0.0.0",
+
+ org.apache.stratos.cloud.controller.service.stub.*;version="${project.version}",
+ org.apache.stratos.autoscaler.service.stub.*;version="${project.version}",
+ org.apache.stratos.manager.service.stub.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.configuration.*;version="${commons.configuration.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.apache.commons.codec.*;version="${commons.codec.imp.pkg.version.range}",
+ org.apache.axiom.*; version="${axiom.imp.pkg.version.range}",
+ *;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 6600033..c4e3218 100644
--- a/components/org.apache.stratos.custom.handlers/pom.xml
+++ b/components/org.apache.stratos.custom.handlers/pom.xml
@@ -33,55 +33,56 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.oauth</artifactId>
- <version>4.2.3</version>
+ <artifactId>org.wso2.carbon.user.core</artifactId>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>2.26.1</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
</dependency>
<dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>1.3</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.base</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.identity.oauth</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core.common</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core.services</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>opensaml.wso2</groupId>
<artifactId>opensaml2</artifactId>
- <version>2.4.1.wso2v1</version>
</dependency>
<dependency>
<groupId>com.nimbusds.wso2</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>2.26.1.wso2v2</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -98,21 +99,31 @@
${project.artifactId}
</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Private-Package>org.apache.stratos.custom.handlers.internal.*</Private-Package>
+ <Export-Package>
+ !org.apache.stratos.custom.handlers.internal.*,
+ org.apache.stratos.custom.handlers.*
+ </Export-Package>
<Import-Package>
- org.wso2.carbon.identity.oauth2.*; version="4.2.3",
+ org.wso2.carbon.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.base.*;version="${carbon.base.imp.pkg.version.range}",
+ org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.identity.oauth2.*;version="${identity.oauth2.imp.pkg.version.range}",
+ org.wso2.carbon.identity.oauth.*;version="${identity.oauth2.imp.pkg.version.range}",
+ org.wso2.carbon.user.api.*;version="${carbon.user.api.imp.pkg.version.range}",
+
+ org.apache.commons.logging.*; version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.opensaml.*;version="${opensaml2.imp.pkg.version.range}",
+ com.nimbusds.jose.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
+ com.nimbusds.jwt.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
*;resolution:=optional,
</Import-Package>
- <Export-Package>
- !org.wso2.carbon.identity.authenticator.signedjwt.internal,
- org.apache.stratos.custom.handlers.*,
- </Export-Package>
- <Embed-Dependency>
- nimbus-jose-jwt|json-smart;scope=compile|runtime;inline=false
- </Embed-Dependency>
- <!--<DynamicImport-Package>*</DynamicImport-Package>-->
</instructions>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 2b25017..38c45bd 100644
--- a/components/org.apache.stratos.kubernetes.client/pom.xml
+++ b/components/org.apache.stratos.kubernetes.client/pom.xml
@@ -34,26 +34,26 @@
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>kubernetes-api</artifactId>
</dependency>
+
+ <!-- Misc -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.version}</version>
- </dependency>
</dependencies>
<build>
@@ -67,10 +67,11 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.kubernetes.client,
- org.apache.stratos.kubernetes.client.exceptions,
+ org.apache.stratos.kubernetes.client.*
</Export-Package>
<Import-Package>
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
io.fabric8.kubernetes.api.*;version=${kubernetes.api.version},
io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version},
*;resolution:=optional
@@ -131,4 +132,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 83686f9..27626c1 100644
--- a/components/org.apache.stratos.load.balancer.common/pom.xml
+++ b/components/org.apache.stratos.load.balancer.common/pom.xml
@@ -33,43 +33,40 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.utils</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
+
+ <!-- Misc -->
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -88,15 +85,21 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.load.balancer.common.*,
+ !org.apache.stratos.load.balancer.common.internal.*,
+ org.apache.stratos.load.balancer.common.*
</Export-Package>
<Private-Package>
- org.apache.stratos.load.balancer.common.internal;
+ org.apache.stratos.load.balancer.common.internal.*
</Private-Package>
<Import-Package>
- !org.apache.commons.logging,
- org.apache.commons.logging; version=0.0.0,
- org.apache.stratos.common,
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.common.*; version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -105,4 +108,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 a645ad8..ec765e1 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/pom.xml
+++ b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
@@ -34,12 +34,10 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.common</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 8d6674f..498d848 100644
--- a/components/org.apache.stratos.load.balancer/pom.xml
+++ b/components/org.apache.stratos.load.balancer/pom.xml
@@ -33,23 +33,59 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.initializer</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.common</artifactId>
- <version>${project.version}</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>commons-codec.wso2</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.orbit.commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
</dependencies>
@@ -68,13 +104,27 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.load.balancer.endpoint,
- org.apache.stratos.load.balancer,
- org.apache.stratos.load.balancer.topology,
- org.apache.stratos.load.balancer.mediators,
+ !org.apache.stratos.load.balancer.internal.*,
+ org.apache.stratos.load.balancer.*
</Export-Package>
+ <Private-Package>
+ org.apache.stratos.load.balancer.internal.*
+ </Private-Package>
<Import-Package>
- org.wso2.carbon.registry.core.service; version=1.0.1,
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.mediation.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.common.*;version="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.load.balancer.common.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.apache.commons.codec.*;version="${commons.codec.imp.pkg.version.range}",
+ org.apache.commons.collections.*;version="${commons.collections.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -83,4 +133,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/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 c6d9bac..3c1f8d8 100644
--- a/components/org.apache.stratos.manager.styles/pom.xml
+++ b/components/org.apache.stratos.manager.styles/pom.xml
@@ -31,6 +31,41 @@
<packaging>bundle</packaging>
<name>Apache Stratos - Cloud Manager UI styles</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.helper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -66,47 +101,4 @@
</resource>
</resources>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- <version>${carbon.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.servlet</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.helper</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
- <version>1.0.1.R33x_v20070816</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>2.0.0.v200706191603</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+</project>