Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip release]')"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
- name: Set up JDK 8
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'
- name: Test
run: .github/scripts/test.sh
- name: Push git tag
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
- name: Set up JDK 8
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'
- name: Test
run: .github/scripts/test.sh
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Version numbers higher than specified are more likely to work properly.
* Windows 10
* MAC OSX 10
* Linux (Ubuntu 16.04)
* Java 8
* Maven 3.6.3 or later
* Java 17
* Maven 3.9.0 or later

## Prerequisites
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.
Expand Down
28 changes: 18 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,17 @@
</scm>

<properties>
<java.version>1.8</java.version>
<maven.wagon>3.5.1</maven.wagon>
<java.version>17</java.version>
<maven.wagon>3.5.3</maven.wagon>
<maven.lib.dir>/usr/local/Cellar/maven/3.5.3/libexec/lib/ext</maven.lib.dir>
<here.oauth.version>0.4.25</here.oauth.version>
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.15</httpcore.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<httpclient.version>4.5.14</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
<slf4j.version>1.7.24</slf4j.version>
<junit.version>4.13.1</junit.version>
<mockito.version>1.10.19</mockito.version>
<junit.version>4.13.2</junit.version>
<mockito.version>5.12.0</mockito.version>
<commons-io.version>2.16.1</commons-io.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -99,6 +100,13 @@
</exclusions>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand Down Expand Up @@ -163,7 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -176,7 +184,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.5.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -197,7 +205,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.8</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class XRateLimitServiceUnavailableRetryStrategyTest {

@Before
public void setup() {
httpResponse = mock(HttpResponse.class, Answers.RETURNS_DEEP_STUBS.get());
httpContext = mock(HttpContext.class, Answers.RETURNS_DEEP_STUBS.get());
httpResponse = mock(HttpResponse.class, Answers.RETURNS_DEEP_STUBS);
httpContext = mock(HttpContext.class, Answers.RETURNS_DEEP_STUBS);
strategy = new XRateLimitServiceUnavailableRetryStrategy();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.io.IOException;

import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;

public class ArtifactServiceUrlLookupResolverTest {
Expand Down