From 9bac85e36d60df28fb6f86e3bbe9e3f46689aa04 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Wed, 27 Jun 2007 15:49:51 +0000
Subject: Merged revisions 550748-551121 via svnmerge from
 https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r550748 | ritchiem | 2007-06-26 10:20:17 +0100 (Tue, 26 Jun 2007) | 1 line

  Added xml file for logging during sustained tests
........
  r550773 | rupertlssmith | 2007-06-26 12:03:04 +0100 (Tue, 26 Jun 2007) | 1 line

  Immediate and mandatory flag tests added.
........
  r550849 | rupertlssmith | 2007-06-26 17:43:58 +0100 (Tue, 26 Jun 2007) | 1 line

  QPID-509 Mandatory messages not returned outside a transaction. They are now.
........
  r551117 | ritchiem | 2007-06-27 11:51:34 +0100 (Wed, 27 Jun 2007) | 2 lines

  Update to the sustained test to ensure late joining occurs correctly and improved stabilisation. Additional system properties now documented on wiki.
  http://cwiki.apache.org/qpid/sustained-tests.html
........
  r551118 | ritchiem | 2007-06-27 11:51:51 +0100 (Wed, 27 Jun 2007) | 1 line

  Added intelij files to ignore list
........
  r551119 | ritchiem | 2007-06-27 11:55:34 +0100 (Wed, 27 Jun 2007) | 1 line

  POM update to add Apache content to built jars
........
  r551120 | ritchiem | 2007-06-27 11:58:25 +0100 (Wed, 27 Jun 2007) | 1 line

  Updated default guest password as it was not correct.
........
  r551121 | ritchiem | 2007-06-27 12:00:48 +0100 (Wed, 27 Jun 2007) | 1 line

  Added additional information to log message when available to aid the explination of a failed connection
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551207 13f79535-47bb-0310-9956-ffa450edef68
---
 java/pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'java/pom.xml')

diff --git a/java/pom.xml b/java/pom.xml
index 2e1a792c49..cf39e43ecc 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -391,6 +391,29 @@ under the License.
                     <version>0.5</version>
                 </plugin>
 
+         <plugin>
+               <artifactId>maven-remote-resources-plugin</artifactId>
+               <version>1.0-alpha-5</version>
+               <executions>
+                   <execution>
+                       <goals>
+                           <goal>process</goal>
+                       </goals>
+                       <configuration>
+                           <resourceBundles>
+                               <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+                               <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+                           </resourceBundles>
+                           <properties>
+                               <addLicense>true</addLicense>
+                               <projectName>Apache Qpid</projectName>
+                           </properties>
+                       </configuration>
+                   </execution>
+               </executions>
+           </plugin>
+
+
             </plugins>
         </pluginManagement>
 
-- 
cgit v1.2.1