Updated examples to build source jar. Also put the java14 retrotranslated module back in now that the strange repeating build problem is solved.

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

4 files changed, 72 insertions, 6 deletions

diff --git a/java/client-java14/pom.xml b/java/client-java14/pom.xml
index 17d76ea685..90a49e7d6c 100644
--- a/java/client-java14/pom.xml
+++ b/java/client-java14/pom.xml
@@ -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>

diff --git a/java/client/example/pom.xml b/java/client/example/pom.xml
index ac0081c00b..70f02dbb98 100644
--- a/java/client/example/pom.xml
+++ b/java/client/example/pom.xml
@@ -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>
diff --git a/java/client/example/source-jar.xml b/java/client/example/source-jar.xml
new file mode 100644
index 0000000000..f2aa6d6e6c
--- /dev/null
+++ b/java/client/example/source-jar.xml
@@ -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>

diff --git a/java/pom.xml b/java/pom.xml
index d5b81a1db7..71ab9218d9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -145,9 +145,7 @@ under the License.
         <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>