diff options
| author |   huangjian <huang.jian12@zte.com.cn> | 2016-09-21 11:11:23 +0800 |
|---|---|---|
| committer | huangjian <huang.jian12@zte.com.cn> | 2016-09-21 11:11:23 +0800 |
| commit | 8f9daf8d7d866da5d7108bdf9a3bdfef25e5c7fb (patch) | |
| tree | c4064e476f8630e5a816a4502f61d531d4905659 | |
| parent | fa0950ed0c750ab307042cc1f66e5cd252be1ae2 (diff) | |
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 <huang.jian12@zte.com.cn>
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | pom.xml | 560 | ||||
| -rw-r--r-- | wso2bpel-ext/pom.xml | 20 | ||||
| -rw-r--r-- | wso2bpel-ext/wso2bpel-core/distribution/pom.xml | 4 | ||||
| -rw-r--r-- | wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml | 20 | ||||
| -rw-r--r-- | wso2bpel-ext/wso2bpel-core/pom.xml | 4 | ||||
| -rw-r--r-- | wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml | 32 | ||||
| -rw-r--r-- | wso2bpel-ext/wso2bpel-parent/pom.xml | 5 | ||||
| -rw-r--r-- | wso2bpel-ext/wso2bpel-parent/wso2bpelparent-lite/pom.xml | 3 | ||||
| -rw-r--r-- | wso2bpel-ext/wso2bpel-parent/wso2bpelparent/pom.xml | 4 |
10 files changed, 329 insertions, 328 deletions
@@ -1,5 +1,8 @@ -/target/ +target # Eclipse .settings/ .classpath .project +.idea +*.iml +dependency-reduced-pom.xml @@ -15,319 +15,319 @@ 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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.openo.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../oparent</relativePath> - </parent> + <parent> + <groupId>org.openo.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../oparent</relativePath> + </parent> - <groupId>org.openo.common-services.common-utilities</groupId> - <artifactId>common-setting</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>common-setting</name> + <groupId>org.openo.common-services.common-utilities</groupId> + <artifactId>common-setting</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>common-setting</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.test.skip>false</maven.test.skip> + <maven.test.failure.ignore>false</maven.test.failure.ignore> + <finalName>${project.artifactId}-${project.version}</finalName> + <release.dir>${basedir}/target</release.dir> + <slf4j.version>1.6.1</slf4j.version> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.test.skip>false</maven.test.skip> - <maven.test.failure.ignore>false</maven.test.failure.ignore> - <finalName>${project.artifactId}-${project.version}</finalName> - <release.dir>${basedir}/target</release.dir> - <slf4j.version>1.6.1</slf4j.version> + <bundle.name>${project.artifactId}-${project.version}</bundle.name> + <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir> + <excludesFile>**/*$*</excludesFile> - <bundle.name>${project.artifactId}-${project.version}</bundle.name> - <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir> - <excludesFile>**/*$*</excludesFile> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <nexusproxy>https://nexus.open-o.org/content</nexusproxy> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> - <scm> + <scm> <connection>scm:git:ssh://git.open-o.org:29418/common-services-common-utilities.git</connection> <developerConnection>scm:git:ssh://git.open-o.org:29418/common-services-common-utilities.git</developerConnection> <tag>HEAD</tag> <url>https://wiki.open-o.orgiew/Common_Services</url> </scm> - + <modules> <module>common-util</module> <module>rest-client</module> <!-- <module>winery</module> --> - <module>wso2bpel-ext</module> + <module>wso2bpel-ext</module> </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>org.apache.commons.lang</artifactId> - <version>2.6.0</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>org.apache.commons.logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>org.apache.commons.codec</artifactId> - <version>1.9.0</version> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>org.apache.commons.lang</artifactId> + <version>2.6.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>org.apache.commons.logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>org.apache.commons.codec</artifactId> + <version>1.9.0</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>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - <dependency> - <groupId>org.mybatis</groupId> - <artifactId>mybatis-spring</artifactId> - <version>1.2.0</version> - </dependency> - <dependency> - <groupId>org.mybatis</groupId> - <artifactId>mybatis</artifactId> - <version>3.2.7</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.2</version> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>2.4</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all</artifactId> - <version>8.1.16.v20140903</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - <version>3.0.0.v201112011016</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>redis.clients</groupId> - <artifactId>jedis</artifactId> - <version>2.8.0</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-dbcp2</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.2</version> - </dependency> - </dependencies> - </dependencyManagement> + <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>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + <dependency> + <groupId>org.mybatis</groupId> + <artifactId>mybatis-spring</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>org.mybatis</groupId> + <artifactId>mybatis</artifactId> + <version>3.2.7</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>2.4</version> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-all</artifactId> + <version>8.1.16.v20140903</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + <version>3.0.0.v201112011016</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>redis.clients</groupId> + <artifactId>jedis</artifactId> + <version>2.8.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-dbcp2</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.9.2</version> + </dependency> + </dependencies> + </dependencyManagement> - <build> - <resources> - <resource> - <directory>${resources.dir}</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-resources</directory> - </resource> - <resource> - <directory>${basedir}/src/main/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - <resource> - <directory>${basedir}/src/main/resources</directory> - </resource> - </resources> - <testResources> - <testResource> - <directory>${basedir}/src/test/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - <testResource> - <directory>${basedir}/src/test/resources</directory> - </testResource> - </testResources> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <dependencies> - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>ant-contrib</artifactId> - <version>1.0b3</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.js</groupId> - <artifactId>closure-compiler</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>com.google.closure-stylesheets</groupId> - <artifactId>closure-stylesheets</artifactId> - <version>20140426</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <checkModificationExcludes> - <checkModificationExclude>**/*.java</checkModificationExclude> - </checkModificationExcludes> - <allowTimestampedSnapshots>true</allowTimestampedSnapshots> - </configuration> - </plugin> + <build> + <resources> + <resource> + <directory>${resources.dir}</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-resources</directory> + </resource> + <resource> + <directory>${basedir}/src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/src/main/resources</directory> + </resource> + </resources> + <testResources> + <testResource> + <directory>${basedir}/src/test/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </testResource> + <testResource> + <directory>${basedir}/src/test/resources</directory> + </testResource> + </testResources> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <dependencies> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.js</groupId> + <artifactId>closure-compiler</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>com.google.closure-stylesheets</groupId> + <artifactId>closure-stylesheets</artifactId> + <version>20140426</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <checkModificationExcludes> + <checkModificationExclude>**/*.java</checkModificationExclude> + </checkModificationExcludes> + <allowTimestampedSnapshots>true</allowTimestampedSnapshots> + </configuration> + </plugin> - </plugins> - </pluginManagement> - <plugins> - <!--Release --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - </plugin> + </plugins> + </pluginManagement> + <plugins> + <!--Release --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + </plugin> - <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> + <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>2.4-fixed</version> <configuration> <srcLocation>${srcLocation}</srcLocation> <classOutputDir>${classOutputDir}</classOutputDir> </configuration> </plugin --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> - <configuration> - <retryFailedDeploymentCount>2</retryFailedDeploymentCount> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.7</version> + <configuration> + <retryFailedDeploymentCount>2</retryFailedDeploymentCount> + </configuration> + </plugin> - <!-- javadoc --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> - <configuration> - <aggregate>true</aggregate> - <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile> - <overview>${javadoc.loc}/overview.html</overview> - <excludePackageNames>org.apache.*,*.impl</excludePackageNames> - <breakiterator>true</breakiterator> - <quiet>true</quiet> - <failOnError>false</failOnError> - <verbose>false</verbose> - <show>protected</show> - <source>1.5</source> - <charset>gb2312</charset> - <encoding>UTF-8</encoding> - <docencoding>gb2312</docencoding> - <maxmemory>256M</maxmemory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <finalName>${bundle.name}</finalName> - <outputDirectory>${release.dir}</outputDirectory> - </configuration> - </plugin> - <!-- clean --> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <failOnError>false</failOnError> - <filesets> - <fileset> - <directory>${release.dir}</directory> - <includes> - <include>${bundle.name}.${project.packaging}</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> + <!-- javadoc --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.6.1</version> + <configuration> + <aggregate>true</aggregate> + <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile> + <overview>${javadoc.loc}/overview.html</overview> + <excludePackageNames>org.apache.*,*.impl</excludePackageNames> + <breakiterator>true</breakiterator> + <quiet>true</quiet> + <failOnError>false</failOnError> + <verbose>false</verbose> + <show>protected</show> + <source>1.5</source> + <charset>gb2312</charset> + <encoding>UTF-8</encoding> + <docencoding>gb2312</docencoding> + <maxmemory>256M</maxmemory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.3</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <finalName>${bundle.name}</finalName> + <outputDirectory>${release.dir}</outputDirectory> + </configuration> + </plugin> + <!-- clean --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <failOnError>false</failOnError> + <filesets> + <fileset> + <directory>${release.dir}</directory> + <includes> + <include>${bundle.name}.${project.packaging}</include> + </includes> + </fileset> + </filesets> + </configuration> + </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> - <configuration> - <aggregate>true</aggregate> - <quiet>true</quiet> - <show>public</show> - </configuration> - </plugin> - </plugins> - </reporting> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.6.1</version> + <configuration> + <aggregate>true</aggregate> + <quiet>true</quiet> + <show>public</show> + </configuration> + </plugin> + </plugins> + </reporting> </project> 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 @@ --> <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"> <parent> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpelparent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>wso2bpel-parent/wso2bpelparent</relativePath> @@ -25,20 +25,20 @@ <modelVersion>4.0.0</modelVersion> <artifactId>wso2bpel-root</artifactId> - <!--name>openo/commonservice/commonutilities/wso2bpel-root</name--> + <name>openo/commonservice/commonutilities/wso2bpel-root</name> <packaging>pom</packaging> <modules> <module>wso2bpel-parent</module> <module>wso2bpel-core</module> </modules> - + <build> - <plugins> - <plugin> - <groupId>com.mycila</groupId> - <artifactId>license-maven-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>com.mycila</groupId> + <artifactId>license-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> 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 @@ --> <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"> <parent> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpel-core-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>distribution</artifactId> - <!--name>openo/commonservice/commonutilities/distribution</name--> + <name>openo/commonservice/commonutilities/distribution</name> <packaging>pom</packaging> <modules> 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 @@ --> <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"> <parent> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>distribution</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -103,7 +103,7 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpel-mgr</artifactId> <type>jar</type> <overWrite>true</overWrite> @@ -122,7 +122,7 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpel-mgr</artifactId> <type>jar</type> <overWrite>true</overWrite> @@ -145,7 +145,7 @@ <goal>run</goal> </goals> <configuration> - <tasks name="distribution"> + <target name="distribution"> <copy todir="target/assembly/linux64/lib"> <fileset dir="../../wso2bpel-mgr/lib"> <include name="*" /> @@ -156,7 +156,7 @@ <include name="*" /> </fileset> </copy> - <tar destfile="${version.output}/${packagename}-${project.version}.tar.gz" longfile="posix" compression="gzip"> + <tar destfile="${version.output}/${packagename}-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip"> <tarfileset dir="target/assembly/linux64" filemode="0644" dirmode="0755"> <exclude name="**/*.sh"/> </tarfileset> @@ -164,12 +164,12 @@ <include name="**/*.sh"/> </tarfileset> </tar> - <attachartifact file="${version.output}/${packagename}-${project.version}.tar.gz" classifier="linux64" type="tar.gz"/> - <zip destfile="${version.output}/${packagename}-${project.version}.zip" update="true"> + <attachartifact file="${version.output}/${packagename}-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/> + <zip destfile="${version.output}/${packagename}-${project.version}-win64.zip" update="true"> <zipfileset dir="target/assembly/win64" includes="**"/> </zip> - <attachartifact file="${version.output}/${packagename}-${project.version}.zip" classifier="win64" type="zip"/> - </tasks> + <attachartifact file="${version.output}/${packagename}-${project.version}-win64.zip" classifier="win64" type="zip"/> + </target> </configuration> </execution> </executions> @@ -179,7 +179,7 @@ <dependencies> <dependency> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpel-mgr</artifactId> <version>${project.version}</version> </dependency> 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 @@ --> <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"> <parent> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpel-root</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wso2bpel-core-parent</artifactId> - <!--name>openo/commonservice/commonutilities/wso2bpel-core-parent</name--> + <name>openo/commonservice/commonutilities/wso2bpel-core-parent</name> <packaging>pom</packaging> <modules> 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 @@ <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"> <parent> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpel-core-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wso2bpel-mgr</artifactId> - <!--name>openo/commonservice/commonutilities/wso2bpel-mgr</name--> + <name>openo/commonservice/commonutilities/wso2bpel-mgr</name> <packaging>jar</packaging> <build> <plugins> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.7</source> - <target>1.7</target> - <encoding>UTF-8</encoding> - <compilerArgs> - <arg>-verbose</arg> - <arg>-Xlint:unchecked</arg> - <arg>-Xlint:deprecation</arg> - <arg>-bootclasspath</arg> - <arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg> - <arg>-extdirs</arg> - <arg>${project.basedir}/lib</arg> - </compilerArgs> - </configuration> + <source>1.7</source> + <target>1.7</target> + <encoding>UTF-8</encoding> + <compilerArgs> + <arg>-verbose</arg> + <arg>-Xlint:unchecked</arg> + <arg>-Xlint:deprecation</arg> + <arg>-bootclasspath</arg> + <arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg> + <arg>-extdirs</arg> + <arg>${project.basedir}/lib</arg> + </compilerArgs> + </configuration> </plugin> <plugin> <groupId>org.eclipse.m2e</groupId> 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 @@ --> <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"> <parent> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpelparent-lite</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>wso2bpelparent-lite</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.common-services.common-utilities</groupId> <artifactId>wso2bpelparent-aggregator</artifactId> - <!--name>openo/commonservice/commonutilities/wso2bpelparent-aggregator</name--> + <name>openo/commonservice/commonutilities/wso2bpelparent-aggregator</name> <packaging>pom</packaging> <modules> 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 @@ </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpelparent-lite</artifactId> - <version>1.0.0-SNAPSHOT</version> <name>openo/commonservice/commonutilities/wso2bpelparent-lite</name> <packaging>pom</packaging> 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 @@ --> <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"> <parent> - <groupId>org.openo.common-services.common-utilities</groupId> + <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId> <artifactId>wso2bpelparent-lite</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../wso2bpelparent-lite</relativePath> @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>wso2bpelparent</artifactId> - <!--name>openo/commonservice/commonutilities/wso2bpelparent</name--> + <name>openo/commonservice/commonutilities/wso2bpelparent</name> <packaging>pom</packaging> <properties> |