From 9f058a5a5193fb2b05113a092e4e83025dba05ea Mon Sep 17 00:00:00 2001 From: Robert Greig Date: Mon, 12 Feb 2007 10:10:27 +0000 Subject: (Path Qpid-337 submitted by Rupert Smith) Does 1.4 retrotranslation as part of the maven build. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@506401 13f79535-47bb-0310-9956-ffa450edef68 --- java/client/distribution/pom.xml | 16 +++ .../distribution/src/main/assembly/client-bin.xml | 2 + .../src/main/assembly/client-java1.4-bin.xml | 74 +++++++++++ java/client/pom.xml | 140 ++++++++++++++------- java/common/pom.xml | 69 +++++++++- java/distribution/src/main/assembly/bin.xml | 1 + java/pom.xml | 45 +++++-- 7 files changed, 290 insertions(+), 57 deletions(-) create mode 100644 java/client/distribution/src/main/assembly/client-java1.4-bin.xml (limited to 'java') diff --git a/java/client/distribution/pom.xml b/java/client/distribution/pom.xml index dfbe8b83c2..3e9c0e493f 100644 --- a/java/client/distribution/pom.xml +++ b/java/client/distribution/pom.xml @@ -46,6 +46,21 @@ org.apache.qpid qpid-client jar + ${pom.version} + + + org.apache.qpid + qpid-client + jar + ${pom.version} + java1.4 + + + org.apache.qpid + qpid-common + jar + ${pom.version} + java1.4 @@ -104,6 +119,7 @@ src/main/assembly/client-bin.xml + src/main/assembly/client-java1.4-bin.xml src/main/assembly/client-src.xml qpid-${pom.version} diff --git a/java/client/distribution/src/main/assembly/client-bin.xml b/java/client/distribution/src/main/assembly/client-bin.xml index 962f084995..0bea282f73 100644 --- a/java/client/distribution/src/main/assembly/client-bin.xml +++ b/java/client/distribution/src/main/assembly/client-bin.xml @@ -69,6 +69,8 @@ qpid-${qpid.version}/lib false + org.apache.qpid:qpid-client:jar:java1.4 + org.apache.qpid:qpid-common:jar:java1.4 org.apache.qpid:qpid-client-distribution diff --git a/java/client/distribution/src/main/assembly/client-java1.4-bin.xml b/java/client/distribution/src/main/assembly/client-java1.4-bin.xml new file mode 100644 index 0000000000..6a2dd17c5c --- /dev/null +++ b/java/client/distribution/src/main/assembly/client-java1.4-bin.xml @@ -0,0 +1,74 @@ + + + + + java-client-java1.4-bin + false + + tar.gz + zip + + + + + + ../../resources + qpid-${qpid.version} + + DISCLAIMER + LICENSE.txt + NOTICE.txt + README.txt + + + + + ../../release-docs + qpid-${qpid.version}/docs + + RELEASE_NOTES.txt + + + + + target + qpid-${qpid.version}/lib + + qpid-incubating.jar + + + + + + + qpid-${qpid.version}/lib + false + + org.apache.qpid:qpid-client:jar + org.apache.qpid:qpid-common:jar + org.apache.qpid:qpid-client-distribution + org.apache.mina:mina-java5 + org.apache.mina:mina-filter-ssl + + + + + + diff --git a/java/client/pom.xml b/java/client/pom.xml index 854428fb39..303aa108c6 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -38,6 +38,11 @@ 1.5 ${pom.version} ${project.build.directory} + + + false + + @@ -67,7 +72,7 @@ mina-filter-ssl - + org.apache.qpid qpid-broker @@ -98,6 +103,14 @@ easymockclassextension test + + + + net.sf.retrotranslator + retrotranslator-runtime + provided + + @@ -141,48 +154,91 @@ - + + + org.codehaus.mojo + retrotranslator-maven-plugin + + + package + + translate + + + ${project.build.directory}/${project.build.finalName}-java1.4.jar + ${retrotranslator.verify} + + ${retrotranslator.1.4-rt-path} + ${retrotranslator.1.4-jce-path} + ${retrotranslator.1.4-jsse-path} + + + + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/${project.build.finalName}-java1.4.jar + jar + java1.4 + + + + + + - - - - - - META-INF/ - false - ../resources/META-INF - - ** - - - - src/ - false - src/test/java - - **/*.java - - - - - - false - src/main/java - - client.log4j - - - + + + + META-INF/ + false + ../resources/META-INF + + ** + + + + src/ + false + src/test/java + + **/*.java + + + + + + false + src/main/java + + client.log4j + + + + - + + \ No newline at end of file diff --git a/java/common/pom.xml b/java/common/pom.xml index 7472b5ef7d..c8168c34bb 100644 --- a/java/common/pom.xml +++ b/java/common/pom.xml @@ -64,6 +64,61 @@ + + + + org.codehaus.mojo + retrotranslator-maven-plugin + + + package + + translate + + + ${project.build.directory}/${project.build.finalName}-java1.4.jar + ${retrotranslator.verify} + + ${retrotranslator.1.4-rt-path} + ${retrotranslator.1.4-jce-path} + ${retrotranslator.1.4-jsse-path} + + + + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/${project.build.finalName}-java1.4.jar + jar + java1.4 + + + + + + + @@ -74,12 +129,11 @@ log4j - - - + + org.slf4j slf4j-simple - + org.apache.mina @@ -102,5 +156,12 @@ test + + + net.sf.retrotranslator + retrotranslator-runtime + provided + + diff --git a/java/distribution/src/main/assembly/bin.xml b/java/distribution/src/main/assembly/bin.xml index 27eb239d28..1d701bc9c8 100644 --- a/java/distribution/src/main/assembly/bin.xml +++ b/java/distribution/src/main/assembly/bin.xml @@ -148,6 +148,7 @@ qpid-${qpid.version}/lib false + org.apache.qpid:qpid-broker org.apache.qpid:qpid-distribution org.apache.qpid.management:org.apache.qpid.management.ui org.eclipse.core:org.eclipse.core.commands diff --git a/java/pom.xml b/java/pom.xml index 98daf1be3e..8e4c6a91c3 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -47,7 +47,7 @@ scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository - + Qpid_Site Qpid Site @@ -97,17 +97,17 @@ 1.5 -Xlint:fallthrough,finally - - + --> + warn 1.2-SNAPSHOT - 2.1 + 2.1 2.0 2.0.1 1.0 @@ -121,7 +121,8 @@ 2.0-beta-5 2.1-SNAPSHOT 2.2 - + 1.0-alpha-1 + 1.0 ${basedir}/${topDirectoryLocation}/../workspace /set/clover/license/path/here @@ -250,6 +251,18 @@ + + org.codehaus.mojo + retrotranslator-maven-plugin + ${retrotranslator.plugin.version} + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper.plugin.version} + + org.apache.maven.plugins maven-jar-plugin @@ -288,12 +301,12 @@ -ea - amqj.logging.level + amqj.logging.level ${amqj.logging.level} - + @@ -363,6 +376,16 @@ + + + + net.sf.retrotranslator + retrotranslator-runtime + 1.0.8 + provided + + + commons-cli commons-cli -- cgit v1.2.1