Author: rupertlssmith
Date: Wed Jun 6 08:25:02 2007
New Revision: 544866
URL: http://svn.apache.org/viewvc?view=rev&rev=544866
Log:
Updated examples to build source jar. Also put the java14 retrotranslated
module back in now that the strange repeating build problem is solved.
Added:
incubator/qpid/branches/M2/java/client/example/source-jar.xml
Modified:
incubator/qpid/branches/M2/java/client-java14/pom.xml
incubator/qpid/branches/M2/java/client/example/pom.xml
incubator/qpid/branches/M2/java/pom.xml
Modified: incubator/qpid/branches/M2/java/client-java14/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client-java14/pom.xml?view=diff&rev=544866&r1=544865&r2=544866
==============================================================================
--- incubator/qpid/branches/M2/java/client-java14/pom.xml (original)
+++ incubator/qpid/branches/M2/java/client-java14/pom.xml Wed Jun 6 08:25:02
2007
@@ -149,7 +149,7 @@
<id>assembly-dist</id>
<phase>package</phase>
<goals>
- <goal>assembly</goal>
+ <goal>attached</goal>
</goals>
<configuration>
<descriptors>
@@ -167,7 +167,7 @@
<id>assembly-alltestdeps</id>
<phase>package</phase>
<goals>
- <goal>assembly</goal>
+ <goal>attached</goal>
</goals>
<configuration>
<descriptors>
Modified: incubator/qpid/branches/M2/java/client/example/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/example/pom.xml?view=diff&rev=544866&r1=544865&r2=544866
==============================================================================
--- incubator/qpid/branches/M2/java/client/example/pom.xml (original)
+++ incubator/qpid/branches/M2/java/client/example/pom.xml Wed Jun 6 08:25:02
2007
@@ -15,7 +15,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
@@ -89,6 +89,57 @@
</systemProperties>
</configuration>
</plugin>
+
+ <!-- Build a zip file with the source in it, this had to be done
with the assembly plugin as the source plugin did not provide a way
+ to exclude the .svn directories. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <configuration>
+ <descriptors>
+ <descriptor>source-jar.xml</descriptor>
+ </descriptors>
+ <outputDirectory>target</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Publish the source as a 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>target/${project.build.finalName}-source.jar</file>
+ <type>jar</type>
+ <classifier>source</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+
</plugins>
</build>
</project>
Added: incubator/qpid/branches/M2/java/client/example/source-jar.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/example/source-jar.xml?view=auto&rev=544866
==============================================================================
--- incubator/qpid/branches/M2/java/client/example/source-jar.xml (added)
+++ incubator/qpid/branches/M2/java/client/example/source-jar.xml Wed Jun 6
08:25:02 2007
@@ -0,0 +1,17 @@
+<!-- This is an assembly descriptor that produces a jar file that contains all
the
+ dependencies, fully expanded into a single jar, required to run the tests
of
+ a maven project.
+ -->
+<assembly>
+ <id>source</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/java</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: incubator/qpid/branches/M2/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/pom.xml?view=diff&rev=544866&r1=544865&r2=544866
==============================================================================
--- incubator/qpid/branches/M2/java/pom.xml (original)
+++ incubator/qpid/branches/M2/java/pom.xml Wed Jun 6 08:25:02 2007
@@ -145,9 +145,7 @@
<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>
