Skip to content

Commit 7f98d70

Browse files
javadevjavadev
authored
Setup minimum java version 11.
1 parent 0a1b6e3 commit 7f98d70

File tree

9 files changed

+379
-312
lines changed

9 files changed

+379
-312
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
working_directory: ~/underscore-java
66

77
docker:
8-
- image: circleci/openjdk:8u171-jdk
8+
- image: circleci/openjdk:11.0.8-jdk
99

1010
steps:
1111

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
java: [8, 11, 17]
11+
java: [11, 17]
1212

1313
steps:
1414
- uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: windows-latest
3636
strategy:
3737
matrix:
38-
java: [8, 11, 17]
38+
java: [11, 17]
3939

4040
steps:
4141
- uses: actions/checkout@v2

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ underscore-java
2929
Requirements
3030
============
3131

32-
Java 1.8 and later or [Java 11](https://github.com/javadev/underscore-java11).
32+
Java 11 and later or [Java 17](https://github.com/javadev/underscore-java11).
3333

3434

3535
## Installation
@@ -41,7 +41,7 @@ Include the following in your `pom.xml` for Maven:
4141
<dependency>
4242
<groupId>com.github.javadev</groupId>
4343
<artifactId>underscore</artifactId>
44-
<version>1.81</version>
44+
<version>1.82</version>
4545
</dependency>
4646
...
4747
</dependencies>
@@ -50,7 +50,7 @@ Include the following in your `pom.xml` for Maven:
5050
Gradle:
5151

5252
```groovy
53-
implementation 'com.github.javadev:underscore:1.81'
53+
implementation 'com.github.javadev:underscore:1.82'
5454
```
5555

5656
### Usage

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '{build}'
22
skip_tags: true
33
clone_depth: 30
44
environment:
5-
JAVA_HOME: C:\Program Files\Java\jdk1.8.0
5+
JAVA_HOME: C:\Program Files\Java\jdk11
66
install:
77
- ps: |
88
Add-Type -AssemblyName System.IO.Compression.FileSystem

‎pom-central.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.github.javadev</groupId>
55
<artifactId>underscore</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.81</version>
7+
<version>1.82</version>
88
<name>java port of Underscore.js</name>
99
<description>The java port of Underscore.js</description>
1010
<url>https://github.com/javadev/underscore-java</url>
@@ -42,10 +42,10 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-compiler-plugin</artifactId>
45-
<version>3.8.1</version>
45+
<version>3.10.0</version>
4646
<configuration>
47-
<source>1.8</source>
48-
<target>1.8</target>
47+
<source>11</source>
48+
<target>11</target>
4949
<encoding>UTF-8</encoding>
5050
</configuration>
5151
</plugin>
@@ -64,7 +64,7 @@
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-jar-plugin</artifactId>
67-
<version>3.2.0</version>
67+
<version>3.3.0</version>
6868
<configuration>
6969
<archive>
7070
<manifestEntries>
@@ -127,7 +127,7 @@
127127
<dependency>
128128
<groupId>org.junit.jupiter</groupId>
129129
<artifactId>junit-jupiter-api</artifactId>
130-
<version>[5.9.0,)</version>
130+
<version>[5.9.1,)</version>
131131
<scope>test</scope>
132132
</dependency>
133133
<dependency>

‎pom-pack.xml‎

Lines changed: 73 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.github.javadev</groupId>
55
<artifactId>underscore</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.81</version>
7+
<version>1.82</version>
88
<name>java port of Underscore.js</name>
99
<description>The java port of Underscore.js</description>
1010
<url>https://github.com/javadev/underscore-java</url>
@@ -42,10 +42,10 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-compiler-plugin</artifactId>
45-
<version>3.8.1</version>
45+
<version>3.10.0</version>
4646
<configuration>
47-
<source>1.8</source>
48-
<target>1.8</target>
47+
<source>11</source>
48+
<target>11</target>
4949
<encoding>UTF-8</encoding>
5050
</configuration>
5151
</plugin>
@@ -76,7 +76,7 @@
7676
<plugin>
7777
<groupId>com.github.wvengen</groupId>
7878
<artifactId>proguard-maven-plugin</artifactId>
79-
<version>2.0.14</version>
79+
<version>2.5.3</version>
8080
<executions>
8181
<execution>
8282
<phase>package</phase>
@@ -121,7 +121,73 @@
121121
<option>-dontnote com.github.underscore.*$OperationType</option>
122122
</options>
123123
<libs>
124-
<lib>${java.home}/lib/rt.jar</lib>
124+
<lib>${java.home.openjdk11}/lib/jrt-fs.jar</lib>
125+
<lib>${java.home.openjdk11}/jmods/java.base.jmod</lib>
126+
<lib>${java.home.openjdk11}/jmods/java.compiler.jmod</lib>
127+
<lib>${java.home.openjdk11}/jmods/java.datatransfer.jmod</lib>
128+
<lib>${java.home.openjdk11}/jmods/java.desktop.jmod</lib>
129+
<lib>${java.home.openjdk11}/jmods/java.instrument.jmod</lib>
130+
<lib>${java.home.openjdk11}/jmods/java.logging.jmod</lib>
131+
<lib>${java.home.openjdk11}/jmods/java.management.jmod</lib>
132+
<lib>${java.home.openjdk11}/jmods/java.management.rmi.jmod</lib>
133+
<lib>${java.home.openjdk11}/jmods/java.naming.jmod</lib>
134+
<lib>${java.home.openjdk11}/jmods/java.prefs.jmod</lib>
135+
<lib>${java.home.openjdk11}/jmods/java.rmi.jmod</lib>
136+
<lib>${java.home.openjdk11}/jmods/java.scripting.jmod</lib>
137+
<lib>${java.home.openjdk11}/jmods/java.se.jmod</lib>
138+
<lib>${java.home.openjdk11}/jmods/java.security.jgss.jmod</lib>
139+
<lib>${java.home.openjdk11}/jmods/java.security.sasl.jmod</lib>
140+
<lib>${java.home.openjdk11}/jmods/java.smartcardio.jmod</lib>
141+
<lib>${java.home.openjdk11}/jmods/java.sql.jmod</lib>
142+
<lib>${java.home.openjdk11}/jmods/java.sql.rowset.jmod</lib>
143+
<lib>${java.home.openjdk11}/jmods/java.xml.crypto.jmod</lib>
144+
<lib>${java.home.openjdk11}/jmods/java.xml.jmod</lib>
145+
<lib>${java.home.openjdk11}/jmods/jdk.accessibility.jmod</lib>
146+
<lib>${java.home.openjdk11}/jmods/jdk.aot.jmod</lib>
147+
<lib>${java.home.openjdk11}/jmods/jdk.attach.jmod</lib>
148+
<lib>${java.home.openjdk11}/jmods/jdk.charsets.jmod</lib>
149+
<lib>${java.home.openjdk11}/jmods/jdk.compiler.jmod</lib>
150+
<lib>${java.home.openjdk11}/jmods/jdk.crypto.cryptoki.jmod</lib>
151+
<lib>${java.home.openjdk11}/jmods/jdk.crypto.ec.jmod</lib>
152+
<lib>${java.home.openjdk11}/jmods/jdk.crypto.mscapi.jmod</lib>
153+
<lib>${java.home.openjdk11}/jmods/jdk.dynalink.jmod</lib>
154+
<lib>${java.home.openjdk11}/jmods/jdk.editpad.jmod</lib>
155+
<lib>${java.home.openjdk11}/jmods/jdk.hotspot.agent.jmod</lib>
156+
<lib>${java.home.openjdk11}/jmods/jdk.httpserver.jmod</lib>
157+
<lib>${java.home.openjdk11}/jmods/jdk.internal.ed.jmod</lib>
158+
<lib>${java.home.openjdk11}/jmods/jdk.internal.jvmstat.jmod</lib>
159+
<lib>${java.home.openjdk11}/jmods/jdk.internal.le.jmod</lib>
160+
<lib>${java.home.openjdk11}/jmods/jdk.internal.opt.jmod</lib>
161+
<lib>${java.home.openjdk11}/jmods/jdk.internal.vm.ci.jmod</lib>
162+
<lib>${java.home.openjdk11}/jmods/jdk.internal.vm.compiler.jmod</lib>
163+
<lib>${java.home.openjdk11}/jmods/jdk.internal.vm.compiler.management.jmod</lib>
164+
<lib>${java.home.openjdk11}/jmods/jdk.jartool.jmod</lib>
165+
<lib>${java.home.openjdk11}/jmods/jdk.javadoc.jmod</lib>
166+
<lib>${java.home.openjdk11}/jmods/jdk.jcmd.jmod</lib>
167+
<lib>${java.home.openjdk11}/jmods/jdk.jconsole.jmod</lib>
168+
<lib>${java.home.openjdk11}/jmods/jdk.jdeps.jmod</lib>
169+
<lib>${java.home.openjdk11}/jmods/jdk.jdi.jmod</lib>
170+
<lib>${java.home.openjdk11}/jmods/jdk.jdwp.agent.jmod</lib>
171+
<lib>${java.home.openjdk11}/jmods/jdk.jlink.jmod</lib>
172+
<lib>${java.home.openjdk11}/jmods/jdk.jshell.jmod</lib>
173+
<lib>${java.home.openjdk11}/jmods/jdk.jsobject.jmod</lib>
174+
<lib>${java.home.openjdk11}/jmods/jdk.jstatd.jmod</lib>
175+
<lib>${java.home.openjdk11}/jmods/jdk.localedata.jmod</lib>
176+
<lib>${java.home.openjdk11}/jmods/jdk.management.agent.jmod</lib>
177+
<lib>${java.home.openjdk11}/jmods/jdk.management.jmod</lib>
178+
<lib>${java.home.openjdk11}/jmods/jdk.naming.dns.jmod</lib>
179+
<lib>${java.home.openjdk11}/jmods/jdk.naming.rmi.jmod</lib>
180+
<lib>${java.home.openjdk11}/jmods/jdk.net.jmod</lib>
181+
<lib>${java.home.openjdk11}/jmods/jdk.pack.jmod</lib>
182+
<lib>${java.home.openjdk11}/jmods/jdk.rmic.jmod</lib>
183+
<lib>${java.home.openjdk11}/jmods/jdk.scripting.nashorn.jmod</lib>
184+
<lib>${java.home.openjdk11}/jmods/jdk.scripting.nashorn.shell.jmod</lib>
185+
<lib>${java.home.openjdk11}/jmods/jdk.sctp.jmod</lib>
186+
<lib>${java.home.openjdk11}/jmods/jdk.security.auth.jmod</lib>
187+
<lib>${java.home.openjdk11}/jmods/jdk.security.jgss.jmod</lib>
188+
<lib>${java.home.openjdk11}/jmods/jdk.unsupported.jmod</lib>
189+
<lib>${java.home.openjdk11}/jmods/jdk.xml.dom.jmod</lib>
190+
<lib>${java.home.openjdk11}/jmods/jdk.zipfs.jmod</lib>
125191
</libs>
126192
</configuration>
127193
</plugin>
@@ -178,7 +244,7 @@
178244
<dependency>
179245
<groupId>org.junit.jupiter</groupId>
180246
<artifactId>junit-jupiter-api</artifactId>
181-
<version>[5.8.2,)</version>
247+
<version>[5.9.1,)</version>
182248
<scope>test</scope>
183249
</dependency>
184250
<dependency>

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.github.javadev</groupId>
55
<artifactId>underscore</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.81-SNAPSHOT</version>
7+
<version>1.82-SNAPSHOT</version>
88
<name>java port of Underscore.js</name>
99
<description>The java port of Underscore.js</description>
1010
<url>https://github.com/javadev/underscore-java</url>
@@ -43,8 +43,8 @@
4343
<artifactId>maven-compiler-plugin</artifactId>
4444
<version>3.10.0</version>
4545
<configuration>
46-
<source>1.8</source>
47-
<target>1.8</target>
46+
<source>11</source>
47+
<target>11</target>
4848
<encoding>UTF-8</encoding>
4949
<compilerArgs>
5050
<arg>-Xlint:unchecked</arg>
@@ -219,7 +219,7 @@
219219
<dependency>
220220
<groupId>org.junit.jupiter</groupId>
221221
<artifactId>junit-jupiter-api</artifactId>
222-
<version>[5.9.0,)</version>
222+
<version>[5.9.1,)</version>
223223
<scope>test</scope>
224224
</dependency>
225225
<dependency>

‎spring-boot-example/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>demo</name>
1414
<description>Demo project for Spring Boot</description>
1515
<properties>
16-
<java.version>1.8</java.version>
16+
<java.version>11</java.version>
1717
</properties>
1818
<repositories>
1919
<repository>
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>com.github.javadev</groupId>
3737
<artifactId>underscore</artifactId>
38-
<version>1.75</version>
38+
<version>1.81</version>
3939
</dependency>
4040
</dependencies>
4141
<build>

0 commit comments

Comments
 (0)