diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9c61004e..42b877ce 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Contributors to the Eclipse Foundation +# Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License v. 2.0 which is available at @@ -23,15 +23,21 @@ jobs: strategy: matrix: - java_version: [ 11, 17-ea ] + java_version: [ 11, 17 ] steps: + - name: Cancel previous runs of this workflow + uses: styfle/cancel-workflow-action@0.9.1 + with: + all_but_latest: true + access_token: ${{ github.token }} - name: Checkout for build - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.java_version }} + cache: 'maven' - name: Verify - run: mvn -B -V -U -C -Poss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true \ No newline at end of file + run: mvn -B -V -U -C -Poss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true -Dcopyright.ignoreyear=true \ No newline at end of file diff --git a/.gitignore b/.gitignore index 998689f0..c8dfb82e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ nbproject/ # Java noise *.class *err_pid*.log +/tck-impl/.gradle/ +/tck-impl/build/ diff --git a/bundles/dist/pom.xml b/bundles/dist/pom.xml index 4ca4b280..5ed6c6bb 100755 --- a/bundles/dist/pom.xml +++ b/bundles/dist/pom.xml @@ -1,7 +1,7 @@ + + + resources + + zip + + false + + + ${project.basedir} + legal + + LICENSE.md + NOTICE.md + + + + ${project.basedir}/etc/config + config + + * + + + + \ No newline at end of file