Code cleanup and dependency version bump (#551) Code cleanup and dependency version bump Signed-off-by: David Kral <david.k.kral@oracle.com>
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0ea3485..3788859 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml
@@ -44,9 +44,10 @@ - name: Copyright run: bash etc/copyright.sh - name: Checkstyle - run: mvn -B -Pstaging checkstyle:checkstyle + run: mvn -B checkstyle:checkstyle - name: Yasson install - run: mvn -U -C -Pstaging clean install -DskipTests +# run: mvn -U -C -Pstaging clean install -DskipTests + run: mvn -U -C clean install -DskipTests - name: Set up JDK for tests uses: actions/setup-java@v2 with:
diff --git a/pom.xml b/pom.xml index d60d21b..4b2bf2b 100644 --- a/pom.xml +++ b/pom.xml
@@ -36,11 +36,36 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <jakarta.json.version>2.1.0</jakarta.json.version> <parson.version>2.1.0</parson.version> - <jakarta.json.bind.version>3.0.0-RC1</jakarta.json.bind.version> - <jakarta.enterprise.cdi-api.version>4.0.0-RC2</jakarta.enterprise.cdi-api.version> + <jakarta.json.bind.version>3.0.0</jakarta.json.bind.version> + <jakarta.enterprise.cdi-api.version>4.0.0</jakarta.enterprise.cdi-api.version> <netbeans.hint.jdkPlatform>JDK_9</netbeans.hint.jdkPlatform> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + <version>${jakarta.enterprise.cdi-api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> + <version>5.0.0-RC1</version> + </dependency> + <dependency> + <groupId>jakarta.interceptor</groupId> + <artifactId>jakarta.interceptor-api</artifactId> + <version>2.1.0</version> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>2.1.0</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- Compile dependencies --> <dependency> @@ -62,21 +87,14 @@ <dependency> <groupId>jakarta.enterprise</groupId> <artifactId>jakarta.enterprise.cdi-api</artifactId> - <version>${jakarta.enterprise.cdi-api.version}</version> <optional>true</optional> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> - <version>5.0.0.Beta1</version> + <version>5.0.0.CR2</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>jakarta.el</groupId> - <artifactId>jakarta.el-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> @@ -94,6 +112,7 @@ <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> <version>1.3</version> + <scope>test</scope> </dependency> </dependencies>
diff --git a/src/main/java/org/eclipse/yasson/YassonConfig.java b/src/main/java/org/eclipse/yasson/YassonConfig.java index 19e66db..9387eea 100644 --- a/src/main/java/org/eclipse/yasson/YassonConfig.java +++ b/src/main/java/org/eclipse/yasson/YassonConfig.java
@@ -53,11 +53,6 @@ public static final String FORCE_MAP_ARRAY_SERIALIZER_FOR_NULL_KEYS = "yasson.force-map-array-serializer-for-null-keys"; /** - * @see #withJsonbParametersRequired(boolean) - */ - public static final String JSONB_CREATOR_PARAMETERS_REQUIRED = "yasson.jsonb-creator-parameters-required"; - - /** * @see #withTimeInMillisAsAString(boolean) */ public static final String DATE_TIME_IN_MILLIS_AS_A_STRING = "yasson.time-in-millis-as-a-string"; @@ -132,22 +127,6 @@ return this; } - - /** - * {@link jakarta.json.bind.annotation.JsonbCreator} parameters are required to be optional since the spec 3.0.0. - * However, if it is needed to revert functionality as it used to be before, it is possible to use this switch - * which globally turns the requirement of the {@link jakarta.json.bind.annotation.JsonbCreator} parameters - * to be required. - * - * @param value whether to treat {@link jakarta.json.bind.annotation.JsonbCreator} parameters - * as required. Default value is {@code false}. - * @return This YassonConfig instance - */ - public YassonConfig withJsonbParametersRequired(boolean value) { - setProperty(JSONB_CREATOR_PARAMETERS_REQUIRED, value); - return this; - } - /** * It is required to handle time millisecond format as a number. See * {@link jakarta.json.bind.annotation.JsonbDateFormat#TIME_IN_MILLIS}. It is possible to override this and force
diff --git a/src/main/java/org/eclipse/yasson/internal/JsonbConfigProperties.java b/src/main/java/org/eclipse/yasson/internal/JsonbConfigProperties.java index 523a742..441e8b1 100644 --- a/src/main/java/org/eclipse/yasson/internal/JsonbConfigProperties.java +++ b/src/main/java/org/eclipse/yasson/internal/JsonbConfigProperties.java
@@ -189,9 +189,9 @@ private boolean initRequiredCreatorParameters() { if (System.getProperty(JsonbConfig.CREATOR_PARAMETERS_REQUIRED) != null) { - return Boolean.parseBoolean(System.getProperty(YassonConfig.CREATOR_PARAMETERS_REQUIRED)); + return Boolean.parseBoolean(System.getProperty(JsonbConfig.CREATOR_PARAMETERS_REQUIRED)); } - return getConfigProperty(YassonConfig.CREATOR_PARAMETERS_REQUIRED, Boolean.class, false); + return getConfigProperty(JsonbConfig.CREATOR_PARAMETERS_REQUIRED, Boolean.class, false); } private boolean initDateInMillisecondsAsString() {