Merge pull request #32 from gravity9-tech/chore/upgrade-java-and-gradle

Move to Java 11 and update Gradle version

Author: BartekGravity

README.md

@@ -1,6 +1,5 @@
 [![License LGPLv3][LGPLv3 badge]][LGPLv3]
 [![License ASL 2.0][ASL 2.0 badge]][ASL 2.0]
-[![Build Status][Travis badge]][Travis]
 [![Maven Central][Maven Central badge]][Maven]
 
 ## Read me first
@@ -39,17 +38,18 @@ With Gradle:
 
 ```groovy
 dependencies {
-    compile(group: "com.github.java-json-tools", name: "json-patch", version: "yourVersionHere");
+  compile(group: "com.gravity9", name: "java-json-tools", version: "yourVersionHere");
 }
 ```
 
 With Maven:
 
 ```xml
+
 <dependency>
-    <groupId>com.github.java-json-tools</groupId>
-    <artifactId>json-patch</artifactId>
-    <version>yourVersionHere</version>
+  <groupId>com.gravity9</groupId>
+  <artifactId>java-json-tools</artifactId>
+  <version>yourVersionHere</version>
 </dependency>
 ```
 
@@ -466,7 +466,5 @@ Examples of JsonPath:
 [LGPLv3]: http://www.gnu.org/licenses/lgpl-3.0.html
 [ASL 2.0 badge]: https://img.shields.io/:license-Apache%202.0-blue.svg
 [ASL 2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
-[Travis Badge]: https://travis-ci.com/java-json-tools/json-patch.svg?branch=master
-[Travis]: https://travis-ci.com/java-json-tools/json-patch
 [Maven Central badge]: https://img.shields.io/maven-central/v/com.github.java-json-tools/json-patch.svg
 [Maven]: https://search.maven.org/artifact/com.github.java-json-tools/json-patch

azure-pipelines.yml

@@ -19,38 +19,20 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenCentral()
-        maven {
-            url "https://repo.spring.io/plugins-snapshot";
-            content {
-                includeGroupByRegex "io\\.spring\\.gradle\\.*"
-            }
-        }
     }
     dependencies {
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.2.0'
-        classpath 'io.spring.gradle:propdeps-plugin:0.0.8-SNAPSHOT'
         classpath 'org.owasp:dependency-check-gradle:8.2.1'
     }
 };
 
 plugins {
-    id("net.ltgt.errorprone") version "0.8.1" apply false
-}
-
-configure(allprojects) {
-    apply(plugin: "propdeps");
-    apply(plugin: "propdeps-maven");
-    apply(plugin: "propdeps-idea");
-    apply(plugin: "propdeps-eclipse");
+    id("net.ltgt.errorprone") version "3.0.1" apply false
 }
 
 apply(plugin: "java");
-apply(plugin: "maven");
 apply(plugin: "biz.aQute.bnd.builder");
-apply(plugin: "idea");
-apply(plugin: "eclipse");
 apply(plugin: "net.ltgt.errorprone");
 apply(plugin: 'org.owasp.dependencycheck');
 apply(from: "project.gradle");
@@ -69,7 +51,6 @@ repositories {
  */
 dependencies {
     errorprone('com.google.errorprone:error_prone_core:2.20.0')
-    errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
 }
 
 /*
@@ -86,8 +67,8 @@ test {
  * Necessary to generate the source and javadoc jars
  */
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources";
     from sourceSets.main.allSource;
+    archiveClassifier.set("sources");
 }
 
 /*
@@ -105,8 +86,8 @@ allprojects {
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc";
     from javadoc.destinationDir;
+    archiveClassifier.set("javadoc");
 }
 
 artifacts {
@@ -115,10 +96,7 @@ artifacts {
     archives javadocJar;
 }
 
-
 wrapper {
-    gradleVersion = "5.6.3";
+    gradleVersion = "7.6.1";
     distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip";
 }
-
-

build.gradle

@@ -1 +1 @@
-version=3.0.3-SNAPSHOT
+version=2.0.0

gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -21,42 +21,36 @@
  * Project-specific settings. Unfortunately we cannot put the name in there!
  */
 group = "com.gravity9.java-json-tools";
-sourceCompatibility = JavaVersion.VERSION_1_7;
-targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 project.ext.description = "JSON Patch (RFC 6902) and JSON Merge Patch (RFC 7386) implementation in Java, using extended TMF620 JsonPath syntax";
 
 /*
  * List of dependencies
  */
 dependencies {
-    provided(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2");
-    compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.15.2");
-    compile(group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0')
-    compile(group: "com.github.java-json-tools", name: "msg-simple", version: "1.2");
-    compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "2.0");
-    testCompile(group: "org.testng", name: "testng", version: "7.1.0") {
+    compileOnly(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2");
+    implementation(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.15.2");
+    implementation(group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0')
+    implementation(group: "com.github.java-json-tools", name: "msg-simple", version: "1.2");
+    implementation(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "2.0");
+    testImplementation(group: "org.testng", name: "testng", version: "7.1.0") {
         exclude(group: "junit", module: "junit");
         exclude(group: "org.beanshell", module: "bsh");
         exclude(group: "org.yaml", module: "snakeyaml");
     };
-    testCompile(group: "org.mockito", name: "mockito-core", version: "2.28.2");
-    // FIXME: update to 3.x once we're off of Java 7
-    testCompile(group: "org.assertj", name: "assertj-core", version: "2.9.1");
-    testCompile(group: "com.google.guava", name: "guava", version: "28.2-android");
+    testImplementation(group: "org.mockito", name: "mockito-core", version: "2.28.2");
+    testImplementation(group: "org.assertj", name: "assertj-core", version: "3.24.2");
+    testImplementation(group: "com.google.guava", name: "guava", version: "32.0.1-android");
 }
 
 javadoc.options {
-    def currentJavaVersion = org.gradle.api.JavaVersion.current()
-    // FIXME: https://github.com/gradle/gradle/issues/11182
-    if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) {
-        addStringOption("-release", "7");
-    }
-    links("https://docs.oracle.com/javase/7/docs/api/");
+    links("https://docs.oracle.com/javase/11/docs/api/");
     links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/");
-    links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.11.4/index.html");
-    links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.11.4/index.html");
-    links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/2.11.4/index.html");
-    links("https://www.javadoc.io/doc/com.google.guava/guava/28.2-android/");
+    links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.15.2/index.html");
+    links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.15.2/index.html");
+    links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/2.15.2/index.html");
+    links("https://www.javadoc.io/doc/com.google.guava/guava/32.0.1-android/");
     links("https://java-json-tools.github.io/msg-simple/");
     links("https://java-json-tools.github.io/jackson-coreutils/");
 }

project.gradle

@@ -17,4 +17,4 @@
  * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
  */
 
-rootProject.name = "json-patch-query";
+rootProject.name = "java-json-tools";