move readme to the top level, remove unneeded step from the runner
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/tck/docs/tck-runner/README b/tck/docs/tck-runner/README
deleted file mode 100644
index 2f96ab3..0000000
--- a/tck/docs/tck-runner/README
+++ /dev/null
@@ -1,23 +0,0 @@
-//TODO: Update this file for any incomplete/incorrect information
-
-The pom.xml in this folder can be used to run the Jakarta Annotations Standalone TCK
-against Glassfish 8.0.0
-
-
-Below are the instructions to run the Jakarta Annotations TCK
-
-1. Install Java17+ , set JAVA_HOME
-2. Install Maven 3.6+ set M2_HOME
-3. SET PATH : add M2_HOME/bin, JAVA_HOME/bin
-eg: export PATH=$ANT_HOME/bin:$M2_HOME/bin:$JAVA_HOME/bin:
-
-4. Install the tck jar jakarta-annotations-tck-<version>.jar available at artifacts folder in \
-jakarta-annotations-tck-<version>.zip using below mvn install command:
-`mvn install:install-file -DcreateChecksum=true -Dpackaging=jar
--Dfile=jakarta-annotations-tck-<version>.jar -DgroupId=jakarta.tck
--DartifactId=jakarta-annotations-tck -Dversion=<version>`
-
-
-5. Use the sample tck-runner/pom.xml available in the annotations-tck/,
-to run the test with Glassfish, verify the system properties set.
-Run `mvn clean verify` from the current directory.
diff --git a/tck/docs/tck-runner/pom.xml b/tck/docs/tck-runner/pom.xml
index aec2eaa..eb096bf 100644
--- a/tck/docs/tck-runner/pom.xml
+++ b/tck/docs/tck-runner/pom.xml
@@ -96,25 +96,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack</id>
- <goals>
- <goal>unpack</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>jakarta.annotation</groupId>
- <artifactId>${tck.artifactId}</artifactId>
- <version>${tck.version}</version>
- <type>zip</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
<id>unpack-server</id>
<goals>
<goal>unpack</goal>
diff --git a/tck/src/main/assembly/assembly.xml b/tck/src/main/assembly/assembly.xml
index 96b8506..dee4f7e 100644
--- a/tck/src/main/assembly/assembly.xml
+++ b/tck/src/main/assembly/assembly.xml
@@ -31,10 +31,6 @@
<source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source>
<destName>LICENSE.md</destName>
</file>
- <file>
- <source>${project.basedir}/src/main/resources/jakarta.annotation.sig_3.0</source>
- <destName>jakarta.annotation.sig_3.0</destName>
- </file>
</files>
<fileSets>
<fileSet>
@@ -78,11 +74,8 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/src/main/artifacts</directory>
- <outputDirectory>artifacts</outputDirectory>
- <includes>
- <include>**/*.sh</include>
- </includes>
+ <directory>${project.basedir}/src/main/dist</directory>
+ <outputDirectory>.</outputDirectory>
<filtered>false</filtered>
</fileSet>
</fileSets>
diff --git a/tck/src/main/dist/README b/tck/src/main/dist/README
new file mode 100644
index 0000000..fb429f7
--- /dev/null
+++ b/tck/src/main/dist/README
@@ -0,0 +1,23 @@
+The pom.xml in this folder can be used to run the Jakarta Annotations Standalone TCK
+against Glassfish 8.0.0
+
+
+Below are the instructions to run the Jakarta Annotations TCK
+
+1. Install Java17+ , set JAVA_HOME
+
+2. Install Maven 3.6+ set M2_HOME
+
+3. set environment variables:
+ SET PATH : add M2_HOME/bin, JAVA_HOME/bin
+eg: export PATH=$M2_HOME/bin:$JAVA_HOME/bin:$PATH
+ SET ANNOTATIONS_TCK_HOME : root folder of the TCK installation
+eg: export ANNOTATIONS_TCK_HOME=.
+
+4. Install the tck jar jakarta-annotations-tck-<version>.jar available
+ in the annotations-tck/artifacts folder using artifact-install.sh script
+eg: cd $ANNOTATIONS_TCK_HOME/artifacts && ./artifact-install.sh
+
+5. Use the sample pom.xml available in the annotations-tck/tck-runner,
+to run the test with Glassfish, verify the system properties set.
+eg: `mvn clean verify -f $$ANNOTATIONS_TCK_HOME/tck-runner/pom.xml`
diff --git a/tck/src/main/artifacts/artifact-install.sh b/tck/src/main/dist/artifacts/artifact-install.sh
similarity index 100%
rename from tck/src/main/artifacts/artifact-install.sh
rename to tck/src/main/dist/artifacts/artifact-install.sh
