diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml index ce2046f14..a32645229 100644 --- a/.github/workflows/tck-coreprofile.yml +++ b/.github/workflows/tck-coreprofile.yml @@ -4,32 +4,6 @@ on: - cron: "0 0 * * *" workflow_dispatch: jobs: - annotations: - if: github.repository == 'piranhacloud/piranha' - runs-on: ${{ matrix.os }} - strategy: - matrix: - java: [ '21' ] - os: [ubuntu-latest] - steps: - - name: Checkout Sources - uses: actions/checkout@v4 - - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - - name: Setup for TCK - run: mvn -B -DskipTests=true -ntp install - - name: Run TCK - run: | - cd external/coreprofile-tck/annotations - mvn -B -ntp verify - - name: Test Summary - uses: test-summary/action@v2 - with: - paths: "external/coreprofile-tck/annotations/runner/target/failsafe-reports/*IT.xml" - if: always() cdi: if: github.repository == 'piranhacloud/piranha' runs-on: ${{ matrix.os }} diff --git a/.github/workflows/tck-servlet.yml b/.github/workflows/tck-servlet.yml index d057c54a9..f67a51f3a 100644 --- a/.github/workflows/tck-servlet.yml +++ b/.github/workflows/tck-servlet.yml @@ -10,6 +10,7 @@ on: required: true jobs: expression: + if: github.repository == 'piranhacloud/piranha' runs-on: ${{ matrix.os }} strategy: matrix: @@ -28,6 +29,7 @@ jobs: - name: Run TCK run: mvn -amd -B -P external -pl external/servlet-tck/expression verify pages: + if: github.repository == 'piranhacloud/piranha' runs-on: ${{ matrix.os }} strategy: matrix: @@ -46,6 +48,7 @@ jobs: - name: Run TCK run: mvn -amd -B -P external -pl external/servlet-tck/pages verify servlet: + if: github.repository == 'piranhacloud/piranha' runs-on: ${{ matrix.os }} strategy: matrix: diff --git a/SECURITY.md b/SECURITY.md index 70d3dea96..f0eef9c18 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,5 +2,5 @@ ## Reporting a Vulnerability -Please email security-issue@piranha.cloud describing the issue +Please email infor@piranha.cloud describing the issue (preferably with a reproducer and/or a fix) diff --git a/VERSIONS.md b/VERSIONS.md deleted file mode 100644 index 85b56b123..000000000 --- a/VERSIONS.md +++ /dev/null @@ -1,49 +0,0 @@ -# Versions - -The table below lists all the versions of the 3rd party components that are -used by Piranha to deliver various bits and pieces of functionality. - -| Name | Version | CP | WP | S | -|---------------------------|---------------|-----|-----|-----| -| Apache Commons FileUpload | 2.0.0-M2 | | | | -| Apache Commons IO | 2.15.1 | | | | -| Arquillian | 1.8.0.Final | | | | -| Eclipse Angus Activation | 2.0.2 | | | | -| Eclipse Angus Mail | 2.0.3 | | | | -| Eclipse Epicyro | 3.1.0 | | | | -| Eclipse Exousia | 3.0.0-M1.1 | | | | -| Eclipse Grizzly | 4.1.0-M1 | | | | -| Eclipse Grizzly NPN | 2.0.0 | | | | -| Eclipse JAXB | 4.0.5 | | | | -| Eclipse JSTL | 3.0.2 | | X | X | -| Eclipse Soteria | 4.0.0-M3 | | | | -| EclipseLink | 5.0.0-B02 | | | | -| Expressly | 6.0.0-M2 | | X | X | -| Hazelcast | 5.4.0 | | | | -| Jakarta Annotations | 3.0.0 | X | X | | -| Jakarta CDI | 4.1.0 | X | X | | -| Jakarta EL | | | | | -| Jakarta Faces | 4.1.0 | | X | | -| Jakarta Inject | 2.0.1 | X | X | | -| Jakarta Interceptors | 2.2.0 | X | | -| Jakarta JSON Binding | 3.0.1 | X | X | | -| Jakarta JSON Processing | 2.1.3 | X | X | | -| Jakarta REST | 4.0.0 | X | X | | -| Jakarta Servlet | 6.1.0 | X | X | | -| Jersey | 4.0.0-M1 | X | X | | -| Mojarra | 4.1.1 | | X | | -| Netty | 4.1.112.Final | | | | -| OmniFaces Services | 0.4 | | | | -| OmniFish OmniBeans | 0.3 | | | | -| OmniFish Transact | 1.0.1 | | | | -| Parsson | 1.1.7 | X | X | | -| Project CRaC | 0.1.3 | | | | -| Spring Boot | 3.3.0 | | | | -| Tyrus | 2.2.0-M1 | | X | X | -| Undertow | 2.3.14.Final | | | | -| Weld | 6.0.0.Beta4 | X | X | | -| Yasson | 3.0.4 | X | X | | - -CP = Piranha Core Profile -WP = Piranha Web Profile -S = Piranha Servlet \ No newline at end of file diff --git a/external/coreprofile-tck/annotations/installer/pom.xml b/external/coreprofile-tck/annotations/installer/pom.xml deleted file mode 100644 index 16789c469..000000000 --- a/external/coreprofile-tck/annotations/installer/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - - cloud.piranha.external.coreprofiletck.annotations - project - 25.1.0-SNAPSHOT - - - piranha-external-coreprofiletck-annotations-installer - pom - - Piranha - External - Core Profile TCK - Annotations - Installer - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - pre-integration-test - pre-integration-test - - run - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - true - - - - - diff --git a/external/coreprofile-tck/annotations/pom.xml b/external/coreprofile-tck/annotations/pom.xml deleted file mode 100644 index c0186896a..000000000 --- a/external/coreprofile-tck/annotations/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - 4.0.0 - - - cloud.piranha.external.coreprofiletck - project - 25.1.0-SNAPSHOT - - - cloud.piranha.external.coreprofiletck.annotations - project - pom - - Piranha - External - Core Profile TCK - Annotations - Project - - - installer - runner - - - - - - cloud.piranha - bom - ${project.version} - pom - import - - - jakarta.tck - sigtest-maven-plugin - ${sigtest-maven-plugin.version} - - - jakarta.annotation - jakarta-annotations-tck - ${annotations.tck.version} - - - - diff --git a/external/coreprofile-tck/annotations/runner/pom.xml b/external/coreprofile-tck/annotations/runner/pom.xml deleted file mode 100644 index 5537943c9..000000000 --- a/external/coreprofile-tck/annotations/runner/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - 4.0.0 - - - cloud.piranha.external.coreprofiletck.annotations - project - 25.1.0-SNAPSHOT - - - piranha-external-coreprofiletck-annotations-runner - pom - - Piranha - External - Core Profile TCK - Annotations - Runner - - - ${project.build.directory}/jimage - - - - cloud.piranha.external.coreprofiletck.annotations - piranha-external-coreprofiletck-annotations-installer - ${project.version} - pom - - - jakarta.annotation - jakarta-annotations-tck - test - - - jakarta.tck - sigtest-maven-plugin - test - - - org.junit.jupiter - junit-jupiter - test - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - pre-integration-test - pre-integration-test - - copy - - - - - - jakarta.annotation - jakarta.annotation-api - ${project.build.directory} - jakarta.annotation-api.jar - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - sig-test - - integration-test - verify - - - jakarta.annotation:jakarta-annotations-tck - - ${jimage.dir} - ${project.build.directory}/jakarta.annotation-api.jar:${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml index 73782f6be..07efe8f31 100644 --- a/external/coreprofile-tck/pom.xml +++ b/external/coreprofile-tck/pom.xml @@ -24,7 +24,6 @@ 2.2 - annotations inject jsonb jsonp