From 4a016bad34628ed7aa0f2409b80098290cf023a6 Mon Sep 17 00:00:00 2001
From: Robert Greig <rgreig@apache.org>
Date: Wed, 7 Mar 2007 11:25:26 +0000
Subject: (Patch submitted by Rupert Smith) Updated to latest snapshot of
 retrotranslator plugin. Concrete release to be made soon from this snapshot,
 will change over to conrete version once this happens.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@515535 13f79535-47bb-0310-9956-ffa450edef68
---
 java/client-java14/pom.xml    |  8 ++++++--
 java/client/pom.xml           | 12 ++++++------
 java/common/pom.xml           | 12 ++++++------
 java/integrationtests/pom.xml | 15 ++++++++-------
 java/pom.xml                  |  2 +-
 5 files changed, 27 insertions(+), 22 deletions(-)

(limited to 'java')

diff --git a/java/client-java14/pom.xml b/java/client-java14/pom.xml
index 9a480b47b8..17d76ea685 100644
--- a/java/client-java14/pom.xml
+++ b/java/client-java14/pom.xml
@@ -39,13 +39,17 @@
         <java.source.version>1.4</java.source.version>
         <qpid.version>${pom.version}</qpid.version>
         <qpid.targetDir>${project.build.directory}</qpid.targetDir>
-        <qpid.root>${basedir}/..</qpid.root>
+        <!--<qpid.root>${basedir}/..</qpid.root>-->
         <sasl.properties>${basedir}/etc/sasl.properties</sasl.properties>
+
+        <!-- This is a dummy value to ensure this property exists, override in your settings.xml to your real 1.4 jdk location to run tests. -->
         <jvm.1.4.bin>path/to/java1.4</jvm.1.4.bin>
     </properties>
 
     <dependencies>
 
+        <!-- These dependencies have to be re-declared here, because exluding the normal (non 1.4) client and common from the distribution takes out
+             these transitive dependencies too. -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -192,7 +196,7 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <skip>false</skip>
+                            <skip>true</skip>
                             <forkMode>once</forkMode>
                             <jvm>${jvm.1.4.bin}</jvm>
                             <systemProperties>
diff --git a/java/client/pom.xml b/java/client/pom.xml
index abac5b3f1a..1d73e9976c 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -184,12 +184,12 @@
                                 <element>${retrotranslator.1.4-sasl-path}</element>
                             </verifyClasspath>
                             <failonwarning>false</failonwarning>
-                            <includes>
-                                <include>
-                                    <directory>${project.build.directory}</directory>
-                                    <pattern>${project.build.finalName}.jar</pattern>
-                                </include>
-                            </includes>
+                            <jarfileset>
+                                <basedir>${project.build.directory}</basedir>>
+                                <includes>
+                                    <include>${project.build.finalName}.jar</include>
+                                </includes>
+                            </jarfileset>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 5e94153346..e256c505d9 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -85,12 +85,12 @@
                                 <element>${retrotranslator.1.4-sasl-path}</element>
                             </verifyClasspath>
                             <failonwarning>false</failonwarning>
-                            <includes>
-                                <include>
-                                    <directory>${project.build.directory}</directory>
-                                    <pattern>${project.build.finalName}.jar</pattern>
-                                </include>
-                            </includes>
+                            <jarfileset>
+                                <basedir>${project.build.directory}</basedir>>
+                                <includes>
+                                    <include>${project.build.finalName}.jar</include>
+                                </includes>
+                            </jarfileset>
                         </configuration>
                     </execution>
 
diff --git a/java/integrationtests/pom.xml b/java/integrationtests/pom.xml
index 79d587f360..1231918f26 100644
--- a/java/integrationtests/pom.xml
+++ b/java/integrationtests/pom.xml
@@ -45,10 +45,11 @@
             <artifactId>qpid-client</artifactId>
         </dependency>
 
-        <!-- Test dependencies. -->
+        <!-- JUnit is a compile and runtime dependancy for these tests, not just a test time dependency. -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>compile</scope>
         </dependency>
 
     </dependencies>
@@ -82,12 +83,12 @@
                                 <element>${retrotranslator.1.4-sasl-path}</element>
                             </verifyClasspath>
                             <failonwarning>false</failonwarning>
-                            <includes>
-                                <include>
-                                    <directory>${project.build.directory}</directory>
-                                    <pattern>${project.build.finalName}.jar</pattern>
-                                </include>
-                            </includes>
+                            <jarfileset>
+                                <basedir>${project.build.directory}</basedir>>
+                                <includes>
+                                    <include>${project.build.finalName}.jar</include>
+                                </includes>
+                            </jarfileset>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/java/pom.xml b/java/pom.xml
index 8f4c44da49..de9f4ac1ad 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -121,7 +121,7 @@ under the License.
         <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-SNAPSHOT</retrotranslator.plugin.version>
+        <retrotranslator.plugin.version>1.0-alpha-2-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>
-- 
cgit v1.2.1