Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Java 11 #403

Closed
wants to merge 2 commits into from
Closed

Update to Java 11 #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
804d8cb
Update to Java 11 with modue info and minor required Maven configurat…
May 14, 2021
27f2cb7
Merge branch 'networknt:master' into master
May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 7 additions & 11 deletions pom.xml
View file
Open in desktop
Expand Up @@ -59,8 +59,9 @@
</repository>
</distributionManagement>
<properties>
<java.version>1.6</java.version>
<java.testversion>1.8</java.testversion>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the maven.compiler.release property is used the older maven.compiler.source and maven.compiler.target properties should be omitted.

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.jackson>2.12.1</version.jackson>
<version.slf4j>1.7.30</version.slf4j>
Expand Down Expand Up @@ -150,7 +151,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.1</version>
<version>5.1.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down Expand Up @@ -237,20 +238,17 @@
<goal>jar</goal>
</goals>
<configuration>
<source>8</source>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.8.1</version>
stevehu marked this conversation as resolved.
Show resolved Hide resolved
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<testSource>${java.testversion}</testSource>
<testTarget>${java.testversion}</testTarget>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
<executions>
<execution>
Expand All @@ -260,8 +258,6 @@
<goal>testCompile</goal>
</goals>
<configuration>
<source>${java.testversion}</source>
<target>${java.testversion}</target>
</configuration>
</execution>
</executions>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/networknt/schema/NotValidator.java
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@
import org.slf4j.LoggerFactory;

import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;

public class NotValidator extends BaseJsonValidator implements JsonValidator {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/networknt/schema/PatternValidator.java
View file
Open in desktop
Expand Up @@ -26,7 +26,6 @@
import org.slf4j.LoggerFactory;

import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/networknt/schema/RefValidator.java
View file
Open in desktop
Expand Up @@ -25,8 +25,6 @@
import java.net.URI;
import java.text.MessageFormat;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;

public class RefValidator extends BaseJsonValidator implements JsonValidator {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/walk/WalkEvent.java
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ public JsonSchemaFactory getCurrentJsonSchemaFactory() {
return currentJsonSchemaFactory;
}

static class WalkEventBuilder {
public static class WalkEventBuilder {
private WalkEvent keywordWalkEvent = null;

WalkEventBuilder() {
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/module-info.java
View file
Open in desktop
@@ -0,0 +1,15 @@
module com.networknt.schema {
requires org.apache.commons.lang3;
requires org.jruby.jcodings;
requires org.jruby.joni;
requires org.slf4j;
requires transitive com.fasterxml.jackson.databind;

opens com.networknt.schema to com.fasterxml.jackson.databind;

exports com.networknt.schema;
exports com.networknt.schema.format;
exports com.networknt.schema.uri;
exports com.networknt.schema.urn;
exports com.networknt.schema.walk;
}