From e532206387b25fe44cf6f96ba65574df564f212e Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Tue, 23 May 2023 18:50:38 +0200 Subject: [PATCH] Add full Java module descriptors Closes #555 Signed-off-by: Andres Almiray --- .github/workflows/branch.yaml | 20 ++++++++++-------- .github/workflows/bump.yaml | 10 +++++---- .github/workflows/pr.yaml | 12 +++++------ amqp/pom.xml | 8 ++++++++ api/pom.xml | 9 +++++++++ benchmarks/pom.xml | 1 - bom/pom.xml | 2 +- core/pom.xml | 4 ++++ formats/json-jackson/pom.xml | 9 +++++++++ formats/protobuf/pom.xml | 5 ++++- formats/xml/pom.xml | 8 ++++++++ http/basic/pom.xml | 9 +++++++++ http/restful-ws-jakarta/pom.xml | 4 ++++ http/vertx/pom.xml | 9 +++++++++ kafka/pom.xml | 9 +++++++++ pom.xml | 36 +++++++++++++++++++++++++++++++++ sql/pom.xml | 4 ++++ 17 files changed, 138 insertions(+), 21 deletions(-) diff --git a/.github/workflows/branch.yaml b/.github/workflows/branch.yaml index 478db96c4..4779f0b8c 100644 --- a/.github/workflows/branch.yaml +++ b/.github/workflows/branch.yaml @@ -13,27 +13,31 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 8, 11, 17 ] + java: [ 11, 17, 21 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + cache: 'maven' java-version: ${{ matrix.java }} + distribution: 'temurin' - run: | - ./mvnw clean install -DskipTests -B - ./mvnw verify -B + ./mvnw -ntp -B clean install -DskipTests + ./mvnw -ntp -B verify deploy: runs-on: ubuntu-latest name: Deploy needs: test steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 8 + cache: 'maven' + java-version: 11 + distribution: 'temurin' server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml server-username: MAVEN_USERNAME # env variable for username in deploy server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml index 86ca4215b..f0b90dfea 100644 --- a/.github/workflows/bump.yaml +++ b/.github/workflows/bump.yaml @@ -13,13 +13,15 @@ jobs: env: NEW_VERSION: ${{ github.event.inputs.version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 8 + cache: 'maven' + java-version: 11 + distribution: 'temurin' - name: Bump version using Maven - run: './mvnw versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -B' + run: './mvnw -ntp -B versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false' - name: Bump version in docs if: ${{ !endsWith(github.event.inputs.version, 'SNAPSHOT') }} run: 'find . -type f -name "*.md" -exec sed -i -e "s+[a-zA-Z0-9.-]*<\/version>+$NEW_VERSION+g" {} +' diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c9aed1133..89458406a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,17 +12,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 8, 11, 17 ] + java: [ 11, 17, 21 ] name: Java ${{ matrix.java }} Test steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup java - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: cache: 'maven' java-version: ${{ matrix.java }} distribution: 'temurin' - run: | - ./mvnw clean install -DskipTests -B - ./mvnw verify -B - ./mvnw javadoc:javadoc + ./mvnw -ntp -B clean install -DskipTests + ./mvnw -ntp -B verify + ./mvnw -ntp -B javadoc:javadoc diff --git a/amqp/pom.xml b/amqp/pom.xml index 865acfdc5..3d208c01e 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -61,4 +61,12 @@ + + + + org.moditect + moditect-maven-plugin + + + diff --git a/api/pom.xml b/api/pom.xml index adb849480..ff755c2d8 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -56,4 +56,13 @@ test + + + + + org.moditect + moditect-maven-plugin + + + diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 2f150fbf7..046a5d0a7 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -83,7 +83,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 ${javac.target} ${javac.target} diff --git a/bom/pom.xml b/bom/pom.xml index 8343f7644..6c4253289 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -83,7 +83,7 @@ io.cloudevents - io.cloudevents.sql + cloudevents-sql ${project.version} diff --git a/core/pom.xml b/core/pom.xml index 2e777d559..2d263837e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -66,6 +66,10 @@ + + org.moditect + moditect-maven-plugin + org.apache.maven.plugins maven-jar-plugin diff --git a/formats/json-jackson/pom.xml b/formats/json-jackson/pom.xml index c6671dd5d..83722b251 100644 --- a/formats/json-jackson/pom.xml +++ b/formats/json-jackson/pom.xml @@ -90,4 +90,13 @@ + + + + + org.moditect + moditect-maven-plugin + + + diff --git a/formats/protobuf/pom.xml b/formats/protobuf/pom.xml index e965c6954..840be2c94 100644 --- a/formats/protobuf/pom.xml +++ b/formats/protobuf/pom.xml @@ -61,6 +61,10 @@ com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + + org.moditect + moditect-maven-plugin + @@ -126,5 +130,4 @@ - diff --git a/formats/xml/pom.xml b/formats/xml/pom.xml index 9c0bf6319..6ff17f60a 100644 --- a/formats/xml/pom.xml +++ b/formats/xml/pom.xml @@ -84,4 +84,12 @@ + + + + org.moditect + moditect-maven-plugin + + + diff --git a/http/basic/pom.xml b/http/basic/pom.xml index b473c81b0..5f77f8a59 100644 --- a/http/basic/pom.xml +++ b/http/basic/pom.xml @@ -63,4 +63,13 @@ + + + + + org.moditect + moditect-maven-plugin + + + diff --git a/http/restful-ws-jakarta/pom.xml b/http/restful-ws-jakarta/pom.xml index 5f6367f3d..05e836c15 100644 --- a/http/restful-ws-jakarta/pom.xml +++ b/http/restful-ws-jakarta/pom.xml @@ -91,6 +91,10 @@ + + org.moditect + moditect-maven-plugin + diff --git a/http/vertx/pom.xml b/http/vertx/pom.xml index 123a41d37..4d6fd88d8 100644 --- a/http/vertx/pom.xml +++ b/http/vertx/pom.xml @@ -87,4 +87,13 @@ test + + + + + org.moditect + moditect-maven-plugin + + + diff --git a/kafka/pom.xml b/kafka/pom.xml index 787062c40..37b0063e3 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -76,5 +76,14 @@ test + + + + + org.moditect + moditect-maven-plugin + + + diff --git a/pom.xml b/pom.xml index 252f9d4c3..e25a8ba6d 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,7 @@ 8 8 + 8 UTF-8 @@ -123,6 +124,11 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + + org.apache.maven.plugins + maven-compiler-plugin + 3.12.1 + org.apache.maven.plugins maven-jar-plugin @@ -134,6 +140,36 @@ + + org.moditect + moditect-maven-plugin + 1.0.0.Final + + + add-module-infos + package + + add-module-info + + + true + false + + + ${module-name} + + *; + + true + + + + --multi-release=9 + + + + + org.ec4j.maven editorconfig-maven-plugin diff --git a/sql/pom.xml b/sql/pom.xml index fd595dda1..da75b69a5 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -87,6 +87,10 @@ true + + org.moditect + moditect-maven-plugin +