diff options
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 188 |
1 files changed, 99 insertions, 89 deletions
diff --git a/java/pom.xml b/java/pom.xml index 41b0b97674..0b7ecba55b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and 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"> @@ -49,9 +49,9 @@ <!-- Qpid has a Wiki site, maven generated site not used. This is just so that it can be created locally for viewing the reports. --> <site> - <id>Qpid_Site</id> - <name>Qpid Site</name> - <url>file:/temp</url> + <id>Qpid_Site</id> + <name>Qpid Site</name> + <url>file:/temp</url> </site> </distributionManagement> @@ -98,9 +98,9 @@ <compile.flags>-Xlint:fallthrough,finally</compile.flags> <!-- - This should always point to a default minimal log4j configuration that all developers are happy with as a useable default. To use your own - log4j preferences set up an alternative in your settings.xml and avoid corrupting the default with private preferences. - --> + This should always point to a default minimal log4j configuration that all developers are happy with as a useable default. To use your own + log4j preferences set up an alternative in your settings.xml and avoid corrupting the default with private preferences. + --> <!--<log4j.configuration>file:/${topDirectoryLocation}/etc/log4j.xml</log4j.configuration>--> <amqj.logging.level>warn</amqj.logging.level> <!-- This is referenced in the default log4j.xml --> @@ -121,16 +121,17 @@ <site.version>2.0-beta-5</site.version> <surefire-report.version>2.1-SNAPSHOT</surefire-report.version> <surefire.version>2.2</surefire.version> - <retrotranslator.plugin.version>1.0-alpha-1</retrotranslator.plugin.version> - <build-helper.plugin.version>1.0</build-helper.plugin.version> + <retrotranslator.plugin.version>1.0-SNAPSHOT</retrotranslator.plugin.version> + <build-helper.plugin.version>1.0</build-helper.plugin.version> <eclipse.workspace.dir>${basedir}/${topDirectoryLocation}/../workspace</eclipse.workspace.dir> <clover.license.pathname>/set/clover/license/path/here</clover.license.pathname> - <!-- Override these in local settings.xml to perform verification. Cannot make assumptions about 1.4 Jdk location to turn this on by default. --> - <retrotranslator.verify>false</retrotranslator.verify> + <!-- Override these in local settings.xml to perform verification. Cannot make assumptions about 1.4 Jdk location to turn this on by default. --> + <retrotranslator.verify>false</retrotranslator.verify> <retrotranslator.1.4-rt-path>pathto/rt.jar</retrotranslator.1.4-rt-path> <retrotranslator.1.4-jce-path>pathto/jce.jar</retrotranslator.1.4-jce-path> <retrotranslator.1.4-jsse-path>pathto/jsse.jar</retrotranslator.1.4-jsse-path> + <retrotranslator.1.4-sasl-path>pathto/sasl.jar</retrotranslator.1.4-sasl-path> </properties> @@ -213,49 +214,49 @@ <executions> - <!-- This Ant task writes the module name, version and the Subversion version information out to a properties file. - The svnversion command must be available to run from the command line for this to work. The build will not fail if - svnversion cannot be run though. - This is done during the 'compile' phase to reflect the version of the currently compiled code and to ensure that - these properties are up to date when running from a file system classpath. Consider moving this to, or running a second - time, during the 'package' phase to capture the version of any resources added to jar files. - This svnversion command is always run in the top directory to accurately reflect the svnversion range accross all modules - at the time of the build. - The properties are placed into a file 'qpidversion.properties' in the target/classes directory of any child module - that runs this plugin. - The 'qpidversion.properties' file is loaded by the org.apache.qpid.common.QpidProperties class. - Be carefull of the possibility that the 'common' module may run this antrun plugin and recieve its own set of - qpidversion.properties and then the client or broker being built against an older version of the common library ending - up with the wrong version information. This is unlikely to happen because the client or broker should pick up its own - properties from the classpath first. If this happens it will be obvious because the productName property will be - 'Qpid Common Utilities'. If this is a problem then push this ant task down into the client and broker poms and remove it - from here. - --> - <execution> - <id>version_properties</id> - <phase>compile</phase> - <configuration> - <tasks> - - <exec executable="svnversion" spawn="false" failifexecutionfails="false" - dir="${topDirectoryLocation}" outputproperty="svnversion"> - <arg line="."/> - </exec> - - <!-- Write the version.properties out. --> - <propertyfile file="target/classes/qpidversion.properties"> - <entry key="qpid.svnversion" value="${svnversion}"/> - <entry key="qpid.name" value="${project.name}"/> - <entry key="qpid.version" value="${project.version}"/> - </propertyfile> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> + <!-- This Ant task writes the module name, version and the Subversion version information out to a properties file. + The svnversion command must be available to run from the command line for this to work. The build will not fail if + svnversion cannot be run though. + This is done during the 'compile' phase to reflect the version of the currently compiled code and to ensure that + these properties are up to date when running from a file system classpath. Consider moving this to, or running a second + time, during the 'package' phase to capture the version of any resources added to jar files. + This svnversion command is always run in the top directory to accurately reflect the svnversion range accross all modules + at the time of the build. + The properties are placed into a file 'qpidversion.properties' in the target/classes directory of any child module + that runs this plugin. + The 'qpidversion.properties' file is loaded by the org.apache.qpid.common.QpidProperties class. + Be carefull of the possibility that the 'common' module may run this antrun plugin and recieve its own set of + qpidversion.properties and then the client or broker being built against an older version of the common library ending + up with the wrong version information. This is unlikely to happen because the client or broker should pick up its own + properties from the classpath first. If this happens it will be obvious because the productName property will be + 'Qpid Common Utilities'. If this is a problem then push this ant task down into the client and broker poms and remove it + from here. + --> + <execution> + <id>version_properties</id> + <phase>compile</phase> + <configuration> + <tasks> + + <exec executable="svnversion" spawn="false" failifexecutionfails="false" + dir="${topDirectoryLocation}" outputproperty="svnversion"> + <arg line="."/> + </exec> + + <!-- Write the version.properties out. --> + <propertyfile file="target/classes/qpidversion.properties"> + <entry key="qpid.svnversion" value="${svnversion}"/> + <entry key="qpid.name" value="${project.name}"/> + <entry key="qpid.version" value="${project.version}"/> + </propertyfile> + + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> </execution> - </executions> + </executions> </plugin> <plugin> @@ -306,16 +307,16 @@ <forkMode>${surefire.fork.mode}</forkMode> <childDelegation>false</childDelegation> <argLine>-ea</argLine> - <systemproperties> + <systemProperties> <property> <name>amqj.logging.level</name> <value>${amqj.logging.level}</value> - <!-- + </property> + <property> <name>log4j.configuration</name> <value>${log4j.configuration}</value> - --> </property> - </systemproperties> + </systemProperties> </configuration> </plugin> @@ -384,15 +385,15 @@ <dependencyManagement> <dependencies> - <!-- Comile time only dependencies. --> - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-runtime</artifactId> - <version>1.0.8</version> - <scope>provided</scope> - </dependency> + <!-- Comile time only dependencies. --> + <dependency> + <groupId>net.sf.retrotranslator</groupId> + <artifactId>retrotranslator-runtime</artifactId> + <version>1.2.1</version> + <scope>provided</scope> + </dependency> - <!-- Compilation and run time dependecies. --> + <!-- Compilation and run time dependecies. --> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> @@ -566,14 +567,14 @@ <repositories> <!-- not picking up any snapshots at the moment - <repository> - <id>apache.snapshots</id> - <name>Apache SNAPSHOT Repository</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> + <repository> + <id>apache.snapshots</id> + <name>Apache SNAPSHOT Repository</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> --> </repositories> @@ -586,6 +587,15 @@ <enabled>true</enabled> </snapshots> </pluginRepository> + + <pluginRepository> + <id>codehaus.snapshots</id> + <name>Codehaus SNAPSHOT Repository</name> + <url>http://snapshots.repository.codehaus.org</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> </pluginRepositories> <profiles> |