Author: rgreig
Date: Wed Mar 7 03:25:26 2007
New Revision: 515535
URL: http://svn.apache.org/viewvc?view=rev&rev=515535
Log:
(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.
Modified:
incubator/qpid/trunk/qpid/java/client-java14/pom.xml
incubator/qpid/trunk/qpid/java/client/pom.xml
incubator/qpid/trunk/qpid/java/common/pom.xml
incubator/qpid/trunk/qpid/java/integrationtests/pom.xml
incubator/qpid/trunk/qpid/java/pom.xml
Modified: incubator/qpid/trunk/qpid/java/client-java14/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client-java14/pom.xml?view=diff&rev=515535&r1=515534&r2=515535
==============================================================================
--- incubator/qpid/trunk/qpid/java/client-java14/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/client-java14/pom.xml Wed Mar 7 03:25:26
2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/pom.xml?view=diff&rev=515535&r1=515534&r2=515535
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/pom.xml Wed Mar 7 03:25:26 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/pom.xml?view=diff&rev=515535&r1=515534&r2=515535
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/pom.xml Wed Mar 7 03:25:26 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/integrationtests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/integrationtests/pom.xml?view=diff&rev=515535&r1=515534&r2=515535
==============================================================================
--- incubator/qpid/trunk/qpid/java/integrationtests/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/integrationtests/pom.xml Wed Mar 7 03:25:26
2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?view=diff&rev=515535&r1=515534&r2=515535
==============================================================================
--- incubator/qpid/trunk/qpid/java/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/pom.xml Wed Mar 7 03:25:26 2007
@@ -121,7 +121,7 @@
<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>
