diff --git a/.github/workflows/maven_release.yml b/.github/workflows/maven_release.yml index aa7fe18..15e3d64 100644 --- a/.github/workflows/maven_release.yml +++ b/.github/workflows/maven_release.yml @@ -15,10 +15,10 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: - java-version: 8 + java-version: 11 distribution: 'temurin' - name: Cache and restore Maven packages on master uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 @@ -59,7 +59,7 @@ jobs: - name: Set up Maven Central Repository uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: - java-version: 8 + java-version: 11 distribution: 'temurin' server-id: central server-username: MAVEN_USERNAME diff --git a/.github/workflows/maven_test.yml b/.github/workflows/maven_test.yml index 0513cc0..b9a64da 100644 --- a/.github/workflows/maven_test.yml +++ b/.github/workflows/maven_test.yml @@ -17,10 +17,10 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: - java-version: 8 + java-version: 11 distribution: 'temurin' - name: Cache and restore Maven packages on master uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 diff --git a/pom.xml b/pom.xml index 0960f3e..74c7fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org/openapitools/jackson/nullable ${project.groupId}.jackson.nullable - 1.8 + 8 @@ -141,10 +141,31 @@ maven-compiler-plugin ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - + + + compile-java-8 + + compile + + + ${java.version} + + + + compile-java-9 + compile + + compile + + + 9 + + ${project.basedir}/src/main/java9 + + true + + + org.apache.maven.plugins @@ -179,7 +200,7 @@ - org.openapitools.jackson.nullable + true diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java new file mode 100644 index 0000000..33b04dc --- /dev/null +++ b/src/main/java9/module-info.java @@ -0,0 +1,11 @@ +module org.openapitools.jackson.nullable { + requires com.fasterxml.jackson.databind; + requires static jakarta.validation; + requires static java.validation; + + exports org.openapitools.jackson.nullable; + + provides com.fasterxml.jackson.databind.Module with org.openapitools.jackson.nullable.JsonNullableModule; + provides javax.validation.valueextraction.ValueExtractor with org.openapitools.jackson.nullable.JsonNullableValueExtractor; + provides jakarta.validation.valueextraction.ValueExtractor with org.openapitools.jackson.nullable.JsonNullableJakartaValueExtractor; +}