fix: self review issues
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bf10957..3a56d39 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml
@@ -54,6 +54,8 @@ run: mvn -B checkstyle:checkstyle - name: Yasson install run: mvn -U -C clean install -DskipTests + - name: Yasson jmh package + run: mvn -U -C -f yasson-jmh/pom.xml clean package - name: Yasson tests run: | export LANG_TAG="${{ matrix.locale }}" @@ -62,5 +64,5 @@ -Duser.language="${LANG_TAG%%_*}" \ -Duser.country="${LANG_TAG##*_}" \ verify - - name: JSONB-API TCK + - name: Jakarta JSON-B TCK run: cd yasson-tck && mvn -U -B test -DargLine="-Djava.locale.providers=COMPAT"
diff --git a/pom.xml b/pom.xml index 755f38e..267d124 100644 --- a/pom.xml +++ b/pom.xml
@@ -72,7 +72,7 @@ <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version> <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version> <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version> - <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version> + <maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version> </properties> <dependencyManagement> @@ -354,6 +354,14 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>${maven-jar-plugin.version}</version> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <manifestEntries> + <Multi-Release>true</Multi-Release> + </manifestEntries> + </archive> + </configuration> </plugin> <plugin> <!-- This plugin generates the buildNumber property used in maven-bundle-plugin -->
diff --git a/src/main/java/org/eclipse/yasson/internal/ClassMultiReleaseExtension.java b/src/main/java/org/eclipse/yasson/internal/ClassMultiReleaseExtension.java index 99dd434..f83ed39 100644 --- a/src/main/java/org/eclipse/yasson/internal/ClassMultiReleaseExtension.java +++ b/src/main/java/org/eclipse/yasson/internal/ClassMultiReleaseExtension.java
@@ -12,19 +12,6 @@ package org.eclipse.yasson.internal; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.Map; -import java.util.Optional; - -import jakarta.json.bind.JsonbException; -import jakarta.json.bind.config.PropertyNamingStrategy; - -import org.eclipse.yasson.internal.model.JsonbCreator; -import org.eclipse.yasson.internal.model.Property; -import org.eclipse.yasson.internal.properties.MessageKeys; -import org.eclipse.yasson.internal.properties.Messages; - /** * Search for instance creator from other sources. * Mainly intended to add extensibility for different java versions and new features.
diff --git a/src/main/java/org/eclipse/yasson/internal/ClassParser.java b/src/main/java/org/eclipse/yasson/internal/ClassParser.java index ab7b1e5..b63dc00 100644 --- a/src/main/java/org/eclipse/yasson/internal/ClassParser.java +++ b/src/main/java/org/eclipse/yasson/internal/ClassParser.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2026 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/yasson-jmh/pom.xml b/yasson-jmh/pom.xml index c871ba3..4fa726a 100644 --- a/yasson-jmh/pom.xml +++ b/yasson-jmh/pom.xml
@@ -21,6 +21,7 @@ <properties> <jmh.version>1.37</jmh.version> <yasson.version>${project.version}</yasson.version> + <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version> </properties> @@ -69,7 +70,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.2.1</version> + <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase>