Skip to content

Commit

Permalink
update tck, fix sig tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
@lukasj
lukasj committed Feb 29, 2024
1 parent c54d543 commit 20d6589
Show file tree
Hide file tree
Showing 6 changed files with 332 additions and 308 deletions.
87 changes: 40 additions & 47 deletions tck/docs/tck-runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>jakarta</groupId>
<artifactId>glassfish.annotations-tck</artifactId>
<version>11.0.0</version>

<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-tck-impl</artifactId>
<version>3.0.0</version>
<packaging>jar</packaging>

<properties>
<glassfish.container.version>8.0.0-M1</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<tck.artifactId>jakarta-annotations-tck</tck.artifactId>
<tck.version>3.0.0</tck.version>
<jimage.dir>${project.build.directory}/jdk-bundle</jimage.dir>
</properties>

<dependencyManagement>
Expand All @@ -39,33 +40,54 @@
<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>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<groupId>jakarta.annotation</groupId>
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>2.1</version>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.2.5</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>unpack</id>
Expand All @@ -76,7 +98,7 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakartatck</groupId>
<groupId>jakarta.annotation</groupId>
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
<type>zip</type>
Expand All @@ -86,16 +108,8 @@
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>unpack</id>
<id>unpack-server</id>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -116,30 +130,9 @@
</executions>
</plugin>

<!-- <plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.5</version>
<configuration>
<sigfile>target/annotations-tck/jakarta.annotation.sig</sigfile>
<packages>jakarta.annotation,jakarta.annotation.security,jakarta.annotation.sql,akarta.annotation.Generated,jakarta.annotation.ManagedBean,jakarta.annotation.PostConstruct,jakarta.annotation.PreDestroy,jakarta.annotation.Priority,jakarta.annotation.Resource,jakarta.annotation.Resource$AuthenticationType,jakarta.annotation.Resources,jakarta.annotation.security.DeclareRoles,jakarta.annotation.security.DenyAll,jakarta.annotation.security.PermitAll,jakarta.annotation.security.RolesAllowed,jakarta.annotation.security.RunAs,jakarta.annotation.sql.DataSourceDefinition,jakarta.annotation.sql.DataSourceDefinitions</packages>
<classes>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.annotation-api.jar</classes>
<report>target/sig-report.txt</report>
</configuration>
<executions>
<execution>
<id>sigtest</id>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin> -->

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<executions>
<execution>
<id>sig-test</id>
Expand All @@ -148,10 +141,10 @@
<goal>verify</goal>
</goals>
<configuration>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<dependenciesToScan>jakarta.annotation:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
<sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.annotation-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</sigTestClasspath>
<jimage.dir>${jimage.dir}</jimage.dir>
<sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/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>
Expand Down
Loading

0 comments on commit 20d6589

Please sign in to comment.