Merge pull request #23697 from arjantijms/javatest_src

Adding source for the javatest artefact.
eclipse-ee4j · Nov 4, 2021 · b3d6b14 · b3d6b14
2 parents f4b4fe4 + 927608f
commit b3d6b14
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 2 deletions.
diff --git a/appserver/tests/tck/tck-download/javatest/pom.xml b/appserver/tests/tck/tck-download/javatest/pom.xml
@@ -31,6 +31,11 @@
     <packaging>pom</packaging>
     <name>TCK: Install Jakarta Authorization`s javatest</name>
 
+    <properties>
+        <project.build.downloadedSources>${project.build.directory}/downloaded-sources</project.build.downloadedSources>
+        <javatest.source.url>https://github.com/openjdk/jtharness/archive/refs/tags/jt5.0.zip</javatest.source.url>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.main.tests.tck</groupId>
@@ -48,14 +53,15 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-tsharness-tck</id>
+                        <id>unpack-authorization-tck</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}</outputDirectory>
                             <includes>authorization-tck/lib/javatest.jar</includes>
+                            <includeArtifactIds>jakarta-authorization-tck</includeArtifactIds>
                             <includeGroupIds>org.glassfish.main.tests.tck</includeGroupIds>
                             <fileMappers>
                                 <org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
@@ -64,17 +70,53 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.googlecode.maven-download-plugin</groupId>
+                <artifactId>download-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>download-javatest-src</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                        <configuration>
+                            <url>${javatest.source.url}</url>
+                            <outputDirectory>${project.build.downloadedSources}</outputDirectory>
+                            <unpack>true</unpack>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>package-sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assembly/sources.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-install-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>install-tsharness</id>
+                        <id>install-javatest</id>
                         <phase>package</phase>
                         <goals>
                             <goal>install-file</goal>
                         </goals>
                         <configuration>
                             <file>${project.build.directory}/javatest.jar</file>
+                            <sources>${project.build.directory}/javatest-sources.jar</sources>
                             <groupId>${project.groupId}</groupId>
                             <artifactId>${project.artifactId}</artifactId>
                             <version>${project.version}</version>

diff --git a/appserver/tests/tck/tck-download/javatest/src/assembly/sources.xml b/appserver/tests/tck/tck-download/javatest/src/assembly/sources.xml
@@ -0,0 +1,20 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"
+>
+    <id>sources</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.downloadedSources}/jtharness-jt5.0/src</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>