Skip to content

Commit

Permalink
Fixes #4098 - Update Jakarta Annotations TCK to 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnriem
mnriem committed Oct 22, 2024
1 parent 5e9d4c7 commit d73ee73
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 46 deletions.
116 changes: 71 additions & 45 deletions external/coreprofile-tck/annotations/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
<name>Piranha Core Profile - Annotations TCK</name>

<properties>
<ant.home>${project.build.directory}/ant</ant.home>
<annotations.tck.version>3.0.0</annotations.tck.version>
<jimage.dir>${project.build.directory}/jimage</jimage.dir>
<signature.home>${project.build.directory}/signature</signature.home>
<tck.home>${project.build.directory}/tck</tck.home>
<test.home>${tck.home}/src/com/sun/ts/tests</test.home>
</properties>

<dependencyManagement>
Expand All @@ -30,9 +29,32 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta-annotations-tck</artifactId>
<version>${annotations.tck.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta-annotations-tck</artifactId>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
Expand All @@ -48,49 +70,20 @@
<configuration>
<target>
<!-- Download, unzip and rename TCK -->
<get src="https://download.eclipse.org/jakartaee/annotations/2.1/jakarta-annotations-tck-${annotations.tck.version}.zip"
dest="${project.build.directory}/tck.zip"
skipexisting="true"/>
<get src="https://download.eclipse.org/jakartaee/annotations/3.0/jakarta-annotations-tck-${annotations.tck.version}.zip"
dest="${project.build.directory}/tck.zip"
skipexisting="true"/>
<unzip src="${project.build.directory}/tck.zip"
dest="${project.build.directory}"/>
dest="${project.build.directory}"/>
<move file="${project.build.directory}/annotations-tck"
tofile="${project.build.directory}/tck"/>

<!-- Download, unzip, rename and chmod Ant 1.10.9 -->
<get src="https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.zip"
dest="${project.build.directory}/ant.zip" skipexisting="true"/>
<unzip src="${project.build.directory}/ant.zip"
dest="${project.build.directory}"/>
<move file="${project.build.directory}/apache-ant-1.10.9"
tofile="${project.build.directory}/ant"/>
<chmod dir="${ant.home}/bin"
perm="ugo+rx"
includes="*"/>

<!-- Setup ts.jte for signature tests -->
<replaceregexp file="${tck.home}/bin/ts.jte"
match="local\.classes=(.*)"
replace="local\.classes=${signature.home}/jakarta.annotation-api.jar"
byline="true"/>
</target>
</configuration>
</execution>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Run all the tests -->
<exec dir="${test.home}"
executable="${ant.home}/bin/ant"
failonerror="true">
<arg value="-Dwork.dir=${tck.home}/work"/>
<arg value="-Dreport.dir=${tck.home}/report"/>
<arg value="runclient"/>
</exec>
tofile="${project.build.directory}/tck"/>

<!-- Install the TCK artifacts into local Maven repository -->
<chmod dir="${project.build.directory}/tck/artifacts"
perm="ugo+rx"
includes="*"/>
<exec dir="${project.build.directory}/tck/artifacts"
executable="./artifact-install.sh"/>
</target>
</configuration>
</execution>
Expand Down Expand Up @@ -119,6 +112,39 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<id>sig-test</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<dependenciesToScan>jakarta.annotation:jakarta-annotations-tck</dependenciesToScan>
<systemPropertyVariables>
<jimage.dir>${jimage.dir}</jimage.dir>
<sigTestClasspath>${signature.home}/jakarta.annotation-api.jar:${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming</sigTestClasspath>
<ca.sig.generated>true</ca.sig.generated>
<ca.sig.postconstruct>true</ca.sig.postconstruct>
<ca.sig.priority>true</ca.sig.priority>
<ca.sig.predestroy>true</ca.sig.predestroy>
<ca.sig.resource>true</ca.sig.resource>
<ca.sig.resources>true</ca.sig.resources>
<ca.sig.securitydeclareroles>true</ca.sig.securitydeclareroles>
<ca.sig.securitydenyall>true</ca.sig.securitydenyall>
<ca.sig.securitypermitall>true</ca.sig.securitypermitall>
<ca.sig.securityrolesallowed>true</ca.sig.securityrolesallowed>
<ca.sig.securityrunas>true</ca.sig.securityrunas>
<ca.sig.sqldatasourcedefinition>true</ca.sig.sqldatasourcedefinition>
<ca.sig.sqldatasourcedefinitions>true</ca.sig.sqldatasourcedefinitions>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion external/coreprofile-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

<properties>
<!-- TCK versions -->
<annotations.tck.version>2.1.1</annotations.tck.version>
<cdi.tck.version>4.0.13</cdi.tck.version>
<coreprofile.tck.version>10.0.3</coreprofile.tck.version>
<inject.tck.version>2.0.2</inject.tck.version>
Expand Down

0 comments on commit d73ee73

Please sign in to comment.