From 8f9daf8d7d866da5d7108bdf9a3bdfef25e5c7fb Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 21 Sep 2016 11:11:23 +0800 Subject: [PATCH] 1. The publish package name add system type 2. Parameter tasks is deprecated, use target instead 3. Format pom.xml 4. Modify .gitignore 5. Change groupId Change-Id: I7e2664e7c4ed582ceb8cca128af8f1ed9f0b252c Issue-id: OCS-59 Signed-off-by: huangjian --- .gitignore | 5 +- pom.xml | 560 ++++++++++----------- wso2bpel-ext/pom.xml | 20 +- wso2bpel-ext/wso2bpel-core/distribution/pom.xml | 4 +- .../wso2bpel-core/distribution/standalone/pom.xml | 20 +- wso2bpel-ext/wso2bpel-core/pom.xml | 4 +- wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml | 32 +- wso2bpel-ext/wso2bpel-parent/pom.xml | 5 +- .../wso2bpel-parent/wso2bpelparent-lite/pom.xml | 3 +- .../wso2bpel-parent/wso2bpelparent/pom.xml | 4 +- 10 files changed, 329 insertions(+), 328 deletions(-) diff --git a/.gitignore b/.gitignore index be68b59..7020020 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ -/target/ +target # Eclipse .settings/ .classpath .project +.idea +*.iml +dependency-reduced-pom.xml diff --git a/pom.xml b/pom.xml index a570509..144f280 100644 --- a/pom.xml +++ b/pom.xml @@ -15,319 +15,319 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.openo.oparent - oparent - 1.0.0-SNAPSHOT - ../oparent - + + org.openo.oparent + oparent + 1.0.0-SNAPSHOT + ../oparent + - org.openo.common-services.common-utilities - common-setting - 1.0.0-SNAPSHOT - pom - common-setting + org.openo.common-services.common-utilities + common-setting + 1.0.0-SNAPSHOT + pom + common-setting + + + UTF-8 + false + false + ${project.artifactId}-${project.version} + ${basedir}/target + 1.6.1 - - UTF-8 - false - false - ${project.artifactId}-${project.version} - ${basedir}/target - 1.6.1 + ${project.artifactId}-${project.version} + ${basedir}/../release/pkgzip + **/*$* - ${project.artifactId}-${project.version} - ${basedir}/../release/pkgzip - **/*$* - UTF-8 https://nexus.open-o.org/content UTF-8 UTF-8 - + scm:git:ssh://git.open-o.org:29418/common-services-common-utilities.git scm:git:ssh://git.open-o.org:29418/common-services-common-utilities.git HEAD https://wiki.open-o.orgiew/Common_Services - + common-util rest-client - wso2bpel-ext + wso2bpel-ext - - - - commons-io - commons-io - 2.4 - - - org.apache.commons - org.apache.commons.lang - 2.6.0 - - - org.apache.commons - org.apache.commons.logging - 1.1.1 - - - org.apache.commons - org.apache.commons.codec - 1.9.0 - + + + + commons-io + commons-io + 2.4 + + + org.apache.commons + org.apache.commons.lang + 2.6.0 + + + org.apache.commons + org.apache.commons.logging + 1.1.1 + + + org.apache.commons + org.apache.commons.codec + 1.9.0 + - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - log4j - log4j - 1.2.16 - - - org.mybatis - mybatis-spring - 1.2.0 - - - org.mybatis - mybatis - 3.2.7 - - - org.apache.commons - commons-lang3 - 3.1 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - org.eclipse.jetty.aggregate - jetty-all - 8.1.16.v20140903 - - - org.eclipse.jetty.orbit - javax.servlet - 3.0.0.v201112011016 - provided - - - redis.clients - jedis - 2.8.0 - - - org.apache.commons - commons-dbcp2 - 2.0.1 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 - - - + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + log4j + log4j + 1.2.16 + + + org.mybatis + mybatis-spring + 1.2.0 + + + org.mybatis + mybatis + 3.2.7 + + + org.apache.commons + commons-lang3 + 3.1 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.2 + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + org.eclipse.jetty.aggregate + jetty-all + 8.1.16.v20140903 + + + org.eclipse.jetty.orbit + javax.servlet + 3.0.0.v201112011016 + provided + + + redis.clients + jedis + 2.8.0 + + + org.apache.commons + commons-dbcp2 + 2.0.1 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.2 + + + - - - - ${resources.dir} - - - ${project.build.directory}/generated-resources - - - ${basedir}/src/main/java - - **/*.java - - - - ${basedir}/src/main/resources - - - - - ${basedir}/src/test/java - - **/*.java - - - - ${basedir}/src/test/resources - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.6 - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - com.google.js - closure-compiler - 1.0.0 - - - com.google.closure-stylesheets - closure-stylesheets - 20140426 - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.4.1 - - - org.apache.maven.plugins - maven-release-plugin - 2.5.2 - - - **/*.java - - true - - + + + + ${resources.dir} + + + ${project.build.directory}/generated-resources + + + ${basedir}/src/main/java + + **/*.java + + + + ${basedir}/src/main/resources + + + + + ${basedir}/src/test/java + + **/*.java + + + + ${basedir}/src/test/resources + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.6 + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + com.google.js + closure-compiler + 1.0.0 + + + com.google.closure-stylesheets + closure-stylesheets + 20140426 + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + org.apache.maven.plugins + maven-release-plugin + 2.5.2 + + + **/*.java + + true + + - - - - - - org.apache.maven.plugins - maven-release-plugin - + + + + + + org.apache.maven.plugins + maven-release-plugin + - - - org.apache.maven.plugins - maven-deploy-plugin - 2.7 - - 2 - - + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + 2 + + - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.6.1 - - true - ${javadoc.loc}/javadoc.css - ${javadoc.loc}/overview.html - org.apache.*,*.impl - true - true - false - false - protected - 1.5 - gb2312 - UTF-8 - gb2312 - 256M - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - ${bundle.name} - ${release.dir} - - - - - maven-clean-plugin - - false - - - ${release.dir} - - ${bundle.name}.${project.packaging} - - - - - + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.6.1 + + true + ${javadoc.loc}/javadoc.css + ${javadoc.loc}/overview.html + org.apache.*,*.impl + true + true + false + false + protected + 1.5 + gb2312 + UTF-8 + gb2312 + 256M + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + ${bundle.name} + ${release.dir} + + + + + maven-clean-plugin + + false + + + ${release.dir} + + ${bundle.name}.${project.packaging} + + + + + - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.6.1 - - true - true - public - - - - + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.6.1 + + true + true + public + + + + diff --git a/wso2bpel-ext/pom.xml b/wso2bpel-ext/pom.xml index 045eb49..7bac76a 100644 --- a/wso2bpel-ext/pom.xml +++ b/wso2bpel-ext/pom.xml @@ -17,7 +17,7 @@ --> - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpelparent 1.0.0-SNAPSHOT wso2bpel-parent/wso2bpelparent @@ -25,20 +25,20 @@ 4.0.0 wso2bpel-root - + openo/commonservice/commonutilities/wso2bpel-root pom wso2bpel-parent wso2bpel-core - + - - - com.mycila - license-maven-plugin - - - + + + com.mycila + license-maven-plugin + + + diff --git a/wso2bpel-ext/wso2bpel-core/distribution/pom.xml b/wso2bpel-ext/wso2bpel-core/distribution/pom.xml index 1c0a794..1b5275a 100644 --- a/wso2bpel-ext/wso2bpel-core/distribution/pom.xml +++ b/wso2bpel-ext/wso2bpel-core/distribution/pom.xml @@ -17,14 +17,14 @@ --> - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpel-core-parent 1.0.0-SNAPSHOT 4.0.0 distribution - + openo/commonservice/commonutilities/distribution pom diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml b/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml index efc892c..3e7e4fd 100644 --- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml +++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml @@ -18,7 +18,7 @@ --> - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext distribution 1.0.0-SNAPSHOT @@ -103,7 +103,7 @@ - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpel-mgr jar true @@ -122,7 +122,7 @@ - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpel-mgr jar true @@ -145,7 +145,7 @@ run - + @@ -156,7 +156,7 @@ - + @@ -164,12 +164,12 @@ - - + + - - + + @@ -179,7 +179,7 @@ - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpel-mgr ${project.version} diff --git a/wso2bpel-ext/wso2bpel-core/pom.xml b/wso2bpel-ext/wso2bpel-core/pom.xml index 44b92c3..734c52b 100644 --- a/wso2bpel-ext/wso2bpel-core/pom.xml +++ b/wso2bpel-ext/wso2bpel-core/pom.xml @@ -17,14 +17,14 @@ --> - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpel-root 1.0.0-SNAPSHOT 4.0.0 wso2bpel-core-parent - + openo/commonservice/commonutilities/wso2bpel-core-parent pom diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml index d4b6e9f..8a9c3ad 100644 --- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml +++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml @@ -18,36 +18,36 @@ - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpel-core-parent 1.0.0-SNAPSHOT 4.0.0 wso2bpel-mgr - + openo/commonservice/commonutilities/wso2bpel-mgr jar - + org.apache.maven.plugins maven-compiler-plugin 3.1 - 1.7 - 1.7 - UTF-8 - - -verbose - -Xlint:unchecked - -Xlint:deprecation - -bootclasspath - ${env.JAVA_HOME}/jre/lib/rt.jar - -extdirs - ${project.basedir}/lib - - + 1.7 + 1.7 + UTF-8 + + -verbose + -Xlint:unchecked + -Xlint:deprecation + -bootclasspath + ${env.JAVA_HOME}/jre/lib/rt.jar + -extdirs + ${project.basedir}/lib + + org.eclipse.m2e diff --git a/wso2bpel-ext/wso2bpel-parent/pom.xml b/wso2bpel-ext/wso2bpel-parent/pom.xml index 4a2fe9b..c788bfd 100644 --- a/wso2bpel-ext/wso2bpel-parent/pom.xml +++ b/wso2bpel-ext/wso2bpel-parent/pom.xml @@ -17,16 +17,15 @@ --> - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpelparent-lite 1.0.0-SNAPSHOT wso2bpelparent-lite 4.0.0 - org.openo.common-services.common-utilities wso2bpelparent-aggregator - + openo/commonservice/commonutilities/wso2bpelparent-aggregator pom diff --git a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml index 739cd76..30e3d3f 100644 --- a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml +++ b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml @@ -25,9 +25,8 @@ 4.0.0 - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpelparent-lite - 1.0.0-SNAPSHOT openo/commonservice/commonutilities/wso2bpelparent-lite pom diff --git a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml index 737b2e5..f21c9ec 100644 --- a/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml +++ b/wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml @@ -17,7 +17,7 @@ --> - org.openo.common-services.common-utilities + org.openo.common-services.common-utilities.wso2bpel-ext wso2bpelparent-lite 1.0.0-SNAPSHOT ../wso2bpelparent-lite @@ -25,7 +25,7 @@ 4.0.0 wso2bpelparent - + openo/commonservice/commonutilities/wso2bpelparent pom -- 2.16.6