http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/openstack-nova/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/pom.xml b/dependencies/jclouds/openstack-nova/pom.xml index 8317d9a..5caeb4b 100644 --- a/dependencies/jclouds/openstack-nova/pom.xml +++ b/dependencies/jclouds/openstack-nova/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>openstack-nova</artifactId> - <version>${jclouds.version}</version> + <version>1.9.1</version> <name>Apache jclouds :: OpenStack :: Nova API</name> <description>jclouds components to access an implementation of OpenStack Nova</description> <packaging>bundle</packaging> @@ -73,7 +73,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> <extensions>true</extensions> <inherited>true</inherited> <configuration>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/pom.xml b/dependencies/jclouds/pom.xml index be32b17..ab50515 100644 --- a/dependencies/jclouds/pom.xml +++ b/dependencies/jclouds/pom.xml @@ -19,18 +19,17 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-dependencies-jclouds</artifactId> <packaging>pom</packaging> <name>Apache Stratos - jclouds Dependent Projects</name> <description>Apache Stratos jcloud dependent projects</description> - <url>http://apache.org</url> <modules> <module>google-jclouds-labs</module> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/jclouds/sts/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/sts/pom.xml b/dependencies/jclouds/sts/pom.xml index ed030ab..6cf5daf 100644 --- a/dependencies/jclouds/sts/pom.xml +++ b/dependencies/jclouds/sts/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>sts</artifactId> - <version>${jclouds.version}</version> + <version>1.9.1</version> <name>jclouds sts api</name> <description>jclouds components to access an implementation of Security Token Service (STS)</description> <packaging>bundle</packaging> @@ -73,7 +73,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> <extensions>true</extensions> <inherited>true</inherited> <configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 155db22..369fa4b 100644 --- a/dependencies/org.wso2.carbon.ui/pom.xml +++ b/dependencies/org.wso2.carbon.ui/pom.xml @@ -19,6 +19,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.wso2.carbon</groupId> <artifactId>carbon-parent</artifactId> @@ -26,7 +27,6 @@ </parent> <groupId>org.apache.stratos</groupId> - <modelVersion>4.0.0</modelVersion> <artifactId>org.wso2.carbon.ui</artifactId> <packaging>bundle</packaging> <name>WSO2 Carbon - UI</name> @@ -192,7 +192,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> <configuration> <instructions> @@ -230,4 +229,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/pom.xml b/dependencies/pom.xml index e24ad41..61ee32f 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -19,13 +19,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-dependents</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Dependent Projects</name> @@ -42,5 +42,4 @@ <module>org.wso2.carbon.ui</module> <module>fabric8</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/rocoto/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/rocoto/pom.xml b/dependencies/rocoto/pom.xml index 19505a5..08e8f6c 100644 --- a/dependencies/rocoto/pom.xml +++ b/dependencies/rocoto/pom.xml @@ -19,15 +19,15 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>rocoto</artifactId> - <version>${rocoto.version}</version> + <version>6.1</version> <packaging>bundle</packaging> <name>99soft :: Rocoto</name> <description>Add some spice to Google Guice through configuration files!</description> @@ -45,7 +45,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> <extensions>true</extensions> <inherited>true</inherited> <configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/dependencies/sshj/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/sshj/pom.xml b/dependencies/sshj/pom.xml index 94d0e2e..c548ca8 100644 --- a/dependencies/sshj/pom.xml +++ b/dependencies/sshj/pom.xml @@ -19,18 +19,18 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-dependents</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>net.schmizz.sshj</artifactId> <packaging>bundle</packaging> <name>sshj</name> <description>SSHv2 library for Java</description> - <version>${net.schmizz.sshj.version}</version> + <version>0.8.1</version> <dependencies> <dependency> @@ -45,7 +45,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> <extensions>true</extensions> <configuration> <instructions> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/extensions/cep/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/distribution/pom.xml b/extensions/cep/distribution/pom.xml index e9f03fd..aea2369 100644 --- a/extensions/cep/distribution/pom.xml +++ b/extensions/cep/distribution/pom.xml @@ -17,23 +17,23 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-extensions</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>apache-stratos-cep-artifacts</artifactId> <packaging>pom</packaging> <name>Apache Stratos CEP artifacts</name> <description>Apache Stratos CEP artifacts</description> - <url>http://apache.org</url> + <profiles> - <profile> + <profile> <id>default</id> <activation> <activeByDefault>true</activeByDefault> @@ -63,4 +63,4 @@ </build> </profile> </profiles> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/extensions/cep/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/distribution/src/assembly/bin.xml b/extensions/cep/distribution/src/assembly/bin.xml index f031557..e4599ab 100755 --- a/extensions/cep/distribution/src/assembly/bin.xml +++ b/extensions/cep/distribution/src/assembly/bin.xml @@ -24,17 +24,17 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> <fileSets> - <fileSet> + <fileSet> <directory>../artifacts/</directory> <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> - <includes> + <includes> <include>**/*.xml</include> - </includes> - <excludes> - <exclude>pom.xml</exclude> - <exclude>src/**</exclude> - </excludes> - </fileSet> + </includes> + <excludes> + <exclude>pom.xml</exclude> + <exclude>src/**</exclude> + </excludes> + </fileSet> </fileSets> <files> <file> @@ -56,5 +56,4 @@ <fileMode>644</fileMode> </file> </files> -</assembly> - +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 e28697a..acf6cea 100644 --- a/extensions/cep/stratos-cep-extension/pom.xml +++ b/extensions/cep/stratos-cep-extension/pom.xml @@ -17,14 +17,14 @@ # specific language governing permissions and limitations # under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-extensions</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>org.apache.stratos.cep.extension</artifactId> @@ -55,13 +55,9 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> </plugin> </plugins> - </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 3b67477..349b469 100644 --- a/extensions/load-balancer/haproxy-extension/pom.xml +++ b/extensions/load-balancer/haproxy-extension/pom.xml @@ -18,9 +18,9 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-load-balancer-extensions</artifactId> @@ -74,7 +74,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <archive> <manifest> @@ -107,4 +106,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/extensions/load-balancer/lvs-extension/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/lvs-extension/pom.xml b/extensions/load-balancer/lvs-extension/pom.xml index 07196e2..1c8cd49 100644 --- a/extensions/load-balancer/lvs-extension/pom.xml +++ b/extensions/load-balancer/lvs-extension/pom.xml @@ -18,9 +18,9 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-load-balancer-extensions</artifactId> @@ -74,7 +74,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <archive> <manifest> @@ -107,4 +106,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 22b4223..cd5f645 100644 --- a/extensions/load-balancer/nginx-extension/pom.xml +++ b/extensions/load-balancer/nginx-extension/pom.xml @@ -18,9 +18,9 @@ ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-load-balancer-extensions</artifactId> @@ -74,7 +74,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <archive> <manifest> @@ -107,4 +106,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/extensions/load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/pom.xml b/extensions/load-balancer/pom.xml index cb4bf56..db54828 100644 --- a/extensions/load-balancer/pom.xml +++ b/extensions/load-balancer/pom.xml @@ -18,25 +18,23 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-extensions</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-load-balancer-extensions</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Load Balancer Extensions</name> <description>Apache Stratos extensions for third party load balancers.</description> - <url>http://apache.org</url> <modules> <module>haproxy-extension</module> <module>nginx-extension</module> <module>lvs-extension</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/extensions/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/pom.xml b/extensions/pom.xml index d5f0702..25aab70 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -17,25 +17,23 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>stratos-extensions</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Extensions</name> <description>Apache Stratos Extensions</description> - <url>http://apache.org</url> <modules> <module>cep/stratos-cep-extension</module> <module>cep/distribution/</module> <module>load-balancer</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 b30d2ff..3877580 100644 --- a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml +++ b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml @@ -17,8 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>autoscaler-features</artifactId> @@ -26,26 +27,16 @@ <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.autoscaler.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Autoscaler Feature</name> - <url>http://apache.org</url> <description>This feature contains the required bundles for autoscaling functionality</description> - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.autoscaler</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -63,12 +54,17 @@ </properties> </adviceFile> <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.autoscaler:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.autoscaler:${project.version} + </bundleDef> + <bundleDef> + org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version} + </bundleDef> + <bundleDef> + org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version} + </bundleDef> </bundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef> </importFeatures> </configuration> </execution> @@ -76,6 +72,4 @@ </plugin> </plugins> </build> - -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/autoscaler/pom.xml ---------------------------------------------------------------------- diff --git a/features/autoscaler/pom.xml b/features/autoscaler/pom.xml index e454856..eee8b52 100644 --- a/features/autoscaler/pom.xml +++ b/features/autoscaler/pom.xml @@ -17,21 +17,20 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>autoscaler-features</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Autoscaler Features</name> - <url>http://apache.org</url> <modules> <module>org.apache.stratos.autoscaler.feature</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 6ff90b9..497a38b 100644 --- a/features/cep/org.apache.stratos.event.processor.feature/pom.xml +++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml @@ -16,21 +16,19 @@ ~ specific language governing permissions and limitations ~ under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.stratos</groupId> <artifactId>cep-features</artifactId> <version>4.1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>org.apache.stratos.event.processor.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Event Processor Aggregator Feature</name> - <url>http://wso2.org</url> <description> This feature contains the bundles required for Event Processor feature. </description> @@ -48,7 +46,6 @@ <version>1.0.0</version> <type>zip</type> </dependency> - </dependencies> <build> @@ -56,7 +53,6 @@ <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -68,8 +64,7 @@ <id>org.apache.stratos.event.processor</id> <propertiesFile>../../../../etc/feature.properties</propertiesFile> <importFeatures> - <importFeatureDef>org.wso2.carbon.core:${carbon.version} - </importFeatureDef> + <importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef> </importFeatures> <includedFeatures> <includedFeatureDef> @@ -85,4 +80,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 3d4d913..68f33fd 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 @@ -16,63 +16,22 @@ ~ specific language governing permissions and limitations ~ under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>cep-features</artifactId> <version>4.1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>org.apache.stratos.event.processor.server.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Event Processor Server Feature</name> - <url>http://apache.org</url> <description>This feature contains the core bundles required for Back-end Event Processor functionality </description> - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.event.processor.core</artifactId> - <version>${siddhi.event.processor.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.event.processor.admin</artifactId> - <version>${siddhi.event.processor.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.event.processor.siddhi.extension</artifactId> - <version>${siddhi.event.processor.version}</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.event.processor.api</artifactId> - <version>${siddhi.event.processor.version}</version> - </dependency> - - <dependency> - <groupId>org.wso2.siddhi</groupId> - <artifactId>siddhi-core</artifactId> - <version>${siddhi.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.siddhi</groupId> - <artifactId>siddhi-api</artifactId> - <version>${siddhi.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.siddhi</groupId> - <artifactId>siddhi-query</artifactId> - <version>${siddhi.version}</version> - </dependency> - </dependencies> - <build> <plugins> <plugin> @@ -104,7 +63,6 @@ <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -146,7 +104,7 @@ </bundleDef> </bundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef> </importFeatures> </configuration> </execution> @@ -154,4 +112,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/cep/pom.xml ---------------------------------------------------------------------- diff --git a/features/cep/pom.xml b/features/cep/pom.xml index 5809edf..45c2ef4 100644 --- a/features/cep/pom.xml +++ b/features/cep/pom.xml @@ -17,28 +17,21 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>cep-features</artifactId> <packaging>pom</packaging> <name>Apache Stratos - CEP Features</name> - <url>http://apache.org</url> <modules> <module>org.apache.stratos.event.processor.server.feature</module> <module>org.apache.stratos.event.processor.feature</module> </modules> - <properties> - <carbon.version>4.2.0</carbon.version> - <siddhi.version>2.0.0-wso2v5</siddhi.version> - <siddhi.event.processor.version>1.0.0</siddhi.event.processor.version> - </properties> - -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 4563dee..372ce60 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 @@ -19,6 +19,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>cloud-controller-features</artifactId> @@ -26,11 +27,9 @@ <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.cloud.controller.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Cloud Controller Feature</name> - <url>http://apache.org</url> <description>This feature contains the required bundles for the functionality of Cloud Controller</description> <build> @@ -64,7 +63,6 @@ <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -171,7 +169,7 @@ <importBundles> </importBundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef> </importFeatures> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/cloud-controller/pom.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/pom.xml b/features/cloud-controller/pom.xml index d0862ef..a66f0ef 100644 --- a/features/cloud-controller/pom.xml +++ b/features/cloud-controller/pom.xml @@ -17,9 +17,10 @@ ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - + --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> @@ -27,14 +28,11 @@ <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>cloud-controller-features</artifactId> <name>Apache Stratos - Cloud Controller Features</name> <packaging>pom</packaging> - <url>http://apache.org</url> <modules> <module>org.apache.stratos.cloud.controller.feature</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 25e86b9..21d15ef 100644 --- a/features/common/org.apache.stratos.common.feature/pom.xml +++ b/features/common/org.apache.stratos.common.feature/pom.xml @@ -17,20 +17,18 @@ # specific language governing permissions and limitations # under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>common-features</artifactId> <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.common.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Common Composite Feature</name> - <url>http://apache.org</url> <description>This feature contains the bundles required for Common feature</description> <dependencies> @@ -39,13 +37,13 @@ <artifactId>org.apache.stratos.common.server.feature</artifactId> <version>${project.version}</version> <type>zip</type> - </dependency> + </dependency> <dependency> <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.common.ui.feature</artifactId> + <artifactId>org.apache.stratos.custom.handlers.feature</artifactId> <version>${project.version}</version> <type>zip</type> - </dependency> + </dependency> </dependencies> <build> @@ -53,7 +51,6 @@ <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>p2-feature-generation</id> @@ -65,8 +62,12 @@ <id>org.apache.stratos.common</id> <propertiesFile>../../../../etc/feature.properties</propertiesFile> <includedFeatures> - <includedFeatureDef>org.apache.stratos:org.apache.stratos.common.server.feature:${project.version}</includedFeatureDef> - <includedFeatureDef>org.apache.stratos:org.apache.stratos.common.ui.feature:${project.version}</includedFeatureDef> + <includedFeatureDef> + org.apache.stratos:org.apache.stratos.common.server.feature:${project.version} + </includedFeatureDef> + <includedFeatureDef> + org.apache.stratos:org.apache.stratos.custom.handlers.feature:${project.version} + </includedFeatureDef> </includedFeatures> </configuration> </execution> @@ -74,4 +75,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 5c4aa1e..3dbdd2c 100644 --- a/features/common/org.apache.stratos.common.server.feature/pom.xml +++ b/features/common/org.apache.stratos.common.server.feature/pom.xml @@ -19,7 +19,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>common-features</artifactId> @@ -27,105 +27,11 @@ <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.common.server.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Common Server Feature</name> - <url>http://apache.org</url> <description>This feature contains the core bundles required for Back-end servlet functionality</description> - <dependencies> - <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.landing.page.deployer</artifactId> - <version>${project.version}</version> - </dependency--> - <!--<dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.sample.installer</artifactId> - <version>${stratos.version}</version> - </dependency>--> - <!--<dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.activity</artifactId> - </dependency>--> - <!-- - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.tenant.dispatcher</artifactId> - <version>${project.version}</version> - </dependency> - --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.redirector.servlet</artifactId> - <version>2.2.1</version> - </dependency> - <!--<dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.throttling.agent</artifactId> - </dependency>--> - <!--dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.throttling.agent.stub</artifactId> - <version>${project.version}</version> - </dependency--> - <!--<dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.usage.agent</artifactId> - <version>2.1.0</version> - </dependency>--> - <dependency> - <groupId>org.quartz-scheduler.wso2</groupId> - <artifactId>quartz</artifactId> - <version>2.1.1.wso2v1</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.task</artifactId> - <version>${wso2carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.application.upload</artifactId> - <version>${wso2carbon.version}</version> - </dependency> - <dependency> - <groupId>org.apache.synapse</groupId> - <artifactId>synapse-tasks</artifactId> - <version>${synapse.patch.version.212-wso2v2}</version> - </dependency> - - <!-- Tenant Mgmt --> - <dependency> - <groupId>org.json.wso2</groupId> - <artifactId>json</artifactId> - <version>${json.patch.version.200-wso2v1}</version> - </dependency> - - - <dependency> - <groupId>kaptcha.wso2</groupId> - <artifactId>kaptcha</artifactId> - <version>${kaptcha.patch.version.230-wso2v1}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.captcha.mgt</artifactId> - <version>${wso2carbon.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.theme.mgt</artifactId> - <version>2.2.0</version> - </dependency> - </dependencies> - <build> <plugins> <plugin> @@ -161,7 +67,6 @@ <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>p2-feature-generation</id> @@ -182,35 +87,14 @@ </adviceFile> <bundles> <bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet:2.2.1</bundleDef> - <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>--> - <!-- - <bundleDef>org.apache.stratos:org.apache.stratos.tenant.dispatcher</bundleDef> - --> - <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent</bundleDef>--> - <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent.stub</bundleDef>--> - <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.usage.agent</bundleDef>--> - <!-- bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.landing.page.deployer</bundleDef --> - <bundleDef>org.quartz-scheduler.wso2:quartz</bundleDef> - <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity</bundleDef>--> - <bundleDef>org.wso2.carbon:org.wso2.carbon.task</bundleDef> - <bundleDef>org.apache.synapse:synapse-tasks</bundleDef> - - - <!-- Tenant Mgmt --> - <bundleDef>org.json.wso2:json</bundleDef> - <bundleDef>kaptcha.wso2:kaptcha</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt:2.2.0</bundleDef> - <!-- End Tenant Mgmt --> + <bundleDef>org.quartz-scheduler.wso2:quartz:${quartz.wso2.version}</bundleDef> + <bundleDef>org.json.wso2:json:${json.wso2.version}</bundleDef> + <bundleDef>kaptcha.wso2:kaptcha:${kaptcha.wso2.version}</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt:${carbon.kernel.version}</bundleDef> </bundles> - <importBundles> - <importBundleDef>org.wso2.carbon:org.wso2.carbon.application.upload</importBundleDef> - </importBundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef> <importFeatureDef> - org.wso2.carbon.identity.authenticator.saml2.sso.server:${wso2carbon.version} + org.wso2.carbon.identity.authenticator.saml2.sso.server:${carbon.platform.patch.version.4.2.1} </importFeatureDef> </importFeatures> </configuration> @@ -219,11 +103,4 @@ </plugin> </plugins> </build> - - <properties> - <synapse.patch.version.212-wso2v2>2.1.1-wso2v5</synapse.patch.version.212-wso2v2> - <json.patch.version.200-wso2v1>2.0.0.wso2v1</json.patch.version.200-wso2v1> - <kaptcha.patch.version.230-wso2v1>2.3.0.wso2v1</kaptcha.patch.version.230-wso2v1> - </properties> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 deleted file mode 100644 index fab8faf..0000000 --- a/features/common/org.apache.stratos.common.ui.feature/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file - # distributed with this work for additional information - # regarding copyright ownership. The ASF licenses this file - # to you under the Apache License, Version 2.0 (the - # "License"); you may not use this file except in compliance - # with the License. You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, - # software distributed under the License is distributed on an - # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - # KIND, either express or implied. See the License for the - # specific language governing permissions and limitations - # under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>common-features</artifactId> - <version>4.1.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.common.ui.feature</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Common UI Feature</name> - <url>http://apache.org</url> - <description>This feature contains the bundles required for Front-end servlet functionality</description> - - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId> - <version>4.2.0</version> - </dependency> - <!-- Tenant Mgmt --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.tenant.mgt.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.theme.mgt.ui</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.theme.mgt.stub</artifactId> - <version>4.2.0</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.wso2.maven</groupId> - <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> - <executions> - <execution> - <id>p2-feature-generation</id> - <phase>package</phase> - <goals> - <goal>p2-feature-gen</goal> - </goals> - <configuration> - <id>org.apache.stratos.common.ui</id> - <propertiesFile>../../../../etc/feature.properties</propertiesFile> - <adviceFile> - <properties> - <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef> - <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> - </properties> - </adviceFile> - <bundles> - <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.ui</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.stub:4.2.0</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.sso.redirector.ui</bundleDef> - - <!-- Tenant Mgmt--> - <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.ui</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub</bundleDef> - <!-- Tenant Mgmt End--> - - </bundles> - <importFeatures> - <importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef> - <importFeatureDef> - org.wso2.carbon.identity.authenticator.saml2.sso.ui:${wso2carbon.version} - </importFeatureDef> - </importFeatures> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 37297d9..a8a0a4b 100644 --- a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml +++ b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml @@ -18,10 +18,9 @@ under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>common-features</artifactId> @@ -29,57 +28,16 @@ <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.custom.handlers.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Custom Handlers Feature</name> - <url>http://apache.org</url> - <description/> - - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.identity.oauth</artifactId> - <version>4.2.3</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging</artifactId> - <version>4.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.core</artifactId> - <version>4.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.core.services</artifactId> - <version>4.2.0</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.utils</artifactId> - <version>4.2.0</version> - </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> + <description>OAuth client type handler for JWT token generation</description> <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -106,4 +64,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/common/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/pom.xml b/features/common/pom.xml index bfcd589..d06c8c9 100644 --- a/features/common/pom.xml +++ b/features/common/pom.xml @@ -17,24 +17,22 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>common-features</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Common Features</name> - <url>http://apache.org</url> <modules> <module>org.apache.stratos.common.feature</module> <module>org.apache.stratos.common.server.feature</module> - <module>org.apache.stratos.common.ui.feature</module> <module>org.apache.stratos.custom.handlers.feature</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 885155c..e71cb7a 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 @@ -18,36 +18,25 @@ under the License. --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>loadbalancer-features</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.load.balancer.common.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Load Balancer - Common Feature</name> - <url>http://apache.org</url> <description>This feature contains the common bundle for loadbalancer features</description> - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.load.balancer.common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -65,15 +54,15 @@ </properties> </adviceFile> <bundles> - <!--bundleDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.stub</bundleDef> - --> <bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.load.balancer.common:${project.version}</bundleDef> + <bundleDef> + org.apache.stratos:org.apache.stratos.load.balancer.common:${project.version} + </bundleDef> <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef> <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef> </bundles> <importFeatures> - <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef> + <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}</importFeatureDef> </importFeatures> </configuration> </execution> @@ -81,5 +70,4 @@ </plugin> </plugins> </build> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 f580347..7b73d9a 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 @@ -18,41 +18,26 @@ under the License. --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>loadbalancer-features</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.stratos.load.balancer.feature</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Load Balancer - Management Feature</name> - <url>http://apache.org</url> - <description>This feature contains the required bundles for loadbalancer endpoint management functionality</description> - - <dependencies> - <!--dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.lb.common</artifactId> - <version>${project.version}</version> - </dependency--> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.load.balancer</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <description>This feature contains the required bundles for loadbalancer endpoint management functionality + </description> <build> <plugins> <plugin> <groupId>org.wso2.maven</groupId> <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> <executions> <execution> <id>4-p2-feature-generation</id> @@ -70,11 +55,13 @@ </properties> </adviceFile> <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.load.balancer:${project.version}</bundleDef> + <bundleDef>org.apache.stratos:org.apache.stratos.load.balancer:${project.version} + </bundleDef> </bundles> <importFeatures> - <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef> - <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef> + <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version} + </importFeatureDef> + <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}</importFeatureDef> </importFeatures> </configuration> </execution> @@ -82,8 +69,4 @@ </plugin> </plugins> </build> -<properties> - <carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1> -</properties> - -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/features/load-balancer/pom.xml b/features/load-balancer/pom.xml index 813e6ce..c94808e 100644 --- a/features/load-balancer/pom.xml +++ b/features/load-balancer/pom.xml @@ -17,22 +17,21 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-features-parent</artifactId> <version>4.1.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>loadbalancer-features</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Load Balancer Features</name> - <url>http://apache.org</url> <modules> - <module>org.apache.stratos.load.balancer.feature</module> - <module>org.apache.stratos.load.balancer.common.feature</module> + <module>org.apache.stratos.load.balancer.feature</module> + <module>org.apache.stratos.load.balancer.common.feature</module> </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/deployment/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/deployment/pom.xml b/features/manager/deployment/pom.xml deleted file mode 100644 index d0b0eee..0000000 --- a/features/manager/deployment/pom.xml +++ /dev/null @@ -1,72 +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. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-manager-features</artifactId> - <version>4.1.2-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.deployment.feature</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Deployment Features</name> - <url>http://apache.org</url> - - <dependencies> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.deployment</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.wso2.maven</groupId> - <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> - <executions> - <execution> - <id>p2-feature-generation</id> - <phase>package</phase> - <goals> - <goal>p2-feature-gen</goal> - </goals> - <configuration> - <id>org.apache.stratos.deployment</id> - <propertiesFile>../../../../etc/feature.properties</propertiesFile> - <adviceFile> - <properties> - <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef> - </properties> - </adviceFile> - <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.deployment</bundleDef> - </bundles> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/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 deleted file mode 100644 index ad37e05..0000000 --- a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file - # distributed with this work for additional information - # regarding copyright ownership. The ASF licenses this file - # to you under the Apache License, Version 2.0 (the - # "License"); you may not use this file except in compliance - # with the License. You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, - # software distributed under the License is distributed on an - # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - # KIND, either express or implied. See the License for the - # specific language governing permissions and limitations - # under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>logging-mgt-feature</artifactId> - <version>4.1.2-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.logging.mgt.feature</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Logging Management Feature</name> - <url>http://apache.org</url> - <description>This feature contains the logging management functionality</description> - - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging.mgt.server.feature</artifactId> - <version>${carbon.platform.patch.version.4.1.1}</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging.admin.ui</artifactId> - <version>${wso2carbon.version.logging.mgt}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.logging.view.ui</artifactId> - <version>${project.version}</version> - - </dependency> - <dependency> - <groupId>org.apache.cassandra.wso2</groupId> - <artifactId>apache-cassandra</artifactId> - <version>${cassandra.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging.view.stub</artifactId> - <version>${wso2carbon.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.wso2.maven</groupId> - <artifactId>carbon-p2-plugin</artifactId> - <version>${carbon.p2.plugin.version}</version> - <executions> - <execution> - <id>4-p2-feature-generation</id> - <phase>package</phase> - <goals> - <goal>p2-feature-gen</goal> - </goals> - <configuration> - <id>org.apache.stratos.logging.mgt</id> - <propertiesFile>../../../etc/feature.properties</propertiesFile> - <adviceFile> - <properties> - <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef> - <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> - </properties> - </adviceFile> - <bundles> - <bundleDef>org.wso2.carbon:org.wso2.carbon.logging.admin.ui</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.logging.view.ui:${project.version}</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.logging.admin.stub:${wso2carbon.version}</bundleDef> - <bundleDef>org.wso2.carbon:org.wso2.carbon.logging.view.stub:${wso2carbon.version}</bundleDef> - </bundles> - <importFeatures> - <importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef> - </importFeatures> - <includedFeatures> - <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.logging.mgt.server.feature:4.2.1</includedFeatureDef> - </includedFeatures> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <properties> - <carbon.platform.patch.version.4.1.1>4.1.1</carbon.platform.patch.version.4.1.1> - <cassandra.version>1.1.0.wso2v2</cassandra.version> - </properties> -</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/features/manager/logging-mgt/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/logging-mgt/pom.xml b/features/manager/logging-mgt/pom.xml deleted file mode 100644 index 11b0710..0000000 --- a/features/manager/logging-mgt/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file - # distributed with this work for additional information - # regarding copyright ownership. The ASF licenses this file - # to you under the Apache License, Version 2.0 (the - # "License"); you may not use this file except in compliance - # with the License. You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, - # software distributed under the License is distributed on an - n# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - # KIND, either express or implied. See the License for the - # specific language governing permissions and limitations - # under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-manager-features</artifactId> - <version>4.1.2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>logging-mgt-feature</artifactId> - <packaging>pom</packaging> - <name>Apache Stratos - Logging Management Aggregator Module</name> - <url>http://apache.org</url> - - <modules> - <module>org.apache.stratos.logging.mgt.feature</module> - </modules> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging.service</artifactId> - <version>${wso2carbon.version.logging.mgt}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging.summarizer</artifactId> - <version>${wso2carbon.version.logging.mgt}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging.admin.ui</artifactId> - <version>${wso2carbon.version.logging.mgt}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.logging.view.ui</artifactId> - <version>${wso2carbon.version.logging.mgt}</version> - </dependency> - <dependency> - <groupId>org.springframework.ws.wso2</groupId> - <artifactId>spring.framework</artifactId> - <version>${orbit.version.spring}</version> - </dependency> - <dependency> - <groupId>com.google.guava.wso2</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> - <!--Cassandra --> - - <dependency> - <groupId>org.apache.cassandra.wso2</groupId> - <artifactId>apache-cassandra</artifactId> - <version>${cassandra.version}</version> - </dependency> - - <!--Hector--> - <dependency> - <groupId>org.hectorclient</groupId> - <artifactId>hector-core</artifactId> - <version>${hector-core.version}</version> - </dependency> - <dependency> - <groupId>libthrift.wso2</groupId> - <artifactId>libthrift</artifactId> - <version>${libthrift.version}</version> - </dependency> - <dependency> - <groupId>org.perf4j.wso2</groupId> - <artifactId>perf4j</artifactId> - <version>${perf4j.version}</version> - </dependency> - <dependency> - <groupId>org.cliffc.high_scale_lib.wso2</groupId> - <artifactId>high-scale-lib</artifactId> - <version>${highscale.version}</version> - </dependency> - <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> - </dependency> - <dependency> - <groupId>antlr.wso2</groupId> - <artifactId>antlr</artifactId> - <version>${antlr.version}</version> - </dependency> - <dependency> - <groupId>org.antlr.wso2</groupId> - <artifactId>antlr-runtime</artifactId> - <version>${antlr.version}</version> - </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.databridge.datapublisher.feature</artifactId> - <version>${wso2carbon.version.logging.mgt}</version> - <type>zip</type> - </dependency> - </dependencies> - </dependencyManagement> - <properties> - <wso2carbon.version.logging.mgt>${wso2carbon.version}</wso2carbon.version.logging.mgt> - <antlr.version>3.2.0.wso2v1</antlr.version> - <hector-core.version>1.1-0</hector-core.version> - <libthrift.version>0.7.wso2v1</libthrift.version> - <perf4j.version>0.9.12.wso2v1</perf4j.version> - <highscale.version>1.1.2.wso2v1</highscale.version> - <slf4j.version>1.6.1</slf4j.version> - <guava.version>${google.guava.wso2.version}</guava.version> - <orbit.version.spring>3.1.0.wso2v1</orbit.version.spring> - </properties> -</project> -
