Setup minimum java version 11.

javadev · Sep 28, 2022 · 7f98d70 · 7f98d70
1 parent 0a1b6e3
commit 7f98d70
Show file tree

Hide file tree

Showing 9 changed files with 379 additions and 312 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     working_directory: ~/underscore-java
 
     docker:
-      - image: circleci/openjdk:8u171-jdk
+      - image: circleci/openjdk:11.0.8-jdk
 
     steps:
 

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [11, 17]
 
     steps:
     - uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [11, 17]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ underscore-java
 Requirements
 ============
 
-Java 1.8 and later or [Java 11](https://github.com/javadev/underscore-java11).
+Java 11 and later or [Java 17](https://github.com/javadev/underscore-java11).
 
 
 ## Installation
@@ -41,7 +41,7 @@ Include the following in your `pom.xml` for Maven:
   <dependency>
     <groupId>com.github.javadev</groupId>
     <artifactId>underscore</artifactId>
-    <version>1.81</version>
+    <version>1.82</version>
   </dependency>
   ...
 </dependencies>
@@ -50,7 +50,7 @@ Include the following in your `pom.xml` for Maven:
 Gradle:
 
 ```groovy
-implementation 'com.github.javadev:underscore:1.81'
+implementation 'com.github.javadev:underscore:1.82'
 ```
 
 ### Usage

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ version: '{build}'
 skip_tags: true
 clone_depth: 30
 environment:
-  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  JAVA_HOME: C:\Program Files\Java\jdk11
 install:
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem

diff --git a/pom-central.xml b/pom-central.xml
@@ -4,7 +4,7 @@
   <groupId>com.github.javadev</groupId>
   <artifactId>underscore</artifactId>
   <packaging>jar</packaging>
-  <version>1.81</version>
+  <version>1.82</version>
   <name>java port of Underscore.js</name>
   <description>The java port of Underscore.js</description>
   <url>https://github.com/javadev/underscore-java</url>
@@ -42,10 +42,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.10.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
         <configuration>
           <archive>
             <manifestEntries>
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.0,)</version>
+      <version>[5.9.1,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom-pack.xml b/pom-pack.xml
@@ -4,7 +4,7 @@
   <groupId>com.github.javadev</groupId>
   <artifactId>underscore</artifactId>
   <packaging>jar</packaging>
-  <version>1.81</version>
+  <version>1.82</version>
   <name>java port of Underscore.js</name>
   <description>The java port of Underscore.js</description>
   <url>https://github.com/javadev/underscore-java</url>
@@ -42,10 +42,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.10.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>com.github.wvengen</groupId>
         <artifactId>proguard-maven-plugin</artifactId>
-        <version>2.0.14</version>
+        <version>2.5.3</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -121,7 +121,73 @@
             <option>-dontnote com.github.underscore.*$OperationType</option>
           </options>
           <libs>
-            <lib>${java.home}/lib/rt.jar</lib>
+            <lib>${java.home.openjdk11}/lib/jrt-fs.jar</lib>
+            <lib>${java.home.openjdk11}/jmods/java.base.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.compiler.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.datatransfer.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.desktop.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.instrument.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.logging.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.management.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.management.rmi.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.naming.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.prefs.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.rmi.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.scripting.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.se.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.security.jgss.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.security.sasl.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.smartcardio.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.sql.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.sql.rowset.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.xml.crypto.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/java.xml.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.accessibility.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.aot.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.attach.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.charsets.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.compiler.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.crypto.cryptoki.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.crypto.ec.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.crypto.mscapi.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.dynalink.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.editpad.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.hotspot.agent.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.httpserver.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.internal.ed.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.internal.jvmstat.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.internal.le.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.internal.opt.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.internal.vm.ci.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.internal.vm.compiler.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.internal.vm.compiler.management.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jartool.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.javadoc.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jcmd.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jconsole.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jdeps.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jdi.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jdwp.agent.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jlink.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jshell.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jsobject.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.jstatd.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.localedata.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.management.agent.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.management.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.naming.dns.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.naming.rmi.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.net.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.pack.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.rmic.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.scripting.nashorn.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.scripting.nashorn.shell.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.sctp.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.security.auth.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.security.jgss.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.unsupported.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.xml.dom.jmod</lib>
+            <lib>${java.home.openjdk11}/jmods/jdk.zipfs.jmod</lib>
           </libs>
         </configuration>
       </plugin>
@@ -178,7 +244,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.8.2,)</version>
+      <version>[5.9.1,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.github.javadev</groupId>
   <artifactId>underscore</artifactId>
   <packaging>jar</packaging>
-  <version>1.81-SNAPSHOT</version>
+  <version>1.82-SNAPSHOT</version>
   <name>java port of Underscore.js</name>
   <description>The java port of Underscore.js</description>
   <url>https://github.com/javadev/underscore-java</url>
@@ -43,8 +43,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <encoding>UTF-8</encoding>
           <compilerArgs>
             <arg>-Xlint:unchecked</arg>
@@ -219,7 +219,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>[5.9.0,)</version>
+      <version>[5.9.1,)</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/spring-boot-example/pom.xml b/spring-boot-example/pom.xml
@@ -13,7 +13,7 @@
     <name>demo</name>
     <description>Demo project for Spring Boot</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
     </properties>
     <repositories>
         <repository> 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.github.javadev</groupId>
             <artifactId>underscore</artifactId>
-            <version>1.75</version>
+            <version>1.81</version>
         </dependency>
     </dependencies>
     <build>