diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-04-21 14:20:11 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-04-21 14:20:11 +0000 |
| commit | 9f70e3f0d1304971bd92e81add63cf22d0657640 (patch) | |
| tree | 30b336bd7ea5f80264417037dcb7c985772579fa /qpid/java/pom.xml | |
| parent | 947d29b0e67b23f60f3c6a3888a468a5e24afdd4 (diff) | |
| download | qpid-python-9f70e3f0d1304971bd92e81add63cf22d0657640.tar.gz | |
QPID-5048: re-instate dependency versions after qpid parent pom removal of dependency management section.
Patch supplied by Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588885 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/pom.xml')
| -rw-r--r-- | qpid/java/pom.xml | 61 |
1 files changed, 59 insertions, 2 deletions
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index af5a3da81a..ea59239ebb 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -1,3 +1,4 @@ + <?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more @@ -132,6 +133,23 @@ </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito-version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + <build> <plugins> <plugin> @@ -169,7 +187,7 @@ </goals> <configuration> <target> - <mkdir dir="${qpid.home.qbtc.output}"/> + <mkdir dir="${qpid.home.qbtc.output}" /> </target> </configuration> </execution> @@ -291,6 +309,21 @@ </plugins> </build> + <repositories> + <!-- For the BDB JE dependency of the optional bdbstore plugin modules--> + <repository> + <id>oracle.releases</id> + <url>http://download.oracle.com/maven</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <reporting> <plugins> <plugin> @@ -591,7 +624,7 @@ <profile.broker.stopped>Exception constructed</profile.broker.stopped> <profile.broker.ready>Listening on TCP</profile.broker.ready> <profile.broker.command>${cpp-broker-dir}/qpidd -p @PORT --data-dir ${qpid.work}/@PORT -t --auth no --no-module-dir</profile.broker.command> - <profile.broker.command.windows></profile.broker.command.windows> + <profile.broker.command.windows /> <profile.test.excludes>Excludes CPPExcludes ${profile}.excludes ${profile.specific.excludes} cpp.excludes</profile.test.excludes> <profile.specific.excludes>CPPPrefetchExcludes CPPTransientExcludes</profile.specific.excludes> <profile.broker.version>v0_10</profile.broker.version> @@ -624,6 +657,30 @@ </build> </profile> + <!-- Profile to update the Apache parent pom profile of the same name to prevent source assembly at java build level.--> + <profile> + <id>apache-release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> |