diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-06-18 16:29:49 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-06-18 16:29:49 +0000 |
| commit | 8c8ee073330c02ba451a7a1a57e7da7110e4d8c0 (patch) | |
| tree | 20e532eda49d3f4cf2f1d03f3c9acd5edc82673c /qpid/java/pom.xml | |
| parent | 0d9d78668b2d0ee22d3fcc0817d56645c9b1910a (diff) | |
| download | qpid-python-8c8ee073330c02ba451a7a1a57e7da7110e4d8c0.tar.gz | |
Merged revisions 539476-539480,539482-539483,539485-539500,539502-539593,539595-539782,539784-539787,539789-540106,540108-540168,540170-540510,540512-541246,541248-541919,541921-542483,542485-542788,542790-543495,543497-544108,544110-544421,544423-544507,544509-546095,546097-546189,546191-546440,546442-546457,546459-547177,547179-547626,547628-548381 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
........
r539476 | ritchiem | 2007-05-18 15:12:28 +0100 (Fri, 18 May 2007) | 1 line
QPID-401 Update to pom to correctly set the broker.dir
........
r544866 | rupertlssmith | 2007-06-06 16:25:02 +0100 (Wed, 06 Jun 2007) | 1 line
Updated examples to build source jar. Also put the java14 retrotranslated module back in now that the strange repeating build problem is solved.
........
r545146 | ritchiem | 2007-06-07 12:30:01 +0100 (Thu, 07 Jun 2007) | 1 line
POM update renumbering tests now we have trimmed down the tests being run.
........
r548276 | ritchiem | 2007-06-18 10:59:32 +0100 (Mon, 18 Jun 2007) | 1 line
Various License header updates.
........
r548279 | ritchiem | 2007-06-18 11:17:20 +0100 (Mon, 18 Jun 2007) | 1 line
Various License header updates.
........
r548302 | ritchiem | 2007-06-18 11:49:50 +0100 (Mon, 18 Jun 2007) | 2 lines
Various License header updates.
Update to PrincipalDatabase's to ensure they work correctly with # comments.
........
r548308 | ritchiem | 2007-06-18 11:58:38 +0100 (Mon, 18 Jun 2007) | 1 line
Various License header updates, missed this file. Though the first update of it via the JMX console will remove the license.
........
r548312 | rupertlssmith | 2007-06-18 12:03:09 +0100 (Mon, 18 Jun 2007) | 1 line
Added SLF4J to Log4J binding.
........
r548315 | ritchiem | 2007-06-18 12:07:45 +0100 (Mon, 18 Jun 2007) | 1 line
Old lib dir from M1
........
r548317 | ritchiem | 2007-06-18 12:13:57 +0100 (Mon, 18 Jun 2007) | 1 line
Old lib dirs from M1
........
r548319 | ritchiem | 2007-06-18 12:16:25 +0100 (Mon, 18 Jun 2007) | 1 line
Mistakenly checked in Intelij file
........
r548381 | ritchiem | 2007-06-18 16:37:41 +0100 (Mon, 18 Jun 2007) | 1 line
QPID-525 Memory leak in DestWildExchange. Used routing key in remove rather than empty queue
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@548400 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/pom.xml')
| -rw-r--r-- | qpid/java/pom.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index a8dbce30a1..c86206d90e 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -156,9 +156,7 @@ under the License. <module>integrationtests</module> <module>management/eclipse-plugin</module> <module>client/example</module> - - <!-- Commented out for the moment, some wacky dependency stuff going on here that needs a better solution. --> - <!--<module>client-java14</module>--> + <module>client-java14</module> </modules> |