Repository: stratos Updated Branches: refs/heads/master db77fe036 -> 5578aa467
Formatting pom files of components Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5578aa46 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5578aa46 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5578aa46 Branch: refs/heads/master Commit: 5578aa467ae9f7599c90767c14d1c2d42504ed12 Parents: db77fe0 Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Apr 19 17:45:39 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Apr 19 17:45:39 2015 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.account.mgt/pom.xml | 15 +- .../org.apache.stratos.activation/pom.xml | 15 +- components/org.apache.stratos.cli/pom.xml | 501 ++++++++++--------- .../org.apache.stratos.deployment/pom.xml | 13 +- .../org.apache.stratos.email.sender/pom.xml | 5 +- .../org.apache.stratos.keystore.mgt/pom.xml | 15 +- .../org.apache.stratos.manager.styles/pom.xml | 15 +- .../org.apache.stratos.metadata.client/pom.xml | 2 +- .../pom.xml | 11 +- .../pom.xml | 30 +- .../org.apache.stratos.tenant.activity/pom.xml | 5 +- .../pom.xml | 17 +- .../org.apache.stratos.validate.domain/pom.xml | 9 +- 13 files changed, 339 insertions(+), 314 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.account.mgt/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.account.mgt/pom.xml b/components/org.apache.stratos.account.mgt/pom.xml index 42dad8d..618a4df 100644 --- a/components/org.apache.stratos.account.mgt/pom.xml +++ b/components/org.apache.stratos.account.mgt/pom.xml @@ -16,7 +16,8 @@ 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -37,7 +38,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> @@ -64,22 +65,22 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.core</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> + <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.email.verification</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.tenant.mgt</artifactId> - <version>2.2.2</version> + <version>2.2.2</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.activation/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.activation/pom.xml b/components/org.apache.stratos.activation/pom.xml index a550014..1c422d5 100644 --- a/components/org.apache.stratos.activation/pom.xml +++ b/components/org.apache.stratos.activation/pom.xml @@ -16,12 +16,13 @@ # 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";> <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-components-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-components-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -39,7 +40,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> @@ -71,7 +72,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.utils</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> <groupId>org.apache.axis2.wso2</groupId> @@ -88,7 +89,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/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 a53c2e3..b80c48e 100644 --- a/components/org.apache.stratos.cli/pom.xml +++ b/components/org.apache.stratos.cli/pom.xml @@ -17,252 +17,265 @@ # 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";> - <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-components-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-components-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.stratos.cli</artifactId> - <packaging>jar</packaging> - <name>Apache Stratos - CLI</name> - <description>Apache Stratos CLI</description> - <url>http://apache.org</url> - - <properties> - <slf4j.version>1.7.6</slf4j.version> - <wiremock.version>1.46</wiremock.version> - </properties> + <modelVersion>4.0.0</modelVersion> + <artifactId>org.apache.stratos.cli</artifactId> + <packaging>jar</packaging> + <name>Apache Stratos - CLI</name> + <description>Apache Stratos CLI</description> + <url>http://apache.org</url> - <dependencies> - <!-- Adding HttpClient dependencies. Those were resolved with above one --> - <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> - <artifactId>httpcore</artifactId> - <version>4.3.0.wso2v1</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.manager.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> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.2.4</version> - </dependency> - <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>4.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>copy</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <!-- Copy the CLI --> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${maven.output.build.path}</outputDirectory> - </artifactItem> - </artifactItems> - <artifactItems> - <artifactItem> - <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock</artifactId> - <version>${wiremock.version}</version> - <classifier>standalone</classifier> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${maven.output.build.path}</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <properties> + <slf4j.version>1.7.6</slf4j.version> + <wiremock.version>1.46</wiremock.version> + </properties> - <profiles> - <!-- Integration testing the CLI --> - <profile> - <id>cli-test</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>pre-integration-test</phase> - <configuration> - <tasks> - <mkdir dir="${project.build.directory}/downloads/"/> - <get src="https://pypi.python.org/packages/source/p/pexpect/pexpect-3.2.tar.gz"; - dest="${project.build.directory}/downloads/" - verbose="true"/> - <gunzip src="${project.build.directory}/downloads/pexpect-3.2.tar.gz" - dest="${project.build.directory}/downloads/pexpect-3.2.tar"/> - <untar src="${project.build.directory}/downloads/pexpect-3.2.tar" - dest="${project.build.directory}/"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <configuration> - <executable>python</executable> - <workingDirectory>src/test/python</workingDirectory> - <!-- tests common to both interactive and non-interactive use cases --> - <arguments> - <argument>test_common.py</argument> - </arguments> - <environmentVariables> - <PYTHONPATH>../../main/python:${project.build.directory}/pexpect-3.2:$PYTHONPATH</PYTHONPATH> - <CLI_JAR>${project.build.directory}/${project.build.finalName}.jar</CLI_JAR> - <WIREMOCK_JAR>${project.build.directory}/dependency/wiremock-${wiremock.version}-standalone.jar</WIREMOCK_JAR> - <!-- Use uncommon ports to prevent conflict on jenkins --> - <WIREMOCK_HTTP_PORT>3448</WIREMOCK_HTTP_PORT> - <WIREMOCK_HTTPS_PORT>3449</WIREMOCK_HTTPS_PORT> - </environmentVariables> - </configuration> - <id>python-test-common</id> - <phase>integration-test</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - <execution> - <configuration> - <executable>python</executable> - <workingDirectory>src/test/python</workingDirectory> - <!-- interactive use cases --> - <arguments> - <argument>test_interactive.py</argument> - </arguments> - <environmentVariables> - <PYTHONPATH>../../main/python:${project.build.directory}/pexpect-3.2:$PYTHONPATH</PYTHONPATH> - <CLI_JAR>${project.build.directory}/${project.build.finalName}.jar</CLI_JAR> - <WIREMOCK_JAR>${project.build.directory}/dependency/wiremock-${wiremock.version}-standalone.jar</WIREMOCK_JAR> - <!-- Use uncommon ports to prevent conflict on jenkins --> - <WIREMOCK_HTTP_PORT>3448</WIREMOCK_HTTP_PORT> - <WIREMOCK_HTTPS_PORT>3449</WIREMOCK_HTTPS_PORT> - </environmentVariables> - </configuration> - <id>python-test-interactive</id> - <phase>integration-test</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - <execution> - <configuration> - <executable>python</executable> - <workingDirectory>src/test/python</workingDirectory> - <!-- non-interactive use cases --> - <arguments> - <argument>test_noninteractive.py</argument> - </arguments> - <environmentVariables> - <PYTHONPATH>../../main/python:${project.build.directory}/pexpect-3.2:$PYTHONPATH</PYTHONPATH> - <CLI_JAR>${project.build.directory}/${project.build.finalName}.jar</CLI_JAR> - <WIREMOCK_JAR>${project.build.directory}/dependency/wiremock-${wiremock.version}-standalone.jar</WIREMOCK_JAR> - <!-- Use uncommon ports to prevent conflict on jenkins --> - <WIREMOCK_HTTP_PORT>3448</WIREMOCK_HTTP_PORT> - <WIREMOCK_HTTPS_PORT>3449</WIREMOCK_HTTPS_PORT> - </environmentVariables> - </configuration> - <id>python-test-noninteractive</id> - <phase>integration-test</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <dependencies> + <!-- Adding HttpClient dependencies. Those were resolved with above one --> + <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> + <artifactId>httpcore</artifactId> + <version>4.3.0.wso2v1</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.manager.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> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.2.4</version> + </dependency> + <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>4.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>copy</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <!-- Copy the CLI --> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${maven.output.build.path}</outputDirectory> + </artifactItem> + </artifactItems> + <artifactItems> + <artifactItem> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock</artifactId> + <version>${wiremock.version}</version> + <classifier>standalone</classifier> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${maven.output.build.path}</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <!-- Integration testing the CLI --> + <profile> + <id>cli-test</id> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <phase>pre-integration-test</phase> + <configuration> + <tasks> + <mkdir dir="${project.build.directory}/downloads/"/> + <get src="https://pypi.python.org/packages/source/p/pexpect/pexpect-3.2.tar.gz"; + dest="${project.build.directory}/downloads/" + verbose="true"/> + <gunzip src="${project.build.directory}/downloads/pexpect-3.2.tar.gz" + dest="${project.build.directory}/downloads/pexpect-3.2.tar"/> + <untar src="${project.build.directory}/downloads/pexpect-3.2.tar" + dest="${project.build.directory}/"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <configuration> + <executable>python</executable> + <workingDirectory>src/test/python</workingDirectory> + <!-- tests common to both interactive and non-interactive use cases --> + <arguments> + <argument>test_common.py</argument> + </arguments> + <environmentVariables> + <PYTHONPATH> + ../../main/python:${project.build.directory}/pexpect-3.2:$PYTHONPATH + </PYTHONPATH> + <CLI_JAR>${project.build.directory}/${project.build.finalName}.jar</CLI_JAR> + <WIREMOCK_JAR> + ${project.build.directory}/dependency/wiremock-${wiremock.version}-standalone.jar + </WIREMOCK_JAR> + <!-- Use uncommon ports to prevent conflict on jenkins --> + <WIREMOCK_HTTP_PORT>3448</WIREMOCK_HTTP_PORT> + <WIREMOCK_HTTPS_PORT>3449</WIREMOCK_HTTPS_PORT> + </environmentVariables> + </configuration> + <id>python-test-common</id> + <phase>integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + <execution> + <configuration> + <executable>python</executable> + <workingDirectory>src/test/python</workingDirectory> + <!-- interactive use cases --> + <arguments> + <argument>test_interactive.py</argument> + </arguments> + <environmentVariables> + <PYTHONPATH> + ../../main/python:${project.build.directory}/pexpect-3.2:$PYTHONPATH + </PYTHONPATH> + <CLI_JAR>${project.build.directory}/${project.build.finalName}.jar</CLI_JAR> + <WIREMOCK_JAR> + ${project.build.directory}/dependency/wiremock-${wiremock.version}-standalone.jar + </WIREMOCK_JAR> + <!-- Use uncommon ports to prevent conflict on jenkins --> + <WIREMOCK_HTTP_PORT>3448</WIREMOCK_HTTP_PORT> + <WIREMOCK_HTTPS_PORT>3449</WIREMOCK_HTTPS_PORT> + </environmentVariables> + </configuration> + <id>python-test-interactive</id> + <phase>integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + <execution> + <configuration> + <executable>python</executable> + <workingDirectory>src/test/python</workingDirectory> + <!-- non-interactive use cases --> + <arguments> + <argument>test_noninteractive.py</argument> + </arguments> + <environmentVariables> + <PYTHONPATH> + ../../main/python:${project.build.directory}/pexpect-3.2:$PYTHONPATH + </PYTHONPATH> + <CLI_JAR>${project.build.directory}/${project.build.finalName}.jar</CLI_JAR> + <WIREMOCK_JAR> + ${project.build.directory}/dependency/wiremock-${wiremock.version}-standalone.jar + </WIREMOCK_JAR> + <!-- Use uncommon ports to prevent conflict on jenkins --> + <WIREMOCK_HTTP_PORT>3448</WIREMOCK_HTTP_PORT> + <WIREMOCK_HTTPS_PORT>3449</WIREMOCK_HTTPS_PORT> + </environmentVariables> + </configuration> + <id>python-test-noninteractive</id> + <phase>integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.deployment/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.deployment/pom.xml b/components/org.apache.stratos.deployment/pom.xml index be0ac9d..623efb1 100644 --- a/components/org.apache.stratos.deployment/pom.xml +++ b/components/org.apache.stratos.deployment/pom.xml @@ -16,11 +16,12 @@ 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";> <parent> - <groupId>org.apache.stratos</groupId> - <artifactId>stratos-components-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-components-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -38,7 +39,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> @@ -90,7 +91,7 @@ </dependency> </dependencies> <properties> - <axis2.osgi.version.range>1.6.1.wso2v8</axis2.osgi.version.range> + <axis2.osgi.version.range>1.6.1.wso2v8</axis2.osgi.version.range> </properties> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.email.sender/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.email.sender/pom.xml b/components/org.apache.stratos.email.sender/pom.xml index 4a0f9f8..a83576a 100644 --- a/components/org.apache.stratos.email.sender/pom.xml +++ b/components/org.apache.stratos.email.sender/pom.xml @@ -16,7 +16,8 @@ # 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -39,7 +40,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.keystore.mgt/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.keystore.mgt/pom.xml b/components/org.apache.stratos.keystore.mgt/pom.xml index 967abd6..4027777 100644 --- a/components/org.apache.stratos.keystore.mgt/pom.xml +++ b/components/org.apache.stratos.keystore.mgt/pom.xml @@ -17,7 +17,8 @@ # 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -38,7 +39,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> @@ -75,10 +76,10 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <dependency> + <dependency> <groupId>commons-codec.wso2</groupId> <artifactId>commons-codec</artifactId> - <version>1.4.0.wso2v1</version> + <version>1.4.0.wso2v1</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> @@ -91,7 +92,7 @@ <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>javax.servlet</artifactId> - <version>${version.javax.servlet}</version> + <version>${version.javax.servlet}</version> <scope>provided</scope> </dependency> <dependency> @@ -106,7 +107,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>bouncycastle</groupId> @@ -116,7 +117,7 @@ <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.security.mgt</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/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 c294255..191f5a1 100644 --- a/components/org.apache.stratos.manager.styles/pom.xml +++ b/components/org.apache.stratos.manager.styles/pom.xml @@ -17,7 +17,8 @@ ~ 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -40,7 +41,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> @@ -72,8 +73,8 @@ </resources> </build> - <dependencies> - + <dependencies> + <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.ui</artifactId> @@ -89,13 +90,13 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.main</artifactId> - <version>1.0.3</version> + <version>1.0.3</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.compendium</artifactId> - <version>1.0.0</version> + <version>1.0.0</version> </dependency> <dependency> @@ -123,6 +124,6 @@ </dependency> </dependencies> <properties> - <wso2carbon.version>4.2.0</wso2carbon.version> + <wso2carbon.version>4.2.0</wso2carbon.version> </properties> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.metadata.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml index 11daa79..00b3677 100644 --- a/components/org.apache.stratos.metadata.client/pom.xml +++ b/components/org.apache.stratos.metadata.client/pom.xml @@ -23,7 +23,7 @@ <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>1.9</version> - <!-- <scope>provided</scope>--> + <!-- <scope>provided</scope>--> </dependency> <dependency> <groupId>com.google.code.gson</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.python.cartridge.agent/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml index 58be7b0..871fbfe 100644 --- a/components/org.apache.stratos.python.cartridge.agent/pom.xml +++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml @@ -17,7 +17,8 @@ ~ 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -103,10 +104,10 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.logging</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.tenant.activity.ui/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity.ui/pom.xml b/components/org.apache.stratos.tenant.activity.ui/pom.xml index ff05123..91a7861 100644 --- a/components/org.apache.stratos.tenant.activity.ui/pom.xml +++ b/components/org.apache.stratos.tenant.activity.ui/pom.xml @@ -17,7 +17,8 @@ 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -47,12 +48,13 @@ org.apache.stratos.tenant.activity.ui.*, </Export-Package> <Import-Package> - org.apache.stratos.tenant.activity.stub.*; version="${carbon.platform.package.import.version.range}", + org.apache.stratos.tenant.activity.stub.*; + version="${carbon.platform.package.import.version.range}", org.apache.stratos.common.*, javax.servlet;version="${imp.pkg.version.javax.servlet}", javax.servlet.http;version="${imp.pkg.version.javax.servlet}", !javax.xml.namespace, - javax.xml.namespace; version=0.0.0, + javax.xml.namespace; version=0.0.0, org.apache.lucene.*, *;resolution:=optional </Import-Package> @@ -70,15 +72,15 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <dependency> + <dependency> <groupId>commons-codec.wso2</groupId> <artifactId>commons-codec</artifactId> - <version>${version.commons.codec}</version> + <version>${version.commons.codec}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.common.ui</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> @@ -91,7 +93,7 @@ <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>javax.servlet</artifactId> - <version>3.0.0.v201112011016</version> + <version>3.0.0.v201112011016</version> <scope>provided</scope> </dependency> <dependency> @@ -101,12 +103,12 @@ <dependency> <groupId>org.apache.ws.commons.axiom.wso2</groupId> <artifactId>axiom</artifactId> - <version>${axiom.wso2.version}</version> + <version>${axiom.wso2.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.ui</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> @@ -115,17 +117,17 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.tenant.activity.stub</artifactId> <version>${project.version}</version> </dependency> </dependencies> - + <properties> - <version.commons.codec>1.4.0.wso2v1</version.commons.codec> + <version.commons.codec>1.4.0.wso2v1</version.commons.codec> </properties> - + </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.tenant.activity/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity/pom.xml b/components/org.apache.stratos.tenant.activity/pom.xml index ecfcd16..51c3a6b 100644 --- a/components/org.apache.stratos.tenant.activity/pom.xml +++ b/components/org.apache.stratos.tenant.activity/pom.xml @@ -16,7 +16,8 @@ # 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -126,7 +127,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.validate.domain.ui/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.validate.domain.ui/pom.xml b/components/org.apache.stratos.validate.domain.ui/pom.xml index cf62ab1..592e1c7 100644 --- a/components/org.apache.stratos.validate.domain.ui/pom.xml +++ b/components/org.apache.stratos.validate.domain.ui/pom.xml @@ -17,7 +17,8 @@ # 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> @@ -37,7 +38,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> @@ -74,7 +75,7 @@ <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>javax.servlet</artifactId> - <version>${version.javax.servlet}</version> + <version>${version.javax.servlet}</version> <scope>provided</scope> </dependency> <dependency> @@ -84,21 +85,21 @@ <dependency> <groupId>org.apache.ws.commons.axiom.wso2</groupId> <artifactId>axiom</artifactId> - <version>${orbit.version.axiom}</version> + <version>${orbit.version.axiom}</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.ui</artifactId> - <version>${wso2carbon.version}</version> + <version>${wso2carbon.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.validate.domain.stub</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> </dependencies> - + <properties> - <version.javax.servlet>3.0.0.v201112011016</version.javax.servlet> + <version.javax.servlet>3.0.0.v201112011016</version.javax.servlet> </properties> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/5578aa46/components/org.apache.stratos.validate.domain/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.validate.domain/pom.xml b/components/org.apache.stratos.validate.domain/pom.xml index 3fbbed1..945d564 100644 --- a/components/org.apache.stratos.validate.domain/pom.xml +++ b/components/org.apache.stratos.validate.domain/pom.xml @@ -16,12 +16,13 @@ # 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";> <parent> <groupId>org.apache.stratos</groupId> <artifactId>stratos-components-parent</artifactId> <version>4.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -39,7 +40,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - + <extensions>true</extensions> <configuration> <instructions> @@ -76,7 +77,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.common</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> </dependency> </dependencies> </project>
