diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml index 3040a0ee..b0f54afe 100644 --- a/tck-dist/pom.xml +++ b/tck-dist/pom.xml @@ -22,7 +22,7 @@ jakarta.enterprise.concurrent jakarta.enterprise.concurrent.parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT jakarta.enterprise.concurrent-tck-dist @@ -45,8 +45,7 @@ - 3.0.1 - ${project.version} + ${project.version} true 2.2.2 @@ -59,12 +58,12 @@ jakarta.enterprise.concurrent jakarta.enterprise.concurrent-tck - ${jakarta.concurrent.version.ga} + ${jakarta.concurrent.tck.version} jakarta.enterprise.concurrent jakarta.enterprise.concurrent.parent - ${jakarta.concurrent.version.ga} + ${jakarta.concurrent.tck.version} pom @@ -103,7 +102,7 @@ html5 - ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.version.ga}.html + ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.tck.version}.html @@ -116,7 +115,7 @@ pdf - ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.version.ga}.pdf + ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.tck.version}.pdf @@ -143,31 +142,11 @@ src/main/assembly/assembly.xml - concurrency-tck-${jakarta.concurrent.version.ga} + concurrency-tck-${jakarta.concurrent.tck.version} - diff --git a/tck-dist/src/main/asciidoc/concurrency-tck-reference-guide.adoc b/tck-dist/src/main/asciidoc/concurrency-tck-reference-guide.adoc index a16dd893..23c5f402 100644 --- a/tck-dist/src/main/asciidoc/concurrency-tck-reference-guide.adoc +++ b/tck-dist/src/main/asciidoc/concurrency-tck-reference-guide.adoc @@ -149,12 +149,12 @@ Here we use the term "suite" informally to describe groups of tests required to There are two "suites" included in the TCK. There is a "suite" for the {APIShortName} API portion of the "Jakarta EE Platform" TCK and there is a second suite for the {APIShortName} SPI portion of the "Jakarta EE Platform". -These "suites" are both represented within the single `artifacts/suite.xml` file and are identified by their package names: +These "suites" are both represented within the single `artifacts/suite.xml` file for the full profile and `artifacts/suite-web.xml` for the web profile, and are identified by their package names: 1. ee.jakarta.tck.concurrent.api.* 1. ee.jakarta.tck.concurrent.spec.* -*Note:* An implementation **MUST** run against all tests provided in the suite XML file [underline]#unmodified# for an implementation to pass the TCK. +*Note:* An implementation **MUST** run against all tests provided in the suite XML file for the given profile [underline]#unmodified# for an implementation of such profile to pass the TCK. ===== API Signature Files diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml index 52780031..d91857c7 100644 --- a/tck-dist/src/main/assembly/assembly.xml +++ b/tck-dist/src/main/assembly/assembly.xml @@ -25,7 +25,7 @@ zip - concurrency-tck-${jakarta.concurrent.version.ga} + concurrency-tck-${jakarta.concurrent.tck.version} diff --git a/tck-dist/src/main/starter/pom.xml b/tck-dist/src/main/starter/pom.xml index 512cc4df..fa3aeede 100644 --- a/tck-dist/src/main/starter/pom.xml +++ b/tck-dist/src/main/starter/pom.xml @@ -46,7 +46,10 @@ [path/to/appserver/lib] - + suite.xml diff --git a/tck-dist/src/main/starter/suite-web.xml b/tck-dist/src/main/starter/suite-web.xml new file mode 100644 index 00000000..08b74dfa --- /dev/null +++ b/tck-dist/src/main/starter/suite-web.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tck-dist/src/main/starter/suite.xml b/tck-dist/src/main/starter/suite.xml index b7b08cc1..06c5817a 100644 --- a/tck-dist/src/main/starter/suite.xml +++ b/tck-dist/src/main/starter/suite.xml @@ -17,6 +17,9 @@ --> + diff --git a/tck/pom.xml b/tck/pom.xml index 55dbbc37..3ab296ca 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -44,8 +44,7 @@ - 3.0.0 - ${project.version} + 3.0.1 1.6 @@ -53,7 +52,7 @@ jakarta.enterprise.concurrent jakarta.enterprise.concurrent-api - ${jakarta.concurrent.version.dev} + ${jakarta.concurrent.api.version} provided @@ -194,7 +193,7 @@ jakarta.enterprise.concurrent jakarta.enterprise.concurrent-api - ${jakarta.concurrent.version.ga} + ${jakarta.concurrent.api.version} jar false ${project.build.directory}/concurrency-api