From c88be2b4e54cebf8dcb3967d9fec8b86d57b1482 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 19 Jun 2020 14:32:29 -0700
Subject: [PATCH] JDK 11 min requirements because of LTS.

---
 .circleci/config.yml                          |  8 +++---
 .idea/compiler.xml                            |  2 +-
 .idea/mobibot.iml                             |  2 +-
 .idea/modules/mobibot.main.iml                |  6 ++---
 .idea/modules/mobibot.test.iml                |  2 +-
 .travis.yml                                   |  4 +--
 build.gradle                                  |  1 -
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |  6 ++---
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt | 25 +++----------------
 version.properties                            |  6 ++---
 10 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2926e9b..6d2102a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,15 +34,15 @@ jobs:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:14.0
+      - image: cimg/openjdk:14.0.1
 
     <<: *defaults_gradle
 
-  build_gradle_jdk9:
+  build_gradle_jdk11:
     <<: *defaults
 
     docker:
-      - image: circleci/openjdk:9
+      - image: circleci/openjdk:11.0.7
 
     <<: *defaults_gradle
 
@@ -50,6 +50,6 @@ workflows:
   version: 2
   gradle:
         jobs:
-        - build_gradle_jdk9
+        - build_gradle_jdk11
         - build_gradle_jdk14
 
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1f720ec..5a0b3ad 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,6 +12,6 @@
         <module name="mobibot.main" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.9" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index fbe0f57..92add17 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 366e847..636f6cf 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
+      <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
         <compilerSettings>
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
@@ -12,7 +12,7 @@
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
-          <option name="jvmTarget" value="11" />
+          <option name="jvmTarget" value="9" />
           <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 03f4493..3938301 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/.travis.yml b/.travis.yml
index 10d46d9..dd5e66d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
     organization: "ethauvin-github"
 
 jdk:
-  - oraclejdk9
+  - openjdk11
   - openjdk14
 
 before_install:
@@ -21,6 +21,6 @@ before_install:
 
 after_success:
   - |
-      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk9 ]; then
+      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == openjdk11 ]; then
         ./gradlew sonarqube
       fi
diff --git a/build.gradle b/build.gradle
index 0d779ef..11a21b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,6 @@ dependencies {
 
     compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
     testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
-
 }
 
 test {
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 06bb921..1cb9672 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592043035449L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592615322387L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "beta";
-    public static final String BUILDMETA = "004";
-    public static final String VERSION = "0.8.0-beta+004";
+    public static final String BUILDMETA = "046";
+    public static final String VERSION = "0.8.0-beta+046";
 
     /**
      * Disables the default constructor.
diff --git a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index a8eed6c..4c33ece 100644
--- a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -36,18 +36,12 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.pinboard.PinboardPoster
 import org.testng.Assert
 import org.testng.annotations.Test
-import java.io.IOException
-import java.net.URI
-import java.net.URISyntaxException
+import java.net.URL
 import java.net.URLEncoder
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.net.http.HttpResponse
 import java.nio.charset.StandardCharsets
 
 class PinboardUtilsTest : LocalProperties() {
     @Test
-    @Throws(InterruptedException::class, IOException::class, URISyntaxException::class)
     fun pinboardTest() {
         val apiToken = getProperty("pinboard-api-token")
         val pinboard = PinboardPoster(apiToken)
@@ -66,21 +60,10 @@ class PinboardUtilsTest : LocalProperties() {
         Assert.assertFalse(validatePin(apiToken, url = entry.link), "delete")
     }
 
-    @Throws(IOException::class, URISyntaxException::class, InterruptedException::class)
     private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
-        val request = HttpRequest.newBuilder().uri(
-            URI(
-                "https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
-                    + URLEncoder.encode(url, StandardCharsets.UTF_8)
-            )
-        ).GET().build()
+        val response = Utils.urlReader(URL("https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
+                                + URLEncoder.encode(url, StandardCharsets.UTF_8)))
 
-        val response = HttpClient.newBuilder()
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString())
-
-        return if (response.statusCode() == 200) {
-            response.body().contains(url) && response.body().contains(ircServer)
-        } else false
+        return response.contains(url) && response.contains(ircServer)
     }
 }
diff --git a/version.properties b/version.properties
index 3a1fdac..a5f2ba8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jun 13 03:10:34 PDT 2020
-version.buildmeta=004
+#Fri Jun 19 18:08:41 PDT 2020
+version.buildmeta=046
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+004
+version.semver=0.8.0-beta+046