Skip to content

Commit f05d3c6

Browse files
jderegjdereg
committed
Simplified pom.xml
1 parent 7aa99ea commit f05d3c6

File tree

2 files changed

+39
-51
lines changed

2 files changed

+39
-51
lines changed

‎pom.xml

Lines changed: 38 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.cedarsoftware</groupId>
66
<artifactId>json-io</artifactId>
77
<packaging>bundle</packaging>
8-
<version>4.53.0</version>
8+
<version>4.54.0</version>
99
<description>Java JSON serialization</description>
1010
<url>https://github.com/jdereg/json-io</url>
1111

@@ -36,15 +36,12 @@
3636
<!-- Build maven-***-plugins-->
3737
<version.maven-jar-plugin>3.4.2</version.maven-jar-plugin>
3838
<version.maven-gpg-plugin>3.2.7</version.maven-gpg-plugin>
39-
<version.maven-compiler-plugin>3.13.0</version.maven-compiler-plugin>
39+
<version.maven-compiler-plugin>3.14.0</version.maven-compiler-plugin>
4040
<version.maven-javadoc-plugin>3.11.2</version.maven-javadoc-plugin>
41-
<version.maven-surefire-plugin>3.5.2</version.maven-surefire-plugin>
41+
<version.maven-surefire-plugin>3.5.3</version.maven-surefire-plugin>
4242
<version.maven-source-plugin>3.3.1</version.maven-source-plugin>
43-
<version.maven-resources-plugin>3.3.1</version.maven-resources-plugin>
44-
<version.maven-install-plugin>3.1.3</version.maven-install-plugin>
45-
<version.maven-deploy-plugin>3.1.3</version.maven-deploy-plugin>
4643
<version.maven-scr-plugin>1.26.4</version.maven-scr-plugin>
47-
<version.maven-bundle-plugin>5.1.9</version.maven-bundle-plugin>
44+
<version.maven-bundle-plugin>6.0.0</version.maven-bundle-plugin>
4845
<version.moditect-maven-plugin>1.2.2.Final</version.moditect-maven-plugin>
4946

5047
<!-- release to Maven Central via Sonatype Nexus -->
@@ -54,31 +51,52 @@
5451

5552
<profiles>
5653

54+
<!-- JDK 9 and newer -->
5755
<profile>
5856
<id>jdk9-and-above</id>
5957
<activation>
6058
<jdk>[9,)</jdk>
6159
</activation>
62-
<properties>
63-
<maven.compiler.release>8</maven.compiler.release>
64-
<!-- Remove source and target to prevent conflicts -->
65-
<maven.compiler.source></maven.compiler.source>
66-
<maven.compiler.target></maven.compiler.target>
67-
</properties>
60+
61+
<!-- only the flags that modern javac needs -->
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-compiler-plugin</artifactId>
67+
<version>${version.maven-compiler-plugin}</version>
68+
<configuration>
69+
<release>8</release>
70+
<testRelease>8</testRelease>
71+
<encoding>${project.build.sourceEncoding}</encoding>
72+
</configuration>
73+
</plugin>
74+
</plugins>
75+
</build>
6876
</profile>
6977

70-
<!-- Profile for JDK8 -->
78+
<!-- JDK 8 -->
7179
<profile>
7280
<id>jdk8</id>
7381
<activation>
7482
<jdk>1.8</jdk>
7583
</activation>
76-
<properties>
77-
<maven.compiler.source>1.8</maven.compiler.source>
78-
<maven.compiler.target>1.8</maven.compiler.target>
79-
<!-- Do not set release for JDK8 -->
80-
<maven.compiler.release></maven.compiler.release>
81-
</properties>
84+
85+
<!-- classic - source / target for the legacy tool-chain -->
86+
<build>
87+
<plugins>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-compiler-plugin</artifactId>
91+
<version>${version.maven-compiler-plugin}</version>
92+
<configuration>
93+
<source>1.8</source>
94+
<target>1.8</target>
95+
<encoding>${project.build.sourceEncoding}</encoding>
96+
</configuration>
97+
</plugin>
98+
</plugins>
99+
</build>
82100
</profile>
83101

84102
<profile>
@@ -205,18 +223,6 @@
205223
</executions>
206224
</plugin>
207225

208-
<plugin>
209-
<groupId>org.apache.maven.plugins</groupId>
210-
<artifactId>maven-compiler-plugin</artifactId>
211-
<version>${version.maven-compiler-plugin}</version>
212-
<configuration>
213-
<release>${maven.compiler.release}</release>
214-
<source>${maven.compiler.source}</source>
215-
<target>${maven.compiler.target}</target>
216-
<encoding>${project.build.sourceEncoding}</encoding>
217-
</configuration>
218-
</plugin>
219-
220226
<plugin>
221227
<groupId>org.apache.maven.plugins</groupId>
222228
<artifactId>maven-source-plugin</artifactId>
@@ -231,24 +237,6 @@
231237
</executions>
232238
</plugin>
233239

234-
<plugin>
235-
<groupId>org.apache.maven.plugins</groupId>
236-
<artifactId>maven-resources-plugin</artifactId>
237-
<version>${version.maven-resources-plugin}</version>
238-
</plugin>
239-
240-
<plugin>
241-
<groupId>org.apache.maven.plugins</groupId>
242-
<artifactId>maven-install-plugin</artifactId>
243-
<version>${version.maven-install-plugin}</version>
244-
</plugin>
245-
246-
<plugin>
247-
<groupId>org.apache.maven.plugins</groupId>
248-
<artifactId>maven-deploy-plugin</artifactId>
249-
<version>${version.maven-deploy-plugin}</version>
250-
</plugin>
251-
252240
<plugin>
253241
<groupId>org.apache.maven.plugins</groupId>
254242
<artifactId>maven-javadoc-plugin</artifactId>

‎src/main/java/com/cedarsoftware/io/JsonReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ private boolean isBuiltInPrimitive(Object obj) {
680680
* interference with subsequent deserialization operations.</li>
681681
* </ul>
682682
*
683-
* @implNote
683+
* Implementation Note:
684684
* <p>This method is designed to handle both scenarios where type information is provided and where it
685685
* is absent. It ensures robust deserialization by falling back to generic types when necessary and by
686686
* leveraging type conversion mappings defined within the converter.</p>

0 commit comments

Comments
 (0)