Skip to content

Commit 882461c

Browse files
author
Roman Ivanov
committed
SDKJAVA-406: JAVA 17
Signed-off-by: Roman Ivanov <ext-roman.ivanov@here.com>
1 parent 1c6cb5c commit 882461c

File tree

6 files changed

+54
-47
lines changed

6 files changed

+54
-47
lines changed

.github/workflows/release.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ jobs:
1111
if: "!contains(github.event.head_commit.message, '[skip release]')"
1212

1313
steps:
14-
- uses: actions/checkout@v2
15-
with:
16-
ref: master
17-
fetch-depth: 0
18-
- name: Set up JDK 8
19-
uses: actions/setup-java@v2
20-
with:
21-
java-version: '8'
22-
distribution: 'adopt'
23-
- name: Test
24-
run: .github/scripts/test.sh
25-
- name: Push git tag
26-
run: .github/scripts/push-tag.sh
27-
- name: Deploy Release
28-
env:
29-
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
30-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
31-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
32-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
33-
GPG_PRIVATE_KEY: ${{ secrets.GPG_KEY }}
34-
run: .github/scripts/deploy.sh
14+
- uses: actions/checkout@v4
15+
with:
16+
ref: master
17+
fetch-depth: 0
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@v4
20+
with:
21+
java-version: '17'
22+
distribution: 'temurin'
23+
- name: Test
24+
run: .github/scripts/test.sh
25+
- name: Push git tag
26+
run: .github/scripts/push-tag.sh
27+
- name: Deploy Release
28+
env:
29+
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
30+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
31+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
32+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
33+
GPG_PRIVATE_KEY: ${{ secrets.GPG_KEY }}
34+
run: .github/scripts/deploy.sh

.github/workflows/test.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
test:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
17-
with:
18-
ref: ${{ github.event.pull_request.head.sha }}
19-
fetch-depth: 0
20-
- name: Set up JDK 8
21-
uses: actions/setup-java@v2
22-
with:
23-
java-version: '8'
24-
distribution: 'adopt'
25-
- name: Test
26-
run: .github/scripts/test.sh
16+
- uses: actions/checkout@v4
17+
with:
18+
ref: ${{ github.event.pull_request.head.sha }}
19+
fetch-depth: 0
20+
- name: Set up JDK 17
21+
uses: actions/setup-java@v4
22+
with:
23+
java-version: '17'
24+
distribution: 'temurin'
25+
- name: Test
26+
run: .github/scripts/test.sh

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Version numbers higher than specified are more likely to work properly.
1919
* Windows 10
2020
* MAC OSX 10
2121
* Linux (Ubuntu 16.04)
22-
* Java 8
23-
* Maven 3.6.3 or later
22+
* Java 17
23+
* Maven 3.9.X or later
2424

2525
## Prerequisites
2626
To access libraries and schemas from the HERE platform, you need a HERE Workspace and/or a HERE Marketplace account. If you don’t have an account yet, go to [Pricing and Plans](https://www.here.com/get-started/pricing) to apply for a free trial.

pom.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,17 @@
4747
</scm>
4848

4949
<properties>
50-
<java.version>1.8</java.version>
51-
<maven.wagon>3.5.1</maven.wagon>
50+
<java.version>17</java.version>
51+
<maven.wagon>3.5.3</maven.wagon>
5252
<maven.lib.dir>/usr/local/Cellar/maven/3.5.3/libexec/lib/ext</maven.lib.dir>
5353
<here.oauth.version>0.4.25</here.oauth.version>
54-
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
55-
<httpclient.version>4.5.13</httpclient.version>
56-
<httpcore.version>4.4.15</httpcore.version>
54+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
55+
<httpclient.version>4.5.14</httpclient.version>
56+
<httpcore.version>4.4.16</httpcore.version>
5757
<slf4j.version>1.7.24</slf4j.version>
58-
<junit.version>4.13.1</junit.version>
59-
<mockito.version>1.10.19</mockito.version>
58+
<junit.version>4.13.2</junit.version>
59+
<mockito.version>5.12.0</mockito.version>
60+
<commons-io.version>2.16.1</commons-io.version>
6061
</properties>
6162

6263
<dependencies>
@@ -99,6 +100,13 @@
99100
</exclusions>
100101
</dependency>
101102

103+
<dependency>
104+
<groupId>commons-io</groupId>
105+
<artifactId>commons-io</artifactId>
106+
<version>${commons-io.version}</version>
107+
<scope>test</scope>
108+
</dependency>
109+
102110
<dependency>
103111
<groupId>org.apache.httpcomponents</groupId>
104112
<artifactId>httpcore</artifactId>
@@ -163,7 +171,7 @@
163171
<plugin>
164172
<groupId>org.apache.maven.plugins</groupId>
165173
<artifactId>maven-source-plugin</artifactId>
166-
<version>3.0.1</version>
174+
<version>3.3.0</version>
167175
<executions>
168176
<execution>
169177
<id>attach-sources</id>
@@ -176,7 +184,7 @@
176184
<plugin>
177185
<groupId>org.apache.maven.plugins</groupId>
178186
<artifactId>maven-javadoc-plugin</artifactId>
179-
<version>2.10.4</version>
187+
<version>3.5.0</version>
180188
<executions>
181189
<execution>
182190
<id>attach-javadocs</id>
@@ -197,7 +205,7 @@
197205
<plugin>
198206
<groupId>org.apache.maven.plugins</groupId>
199207
<artifactId>maven-gpg-plugin</artifactId>
200-
<version>1.6</version>
208+
<version>3.2.8</version>
201209
<executions>
202210
<execution>
203211
<id>sign-artifacts</id>

src/test/java/com/here/platform/artifact/maven/wagon/XRateLimitServiceUnavailableRetryStrategyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public class XRateLimitServiceUnavailableRetryStrategyTest {
4141

4242
@Before
4343
public void setup() {
44-
httpResponse = mock(HttpResponse.class, Answers.RETURNS_DEEP_STUBS.get());
45-
httpContext = mock(HttpContext.class, Answers.RETURNS_DEEP_STUBS.get());
44+
httpResponse = mock(HttpResponse.class, Answers.RETURNS_DEEP_STUBS);
45+
httpContext = mock(HttpContext.class, Answers.RETURNS_DEEP_STUBS);
4646
strategy = new XRateLimitServiceUnavailableRetryStrategy();
4747
}
4848

src/test/java/com/here/platform/artifact/maven/wagon/resolver/ArtifactServiceUrlLookupResolverTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.io.IOException;
3030

3131
import static org.junit.Assert.assertEquals;
32-
import static org.mockito.Matchers.any;
3332
import static org.mockito.Mockito.*;
3433

3534
public class ArtifactServiceUrlLookupResolverTest {

0 commit comments

Comments
 (0)