From f423571bb4239a65945e2bc52b2e64f9e2163042 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 11 May 2012 15:36:49 +0000 Subject: QPID-3994: use Ivy to download the main component dependencies during the build, and the optional bdb-je dependency on request, enabling removal of the main component dependencies from the repository and the 'source release' artifacts. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1337211 13f79535-47bb-0310-9956-ffa450edef68 --- java/bdbstore/build.xml | 21 +++-- java/build.deps | 50 ++++++------ java/build.xml | 22 ++++- java/common.xml | 72 ++++++++++++++++- java/common/build.xml | 7 +- java/ivy.nexus.xml | 57 +++++++++++++ java/ivy.retrieve.xml | 66 +++++++++++++++ java/ivy.xml | 57 ------------- java/ivysettings-nexus.xml | 30 ------- java/ivysettings.nexus.xml | 29 +++++++ java/ivysettings.retrieve.xml | 45 +++++++++++ java/lib/bdbstore/README.txt | 14 ---- java/lib/bnd-0.0.384.jar | Bin 668180 -> 0 bytes java/lib/commons-beanutils-core-1.8.3.jar | Bin 206711 -> 0 bytes java/lib/commons-cli-1.2.jar | Bin 41123 -> 0 bytes java/lib/commons-codec-1.6.jar | Bin 232771 -> 0 bytes java/lib/commons-collections-3.2.1.jar | Bin 575389 -> 0 bytes java/lib/commons-configuration-1.8.jar | Bin 354491 -> 0 bytes java/lib/commons-digester-1.8.1.jar | Bin 146108 -> 0 bytes java/lib/commons-lang-2.6.jar | Bin 284220 -> 0 bytes java/lib/commons-logging-1.1.1.jar | Bin 60841 -> 0 bytes java/lib/derby-10.8.2.2.jar | Bin 2671577 -> 0 bytes java/lib/geronimo-ejb_3.0_spec-1.0.1.jar | Bin 32102 -> 0 bytes .../lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar | Bin 37477 -> 0 bytes java/lib/geronimo-jms_1.1_spec-1.0.jar | Bin 28211 -> 0 bytes java/lib/geronimo-jta_1.1_spec-1.1.1.jar | Bin 16030 -> 0 bytes java/lib/geronimo-kernel-2.2.1.jar | Bin 416154 -> 0 bytes java/lib/geronimo-servlet_2.5_spec-1.2.jar | Bin 70593 -> 0 bytes java/lib/gson-2.0.jar | Bin 202952 -> 0 bytes java/lib/jackson-core-asl-1.9.0.jar | Bin 228286 -> 0 bytes java/lib/jackson-mapper-asl-1.9.0.jar | Bin 764075 -> 0 bytes java/lib/javacc.jar | Bin 298569 -> 0 bytes java/lib/junit-3.8.1.jar | Bin 121070 -> 0 bytes java/lib/jython-2.5.0.jar | Bin 8580107 -> 0 bytes java/lib/log4j-1.2.16.jar | Bin 481534 -> 0 bytes java/lib/maven-ant-tasks-2.1.1.jar | Bin 1314262 -> 0 bytes java/lib/mockito-all-1.9.0.jar | Bin 1495219 -> 0 bytes java/lib/org.apache.felix.main-2.0.5.jar | Bin 391763 -> 0 bytes java/lib/slf4j-api-1.6.4.jar | Bin 25962 -> 0 bytes java/lib/slf4j-log4j12-1.6.4.jar | Bin 9748 -> 0 bytes java/lib/xalan-2.7.0.jar | Bin 2730442 -> 0 bytes java/module.xml | 6 +- java/upload.xml | 90 --------------------- 43 files changed, 335 insertions(+), 231 deletions(-) create mode 100644 java/ivy.nexus.xml create mode 100644 java/ivy.retrieve.xml delete mode 100644 java/ivy.xml delete mode 100644 java/ivysettings-nexus.xml create mode 100644 java/ivysettings.nexus.xml create mode 100644 java/ivysettings.retrieve.xml delete mode 100644 java/lib/bdbstore/README.txt delete mode 100644 java/lib/bnd-0.0.384.jar delete mode 100644 java/lib/commons-beanutils-core-1.8.3.jar delete mode 100644 java/lib/commons-cli-1.2.jar delete mode 100644 java/lib/commons-codec-1.6.jar delete mode 100644 java/lib/commons-collections-3.2.1.jar delete mode 100644 java/lib/commons-configuration-1.8.jar delete mode 100644 java/lib/commons-digester-1.8.1.jar delete mode 100644 java/lib/commons-lang-2.6.jar delete mode 100644 java/lib/commons-logging-1.1.1.jar delete mode 100644 java/lib/derby-10.8.2.2.jar delete mode 100644 java/lib/geronimo-ejb_3.0_spec-1.0.1.jar delete mode 100644 java/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar delete mode 100644 java/lib/geronimo-jms_1.1_spec-1.0.jar delete mode 100644 java/lib/geronimo-jta_1.1_spec-1.1.1.jar delete mode 100644 java/lib/geronimo-kernel-2.2.1.jar delete mode 100644 java/lib/geronimo-servlet_2.5_spec-1.2.jar delete mode 100644 java/lib/gson-2.0.jar delete mode 100644 java/lib/jackson-core-asl-1.9.0.jar delete mode 100644 java/lib/jackson-mapper-asl-1.9.0.jar delete mode 100644 java/lib/javacc.jar delete mode 100644 java/lib/junit-3.8.1.jar delete mode 100644 java/lib/jython-2.5.0.jar delete mode 100644 java/lib/log4j-1.2.16.jar delete mode 100644 java/lib/maven-ant-tasks-2.1.1.jar delete mode 100644 java/lib/mockito-all-1.9.0.jar delete mode 100644 java/lib/org.apache.felix.main-2.0.5.jar delete mode 100644 java/lib/slf4j-api-1.6.4.jar delete mode 100644 java/lib/slf4j-log4j12-1.6.4.jar delete mode 100644 java/lib/xalan-2.7.0.jar delete mode 100644 java/upload.xml (limited to 'java') diff --git a/java/bdbstore/build.xml b/java/bdbstore/build.xml index 7e55b41b28..54f2d8dbc4 100644 --- a/java/bdbstore/build.xml +++ b/java/bdbstore/build.xml @@ -16,7 +16,7 @@ - specific language governing permissions and limitations - under the License. --> - + @@ -25,9 +25,15 @@ - + + + + + + + @@ -61,15 +67,16 @@ http://www.oracle.com/technetwork/database/berkeleydb/downloads/jeoslicense-0868 - + - - - Downloading BDB JE - + + + + diff --git a/java/build.deps b/java/build.deps index 31a646608a..518d3e2ce9 100644 --- a/java/build.deps +++ b/java/build.deps @@ -17,42 +17,42 @@ # under the License. # -commons-beanutils-core=lib/commons-beanutils-core-1.8.3.jar -commons-cli=lib/commons-cli-1.2.jar -commons-codec=lib/commons-codec-1.6.jar -commons-collections=lib/commons-collections-3.2.1.jar -commons-configuration=lib/commons-configuration-1.8.jar -commons-digester=lib/commons-digester-1.8.1.jar -commons-lang=lib/commons-lang-2.6.jar -commons-logging=lib/commons-logging-1.1.1.jar +commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar +commons-cli=lib/required/commons-cli-1.2.jar +commons-codec=lib/required/commons-codec-1.6.jar +commons-collections=lib/required/commons-collections-3.2.1.jar +commons-configuration=lib/required/commons-configuration-1.8.jar +commons-digester=lib/required/commons-digester-1.8.1.jar +commons-lang=lib/required/commons-lang-2.6.jar +commons-logging=lib/required/commons-logging-1.1.1.jar -derby-db=lib/derby-10.8.2.2.jar +derby-db=lib/required/derby-10.8.2.2.jar -geronimo-jms=lib/geronimo-jms_1.1_spec-1.0.jar -geronimo-j2ee=lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar -geronimo-jta=lib/geronimo-jta_1.1_spec-1.1.1.jar -geronimo-kernel=lib/geronimo-kernel-2.2.1.jar -geronimo-openejb=lib/geronimo-ejb_3.0_spec-1.0.1.jar -geronimo-servlet=lib/geronimo-servlet_2.5_spec-1.2.jar +geronimo-jms=lib/required/geronimo-jms_1.1_spec-1.0.jar +geronimo-j2ee=lib/required/geronimo-j2ee-connector_1.5_spec-2.0.0.jar +geronimo-jta=lib/required/geronimo-jta_1.1_spec-1.1.1.jar +geronimo-kernel=lib/required/geronimo-kernel-2.2.1.jar +geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar +geronimo-servlet=lib/required/geronimo-servlet_2.5_spec-1.2.jar -junit=lib/junit-3.8.1.jar -mockito-all=lib/mockito-all-1.9.0.jar +junit=lib/required/junit-3.8.1.jar +mockito-all=lib/required/mockito-all-1.9.0.jar -gson-all=lib/gson-2.0.jar +gson-all=lib/required/gson-2.0.jar -log4j=lib/log4j-1.2.16.jar +log4j=lib/required/log4j-1.2.16.jar -slf4j-api=lib/slf4j-api-1.6.4.jar -slf4j-log4j=lib/slf4j-log4j12-1.6.4.jar +slf4j-api=lib/required/slf4j-api-1.6.4.jar +slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar -xalan=lib/xalan-2.7.0.jar +xalan=lib/required/xalan-2.7.0.jar -felix-main=lib/org.apache.felix.main-2.0.5.jar +felix-main=lib/required/org.apache.felix.main-2.0.5.jar felix.libs=${felix-main} -jackson-core=lib/jackson-core-asl-1.9.0.jar -jackson-mapper=lib/jackson-mapper-asl-1.9.0.jar +jackson-core=lib/required/jackson-core-asl-1.9.0.jar +jackson-mapper=lib/required/jackson-mapper-asl-1.9.0.jar commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \ ${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration} diff --git a/java/build.xml b/java/build.xml index 1de6c8f49c..0905d650d4 100644 --- a/java/build.xml +++ b/java/build.xml @@ -18,7 +18,7 @@ - under the License. - --> - + @@ -156,7 +156,7 @@ - + @@ -296,4 +296,22 @@ + + + + + + + + + + + + + + + + + diff --git a/java/common.xml b/java/common.xml index 2059e0aeb9..fbb17d7412 100644 --- a/java/common.xml +++ b/java/common.xml @@ -18,7 +18,7 @@ - under the License. - --> - + @@ -82,6 +82,7 @@ + @@ -90,6 +91,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -141,7 +176,7 @@ - + @@ -221,6 +256,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ant build diff --git a/java/common/build.xml b/java/common/build.xml index fe96f384d5..a78d6c4133 100644 --- a/java/common/build.xml +++ b/java/common/build.xml @@ -98,10 +98,15 @@ public class QpidBuildVersion + + + + + + javacchome="${module.build}"/> diff --git a/java/ivy.nexus.xml b/java/ivy.nexus.xml new file mode 100644 index 0000000000..61ae9f315b --- /dev/null +++ b/java/ivy.nexus.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/ivy.retrieve.xml b/java/ivy.retrieve.xml new file mode 100644 index 0000000000..609d773c21 --- /dev/null +++ b/java/ivy.retrieve.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/ivy.xml b/java/ivy.xml deleted file mode 100644 index cc891094a3..0000000000 --- a/java/ivy.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/ivysettings-nexus.xml b/java/ivysettings-nexus.xml deleted file mode 100644 index 1d9c393e23..0000000000 --- a/java/ivysettings-nexus.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/java/ivysettings.nexus.xml b/java/ivysettings.nexus.xml new file mode 100644 index 0000000000..03f84f9f7c --- /dev/null +++ b/java/ivysettings.nexus.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + diff --git a/java/ivysettings.retrieve.xml b/java/ivysettings.retrieve.xml new file mode 100644 index 0000000000..aead12935a --- /dev/null +++ b/java/ivysettings.retrieve.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/lib/bdbstore/README.txt b/java/lib/bdbstore/README.txt deleted file mode 100644 index 80adb199bf..0000000000 --- a/java/lib/bdbstore/README.txt +++ /dev/null @@ -1,14 +0,0 @@ -The BDB JE jar must be downloaded into this directory in order to allow the optional bdbstore module to be built against it. - -*NOTE* The BDB JE library is licensed under the Sleepycat Licence [1], which is not compatible with the Apache Lience v2.0. As a result, the BDB JE library is not distributed with the project, and the optional bdbstore module is not compiled by default. - -The jar file may be downloaded by either: - - Seperately running the following command from the qpid/java/bdbstore dir: ant download-bdb - - OR - - Adding -Ddownload-bdb=true to your regular build command - - -[1] http://www.oracle.com/technetwork/database/berkeleydb/downloads/jeoslicense-086837.html diff --git a/java/lib/bnd-0.0.384.jar b/java/lib/bnd-0.0.384.jar deleted file mode 100644 index fa5e5263f7..0000000000 Binary files a/java/lib/bnd-0.0.384.jar and /dev/null differ diff --git a/java/lib/commons-beanutils-core-1.8.3.jar b/java/lib/commons-beanutils-core-1.8.3.jar deleted file mode 100644 index 7647dc52be..0000000000 Binary files a/java/lib/commons-beanutils-core-1.8.3.jar and /dev/null differ diff --git a/java/lib/commons-cli-1.2.jar b/java/lib/commons-cli-1.2.jar deleted file mode 100644 index ce4b9fffe4..0000000000 Binary files a/java/lib/commons-cli-1.2.jar and /dev/null differ diff --git a/java/lib/commons-codec-1.6.jar b/java/lib/commons-codec-1.6.jar deleted file mode 100644 index ee1bc49aca..0000000000 Binary files a/java/lib/commons-codec-1.6.jar and /dev/null differ diff --git a/java/lib/commons-collections-3.2.1.jar b/java/lib/commons-collections-3.2.1.jar deleted file mode 100644 index c35fa1fee1..0000000000 Binary files a/java/lib/commons-collections-3.2.1.jar and /dev/null differ diff --git a/java/lib/commons-configuration-1.8.jar b/java/lib/commons-configuration-1.8.jar deleted file mode 100644 index ae9ae9969b..0000000000 Binary files a/java/lib/commons-configuration-1.8.jar and /dev/null differ diff --git a/java/lib/commons-digester-1.8.1.jar b/java/lib/commons-digester-1.8.1.jar deleted file mode 100644 index 7abda9696a..0000000000 Binary files a/java/lib/commons-digester-1.8.1.jar and /dev/null differ diff --git a/java/lib/commons-lang-2.6.jar b/java/lib/commons-lang-2.6.jar deleted file mode 100644 index 98467d3a65..0000000000 Binary files a/java/lib/commons-lang-2.6.jar and /dev/null differ diff --git a/java/lib/commons-logging-1.1.1.jar b/java/lib/commons-logging-1.1.1.jar deleted file mode 100644 index 8758a96b70..0000000000 Binary files a/java/lib/commons-logging-1.1.1.jar and /dev/null differ diff --git a/java/lib/derby-10.8.2.2.jar b/java/lib/derby-10.8.2.2.jar deleted file mode 100644 index b59555907a..0000000000 Binary files a/java/lib/derby-10.8.2.2.jar and /dev/null differ diff --git a/java/lib/geronimo-ejb_3.0_spec-1.0.1.jar b/java/lib/geronimo-ejb_3.0_spec-1.0.1.jar deleted file mode 100644 index 29087f2f46..0000000000 Binary files a/java/lib/geronimo-ejb_3.0_spec-1.0.1.jar and /dev/null differ diff --git a/java/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar b/java/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar deleted file mode 100644 index 70e7ed4a93..0000000000 Binary files a/java/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar and /dev/null differ diff --git a/java/lib/geronimo-jms_1.1_spec-1.0.jar b/java/lib/geronimo-jms_1.1_spec-1.0.jar deleted file mode 100644 index 42bf403e28..0000000000 Binary files a/java/lib/geronimo-jms_1.1_spec-1.0.jar and /dev/null differ diff --git a/java/lib/geronimo-jta_1.1_spec-1.1.1.jar b/java/lib/geronimo-jta_1.1_spec-1.1.1.jar deleted file mode 100644 index ee9963dfc8..0000000000 Binary files a/java/lib/geronimo-jta_1.1_spec-1.1.1.jar and /dev/null differ diff --git a/java/lib/geronimo-kernel-2.2.1.jar b/java/lib/geronimo-kernel-2.2.1.jar deleted file mode 100644 index 34c46c3183..0000000000 Binary files a/java/lib/geronimo-kernel-2.2.1.jar and /dev/null differ diff --git a/java/lib/geronimo-servlet_2.5_spec-1.2.jar b/java/lib/geronimo-servlet_2.5_spec-1.2.jar deleted file mode 100644 index 00a2010036..0000000000 Binary files a/java/lib/geronimo-servlet_2.5_spec-1.2.jar and /dev/null differ diff --git a/java/lib/gson-2.0.jar b/java/lib/gson-2.0.jar deleted file mode 100644 index 7b413f9570..0000000000 Binary files a/java/lib/gson-2.0.jar and /dev/null differ diff --git a/java/lib/jackson-core-asl-1.9.0.jar b/java/lib/jackson-core-asl-1.9.0.jar deleted file mode 100644 index e9456ad887..0000000000 Binary files a/java/lib/jackson-core-asl-1.9.0.jar and /dev/null differ diff --git a/java/lib/jackson-mapper-asl-1.9.0.jar b/java/lib/jackson-mapper-asl-1.9.0.jar deleted file mode 100644 index f8beebcfea..0000000000 Binary files a/java/lib/jackson-mapper-asl-1.9.0.jar and /dev/null differ diff --git a/java/lib/javacc.jar b/java/lib/javacc.jar deleted file mode 100644 index 2550727eef..0000000000 Binary files a/java/lib/javacc.jar and /dev/null differ diff --git a/java/lib/junit-3.8.1.jar b/java/lib/junit-3.8.1.jar deleted file mode 100644 index 674d71e89e..0000000000 Binary files a/java/lib/junit-3.8.1.jar and /dev/null differ diff --git a/java/lib/jython-2.5.0.jar b/java/lib/jython-2.5.0.jar deleted file mode 100644 index f8fc553ae7..0000000000 Binary files a/java/lib/jython-2.5.0.jar and /dev/null differ diff --git a/java/lib/log4j-1.2.16.jar b/java/lib/log4j-1.2.16.jar deleted file mode 100644 index 3f9d847618..0000000000 Binary files a/java/lib/log4j-1.2.16.jar and /dev/null differ diff --git a/java/lib/maven-ant-tasks-2.1.1.jar b/java/lib/maven-ant-tasks-2.1.1.jar deleted file mode 100644 index 7810a541b8..0000000000 Binary files a/java/lib/maven-ant-tasks-2.1.1.jar and /dev/null differ diff --git a/java/lib/mockito-all-1.9.0.jar b/java/lib/mockito-all-1.9.0.jar deleted file mode 100644 index 273fd50feb..0000000000 Binary files a/java/lib/mockito-all-1.9.0.jar and /dev/null differ diff --git a/java/lib/org.apache.felix.main-2.0.5.jar b/java/lib/org.apache.felix.main-2.0.5.jar deleted file mode 100644 index 71e5a84231..0000000000 Binary files a/java/lib/org.apache.felix.main-2.0.5.jar and /dev/null differ diff --git a/java/lib/slf4j-api-1.6.4.jar b/java/lib/slf4j-api-1.6.4.jar deleted file mode 100644 index 4d23f41d37..0000000000 Binary files a/java/lib/slf4j-api-1.6.4.jar and /dev/null differ diff --git a/java/lib/slf4j-log4j12-1.6.4.jar b/java/lib/slf4j-log4j12-1.6.4.jar deleted file mode 100644 index daa3aa1631..0000000000 Binary files a/java/lib/slf4j-log4j12-1.6.4.jar and /dev/null differ diff --git a/java/lib/xalan-2.7.0.jar b/java/lib/xalan-2.7.0.jar deleted file mode 100644 index 007be3960a..0000000000 Binary files a/java/lib/xalan-2.7.0.jar and /dev/null differ diff --git a/java/module.xml b/java/module.xml index 1aea77b488..b07a9cc35e 100644 --- a/java/module.xml +++ b/java/module.xml @@ -22,7 +22,7 @@ - + @@ -599,7 +599,7 @@ - + - + diff --git a/java/upload.xml b/java/upload.xml deleted file mode 100644 index 9f2fd6819b..0000000000 --- a/java/upload.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - Targets for uploading releases to ASF's Nexus instance - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Ivy can be leveraged either by installing it in the Ant lib dir yourself, -or by running the following command in qpid/java to place it in the -qpid/java/lib/ivy lib folder: - - ant -buildfile upload.xml download-ivy - -The publishing task should be run once the release process has otherwise -been completed and the artifacts signed. It can be performed from the -qpid/java directory with a command as follows: - - ant -buildfile upload.xml -Dnexus.user=<apache_username> -Dnexus.password=<password> - -Dmaven.artifact.dir=<path to maven repo structure from release process> - -Note: if you are behind a proxy server it is necessary to give Ant the -proxy settings by doing something like: - -export ANT_OPTS="-Dhttp.proxyHost=<host> -Dhttp.proxyPort=<port> -Dhttps.proxyHost=<host> -Dhttps.proxyPort=<port>" - - - -- cgit v1.2.1