Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for running TCK using Java 21 #72

Merged
merged 8 commits into from
Mar 28, 2024
Merged

Add support for running TCK using Java 21 #72

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1cdba3
Try jakarta.tck sigtest
scottkurz Mar 26, 2024
70c7d3f
Broaden enforcer check to allow Java 21
scottkurz Mar 26, 2024
ddef285
Update doc to reference jakarta.tck sigtest-maven-plugin
scottkurz Mar 26, 2024
b488e7e
Generate Java 21 signature file
scottkurz Mar 26, 2024
0f3b4d1
Doc Java 21 sigtests
scottkurz Mar 26, 2024
fe516c5
Finish updating doc for Java 21
scottkurz Mar 26, 2024
96931a8
Adjust links reflecting move to jakartaee GitHub org
scottkurz Mar 26, 2024
cf15072
Clarify future sigtest maven plugin versions can be used
scottkurz Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ more.

The project maintains the following source code repositories:

https://github.com/eclipse-ee4j/batch-api
https://github.com/eclipse-ee4j/batch-tck
https://github.com/jakartaee/batch-api
https://github.com/jakartaee/batch-tck

## Eclipse Contributor Agreement

Expand Down
4 changes: 2 additions & 2 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ SPDX-License-Identifier: Apache-2.0

The project maintains the following source code repositories:

https://github.com/eclipse-ee4j/batch-api
https://github.com/eclipse-ee4j/batch-tck
https://github.com/jakartaee/batch-api
https://github.com/jakartaee/batch-tck

## Third-party Content

Expand Down
27 changes: 22 additions & 5 deletions com.ibm.jbatch.tck.sigtest.exec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2012, 2021 International Business Machines Corp. and others
Copyright 2012, 2024 International Business Machines Corp. and others

See the NOTICE file distributed with this work for additional information
regarding copyright ownership. Licensed under the Apache License,
Expand Down Expand Up @@ -39,9 +39,8 @@
<build>
<plugins>
<plugin>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>

<configuration>
<sigfile>${project.build.directory}/sigtest-copy/sigtest/sigtest-1.6-batch.standalone.tck.sig-2.1-se11-OpenJDK-J9</sigfile>
</configuration>
Expand All @@ -58,7 +57,7 @@
<build>
<plugins>
<plugin>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<configuration>
<sigfile>${project.build.directory}/sigtest-copy/sigtest/sigtest-1.6-batch.standalone.tck.sig-2.1-se17-TemurinHotSpot</sigfile>
Expand All @@ -67,6 +66,24 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk21</id>
<activation>
<activeByDefault>false</activeByDefault>
<jdk>21</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<configuration>
<sigfile>${project.build.directory}/sigtest-copy/sigtest/jakarta.sigtest-2.2-batch.standalone.tck.sig-2.1-se21-Temurin</sigfile>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
Expand Down Expand Up @@ -132,7 +149,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<executions>
<execution>
Expand Down
4 changes: 2 additions & 2 deletions ...h.tck/src/main/java/com/ibm/jbatch/tck/artifacts/cdi/DependentScopedBatchletContexts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
public class DependentScopedBatchletContexts implements Batchlet {

//
// As mentioned in issue: https://github.com/eclipse-ee4j/batch-tck/issues/49
// As mentioned in issue: https://github.com/jakartaee/batch-tck/issues/49
// the fields getting set via constructor/method parameter injection should not
// themselves be annotated with "@Inject".
//
Expand Down Expand Up @@ -79,7 +79,7 @@ public String process() throws Exception {
// Spec doesn't clearly specify precedence between exit status set into StepContext vs. exit status returned by Batchlet process().
// To avoid ambiguity, ensure the same value is used by both mechanisms.
//
// See: https://github.com/eclipse-ee4j/batch-tck/issues/49
// See: https://github.com/jakartaee/batch-tck/issues/49
//
return sm.getExitStatus();
}
Expand Down
Loading