From cacb3de0cf6f97a4ea3dfe3605de395728125787 Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Mon, 29 Jul 2013 22:31:10 -0400 Subject: [PATCH] JCLOUDS-104: Cleaning up CLI POMs * module jclouds-cli-project -> project * removing unnecessary duplicate versions and group IDs * adding an explicit version tag to the project POM to allow the jclouds-cli version to be different from jclouds-project Follow-on from bb56570 --- assembly/pom.xml | 6 +- branding/pom.xml | 6 +- jclouds-cli-project/pom.xml | 240 -------------------------------------------- pom.xml | 8 +- project/pom.xml | 240 ++++++++++++++++++++++++++++++++++++++++++++ runner/pom.xml | 6 +- 6 files changed, 249 insertions(+), 257 deletions(-) delete mode 100644 jclouds-cli-project/pom.xml create mode 100644 project/pom.xml diff --git a/assembly/pom.xml b/assembly/pom.xml index 7fa114a..02469b2 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -20,17 +20,15 @@ + 4.0.0 org.apache.jclouds.cli jclouds-cli-project - ../jclouds-cli-project + ../project 1.7.0-SNAPSHOT - 4.0.0 - org.apache.jclouds.cli jclouds-cli-assembly - 1.7.0-SNAPSHOT jclouds :: cli :: assembly diff --git a/branding/pom.xml b/branding/pom.xml index 4e6692e..167d1bf 100644 --- a/branding/pom.xml +++ b/branding/pom.xml @@ -19,17 +19,15 @@ --> + 4.0.0 org.apache.jclouds.cli jclouds-cli-project - ../jclouds-cli-project + ../project 1.7.0-SNAPSHOT - 4.0.0 - org.apache.jclouds.cli branding - 1.7.0-SNAPSHOT bundle jclouds :: cli :: branding diff --git a/jclouds-cli-project/pom.xml b/jclouds-cli-project/pom.xml deleted file mode 100644 index 810cff2..0000000 --- a/jclouds-cli-project/pom.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - 4.0.0 - - - org.apache.jclouds - jclouds-project - 1.7.0-SNAPSHOT - - - org.apache.jclouds.cli - jclouds-cli-project - pom - - Apache jclouds :: cli - - http://jclouds.apache.org - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - scm:git:https://git-wip-us.apache.org/repos/asf/jclouds-cli.git - scm:git:https://git-wip-us.apache.org/repos/asf/jclouds-cli.git - https://git-wip-us.apache.org/repos/asf?p=jclouds-cli.git - HEAD - - - - - iocanel - Ioannis Canellos - iocanel@gmail.com - http://iocanel.blogspot.com - - - abayer - Andew Bayer - abayer@apache.org - http://andrewbayer.com - - - - - - 2.2.7 - 1.2.8 - 1.6.5 - 1.2.8 - 0.3 - 0.3 - 0.3.1 - 0.3 - 3.3.1_1 - 3.2.2 - ${project.parent.version} - ${project.parent.version} - 1.2.17 - 1.6.6 - - 1.7 - 2.2.1 - 2.1.0 - 2.0.2 - 2.4 - 2.4.2 - 1.5 - - source-release-zip-tar - - - true - - - - - - org.apache.karaf.shell - org.apache.karaf.shell.console - ${karaf.version} - - - - org.apache.karaf - apache-karaf - ${karaf.version} - tar.gz - - - org.apache.karaf - apache-karaf - ${karaf.version} - zip - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - log4j - log4j - ${log4j.version} - - - - - - - - org.apache.rat - apache-rat-plugin - 0.8 - - - package - - check - - - - - - - - **/LICENSE.txt - **/header.txt - - - **/NOTICE.txt - **/DISCLAIMER - **/BUILD.txt - **/CHANGES.txt - **/README.md - **/README.txt - **/DEPENDENCIES - - .git/** - **/.gitignore - **/*.json - **/*.log* - **/TODO - .mailmap - .idea/** - **/*.iml - **/.project - **/.classpath - **/.settings/** - **/.checkstyle - **/target/** - .repository/** - - - - - - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin.version} - true - true - - - ${project.name} - org.apache.jclouds.cli.${project.artifactId} - ${osgi.export} - ${osgi.import} - ${osgi.dynamic.import} - ${osgi.private} - ${osgi.bundles} - ${osgi.activator} - - - jar - war - bundle - - true - - - - bundle-manifest - process-classes - - manifest - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - false - deploy - -Pdoc -Papache-release ${arguments} - - - - - - diff --git a/pom.xml b/pom.xml index 2b2b1a4..a8634ef 100644 --- a/pom.xml +++ b/pom.xml @@ -22,15 +22,13 @@ org.apache.jclouds.cli jclouds-cli-project - jclouds-cli-project + project 1.7.0-SNAPSHOT - org.apache.jclouds.cli jclouds-cli pom Apache jclouds :: cli - 1.7.0-SNAPSHOT http://jclouds.apache.org @@ -57,17 +55,17 @@ abayer - Andew Bayer + Andrew Bayer abayer@apache.org http://andrewbayer.com + project branding assembly runner - jclouds-cli-project diff --git a/project/pom.xml b/project/pom.xml new file mode 100644 index 0000000..1390233 --- /dev/null +++ b/project/pom.xml @@ -0,0 +1,240 @@ + + + + 4.0.0 + + + org.apache.jclouds + jclouds-project + 1.7.0-SNAPSHOT + + + org.apache.jclouds.cli + jclouds-cli-project + 1.7.0-SNAPSHOT + pom + Apache jclouds :: cli + + http://jclouds.apache.org + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:https://git-wip-us.apache.org/repos/asf/jclouds-cli.git + scm:git:https://git-wip-us.apache.org/repos/asf/jclouds-cli.git + https://git-wip-us.apache.org/repos/asf?p=jclouds-cli.git + HEAD + + + + + iocanel + Ioannis Canellos + iocanel@gmail.com + http://iocanel.blogspot.com + + + abayer + Andew Bayer + abayer@apache.org + http://andrewbayer.com + + + + + + 2.2.7 + 1.2.8 + 1.6.5 + 1.2.8 + 0.3 + 0.3 + 0.3.1 + 0.3 + 3.3.1_1 + 3.2.2 + ${project.parent.version} + ${project.parent.version} + 1.2.17 + 1.6.6 + + 1.7 + 2.2.1 + 2.1.0 + 2.0.2 + 2.4 + 2.4.2 + 1.5 + + source-release-zip-tar + + + true + + + + + + org.apache.karaf.shell + org.apache.karaf.shell.console + ${karaf.version} + + + + org.apache.karaf + apache-karaf + ${karaf.version} + tar.gz + + + org.apache.karaf + apache-karaf + ${karaf.version} + zip + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + log4j + log4j + ${log4j.version} + + + + + + + + org.apache.rat + apache-rat-plugin + 0.8 + + + package + + check + + + + + + + + **/LICENSE.txt + **/header.txt + + + **/NOTICE.txt + **/DISCLAIMER + **/BUILD.txt + **/CHANGES.txt + **/README.md + **/README.txt + **/DEPENDENCIES + + .git/** + **/.gitignore + **/*.json + **/*.log* + **/TODO + .mailmap + .idea/** + **/*.iml + **/.project + **/.classpath + **/.settings/** + **/.checkstyle + **/target/** + .repository/** + + + + + + org.apache.felix + maven-bundle-plugin + ${maven-bundle-plugin.version} + true + true + + + ${project.name} + org.apache.jclouds.cli.${project.artifactId} + ${osgi.export} + ${osgi.import} + ${osgi.dynamic.import} + ${osgi.private} + ${osgi.bundles} + ${osgi.activator} + + + jar + war + bundle + + true + + + + bundle-manifest + process-classes + + manifest + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + false + deploy + -Pdoc -Papache-release ${arguments} + + + + + + diff --git a/runner/pom.xml b/runner/pom.xml index f0b7971..a972821 100644 --- a/runner/pom.xml +++ b/runner/pom.xml @@ -19,17 +19,15 @@ --> + 4.0.0 org.apache.jclouds.cli jclouds-cli-project - ../jclouds-cli-project + ../project 1.7.0-SNAPSHOT - 4.0.0 - org.apache.jclouds.cli runner - 1.7.0-SNAPSHOT jclouds :: cli :: runner -- 1.8.4