Fixed problems with new retrotranslator plugin snapshot. Upgraded to use the new translate-project goal.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@517660 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 26 insertions, 98 deletions

diff --git a/java/client/pom.xml b/java/client/pom.xml
index 1d73e9976c..0d6b3420ee 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -169,12 +169,10 @@
                 <executions>
                     <execution>
                         <id>retro-client</id>
-                        <phase>package</phase>
                         <goals>
-                            <goal>translate</goal>
+                            <goal>translate-project</goal>
                         </goals>
                         <configuration>
-                            <!--<destdir>${project.build.directory}/retro-classes</destdir>-->
                             <destjar>${project.build.directory}/${project.build.finalName}-java14.jar</destjar>
                             <verify>${retrotranslator.verify}</verify>
                             <verifyClasspath>
@@ -184,41 +182,13 @@
                                 <element>${retrotranslator.1.4-sasl-path}</element>
                             </verifyClasspath>
                             <failonwarning>false</failonwarning>
-                            <jarfileset>
-                                <basedir>${project.build.directory}</basedir>>
-                                <includes>
-                                    <include>${project.build.finalName}.jar</include>
-                                </includes>
-                            </jarfileset>
+                            <classifier>java14</classifier>
+                            <attach>true</attach>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             
-            <!-- This identifies the backported java 1.4 jars and attaches them as jar (classified as java14) build artifacts. -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-java14.jar</file>
-                                    <type>jar</type>
-                                    <classifier>java14</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
 
         <testResources>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index e256c505d9..80e4229117 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -71,9 +71,9 @@
                 <artifactId>retrotranslator-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <id>retro-common</id>
                         <goals>
-                            <goal>translate</goal>
+                            <goal>translate-project</goal>
                         </goals>
                         <configuration>
                             <destjar>${project.build.directory}/${project.build.finalName}-java14.jar</destjar>
@@ -85,42 +85,14 @@
                                 <element>${retrotranslator.1.4-sasl-path}</element>
                             </verifyClasspath>
                             <failonwarning>false</failonwarning>
-                            <jarfileset>
-                                <basedir>${project.build.directory}</basedir>>
-                                <includes>
-                                    <include>${project.build.finalName}.jar</include>
-                                </includes>
-                            </jarfileset>
+                            <classifier>java14</classifier>
+                            <attach>true</attach>
                         </configuration>
                     </execution>
 
                 </executions>
             </plugin>
             
-            <!-- This identifies the backported java 1.4 jar and attaches it as a jar (classified as java14) build artifact. -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}-java14.jar</file>
-                                    <type>jar</type>
-                                    <classifier>java14</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 
diff --git a/java/integrationtests/pom.xml b/java/integrationtests/pom.xml
index 1231918f26..5e22cc7990 100644
--- a/java/integrationtests/pom.xml
+++ b/java/integrationtests/pom.xml
@@ -45,6 +45,13 @@
             <artifactId>qpid-client</artifactId>

         </dependency>

 

+        <dependency>

+            <groupId>uk.co.thebadgerset</groupId>

+            <artifactId>junit-toolkit</artifactId>

+            <version>0.6-SNAPSHOT</version>

+            <scope>compile</scope>

+        </dependency>

+

         <!-- JUnit is a compile and runtime dependancy for these tests, not just a test time dependency. -->

         <dependency>

             <groupId>junit</groupId>

@@ -52,6 +59,13 @@
             <scope>compile</scope>

         </dependency>

 

+        <!-- These need to be included at compile time only, for the retrotranslator verification to find them. -->

+        <dependency>

+            <groupId>net.sf.retrotranslator</groupId>

+            <artifactId>retrotranslator-runtime</artifactId>

+            <scope>provided</scope>

+        </dependency>

+

     </dependencies>

 

     <build>

@@ -67,10 +81,10 @@
                 <artifactId>retrotranslator-maven-plugin</artifactId>

                 <executions>

                     <execution>

-                        <id>retro-client</id>

+                        <id>retro-intergration-tests</id>

                         <phase>package</phase>

                         <goals>

-                            <goal>translate</goal>

+                            <goal>translate-project</goal>

                         </goals>

                         <configuration>

                             <!--<destdir>${project.build.directory}/retro-classes</destdir>-->

@@ -83,41 +97,13 @@
                                 <element>${retrotranslator.1.4-sasl-path}</element>

                             </verifyClasspath>

                             <failonwarning>false</failonwarning>

-                            <jarfileset>

-                                <basedir>${project.build.directory}</basedir>>

-                                <includes>

-                                    <include>${project.build.finalName}.jar</include>

-                                </includes>

-                            </jarfileset>

+                            <classifier>java14</classifier>

+                            <attach>true</attach>

                         </configuration>

                     </execution>

                 </executions>

             </plugin>

             

-            <!-- This identifies the backported java 1.4 jars and attaches them as jar (classified as java14) build artifacts. -->

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>attach-artifacts</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>attach-artifact</goal>

-                        </goals>

-                        <configuration>

-                            <artifacts>

-                                <artifact>

-                                    <file>${project.build.directory}/${project.build.finalName}-java14.jar</file>

-                                    <type>jar</type>

-                                    <classifier>java14</classifier>

-                                </artifact>

-                            </artifacts>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

         </plugins>

 

         <resources>

diff --git a/java/pom.xml b/java/pom.xml
index 30f6bd10fb..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-alpha-2-20070305.224908-2</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>