Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e598ce7
feat - migrated maven project to java 16 (#1)
mxyns Mar 2, 2022
fc8c4d8
Merge pull request #2 from noahra/issue/#1
mxyns Mar 2, 2022
fff39bd
test - failing test for unsupported Record (#3)
mxyns Mar 2, 2022
7fc8851
Merge pull request #4 from noahra/issue/#3
mxyns Mar 2, 2022
4766703
test - add serialization test (#7)
lnsandnkth Mar 2, 2022
0d893a4
Merge pull request #8 from noahra/issue/#7
lnsandnkth Mar 2, 2022
da40903
test - fix added assertion (#3)
lnsandnkth Mar 2, 2022
6927007
Merge pull request #10 from noahra/issue/#3
lnsandnkth Mar 2, 2022
077c4d5
feat - record support with canonical constructor (#5) (PR #13)
yuxin-miao Mar 4, 2022
149b796
feat - handle multiple record constructors by using canonical constru…
mxyns Mar 4, 2022
4b7c1f0
test - add tests for any wrap and stream (#15)
lnsandnkth Mar 4, 2022
ac59b48
Merge pull request #17 from noahra/issue/#15
lnsandnkth Mar 4, 2022
8dc32ff
test - example of use of another constructor for record decoding (#16)
mxyns Mar 6, 2022
f921396
clean - reemoved syso/sout (#19)
mxyns Mar 6, 2022
2d2ff04
clean - removed unsused imports (#19)
mxyns Mar 6, 2022
37a6755
test - add tests for getRecordCtor (#21)
Mar 6, 2022
dc3a7af
Modularized, Java17, dependency-updates.
Aug 13, 2022
e736444
trying source and target tags to try to fix jitpack.io compilation
Aug 13, 2022
bdbd720
java.lang.module.FindException: Module com.fasterxml.jackson.databind
Aug 13, 2022
6a90a5a
transitive module Javassist not found
Aug 13, 2022
1652d87
revert transitive and open for more tests
Aug 13, 2022
0451822
fixed module-info using "requires static" for optional and test-only
Aug 16, 2022
26eab37
opened module
Aug 16, 2022
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modularized, Java17, dependency-updates.
  • Loading branch information
Brix committed Aug 13, 2022
commit dc3a7af03896e86d08451cb00c5a2dda01db2bd4
15 changes: 15 additions & 0 deletions DependencyUpdateSearch_Rules.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" comparisonMethod="maven" xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<ignoreVersions>
<!-- Ignore Alpha's, Beta's, release candidates and milestones -->
<ignoreVersion type="regex">(?i).*Alpha(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*a(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*Beta(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*-B(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*RC(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*CR(?:-?\d+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*M(?:-?\d+)?</ignoreVersion>
</ignoreVersions>
<rules>
</rules>
</ruleset>
66 changes: 53 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -52,38 +52,38 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.5</version>
<version>2.13.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.5</version>
<version>2.13.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.3</version>
<version>2.9.1</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>1.20</version>
<version>1.35</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>1.20</version>
<version>1.35</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
<version>3.12.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -125,16 +125,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.10.1</version>
<configuration>
<release>16</release>
<release>17</release>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -147,7 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -177,7 +177,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -199,7 +199,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<version>2.20</version> <!-- note: 2.20.1 to 2.22.2 crash during tests -->
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<parallel>methods</parallel>
Expand All @@ -215,6 +215,46 @@
</includes>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.11.0</version>
<configuration>
<rulesUri>file:///${project.basedir}/DependencyUpdateSearch_Rules.xml</rulesUri>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>display-dependency-updates</goal>
<goal>display-plugin-updates</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.3.2,)</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
29 changes: 29 additions & 0 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
open module com.jsoniter {
exports com.jsoniter.fuzzy;

exports com.jsoniter.static_codegen;

exports com.jsoniter.extra;

exports com.jsoniter.output;

exports com.jsoniter.annotation;

exports com.jsoniter;

exports com.jsoniter.spi;

exports com.jsoniter.any;

requires com.fasterxml.jackson.annotation;

requires com.fasterxml.jackson.core;

requires com.fasterxml.jackson.databind;

requires com.google.gson;

requires java.desktop;

requires javassist;
}
18 changes: 7 additions & 11 deletions src/test/java/com/jsoniter/output/TestNested.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package com.jsoniter.output;

import java.io.*;
import java.util.*;

import com.jsoniter.annotation.JsonProperty;
import com.jsoniter.spi.JsoniterSpi;
import com.jsoniter.spi.TypeLiteral;
import junit.framework.TestCase;
import com.jsoniter.spi.*;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import junit.framework.TestCase;

public class TestNested extends TestCase {

Expand Down Expand Up @@ -45,7 +41,7 @@ public void test_collection_of_objects() throws IOException {
obj1.field1 = "1";
obj1.field2 = "2";
String output = JsonStream.serialize(new TypeLiteral<List<TestObject1>>() {
}, new ArrayList() {{
}, new ArrayList<>() {{
add(obj1);
}});
assertTrue(output.contains("field1"));
Expand Down Expand Up @@ -92,7 +88,7 @@ public void test_map_of_objects() throws IOException {
obj1.field1 = "1";
obj1.field2 = "2";
stream.writeVal(new TypeLiteral<Map<String, TestObject1>>() {
}, new HashMap() {{
}, new HashMap<>() {{
put("hello", obj1);
}});
stream.close();
Expand Down