Skip to content

Commit

Permalink
Merge pull request #84 from snyk/dotkas/more-sos-fixes
Browse files Browse the repository at this point in the history
Breaking Change: [OSM-627] Updating JCenter repository, bumping Artifactory plugins, dropping Java 11 support
  • Loading branch information
dotkas authored Sep 6, 2023
2 parents b2e8d25 + 1474ab1 commit 4692bf8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Fetch sources
uses: actions/checkout@v2

- name: Setup JDK 11
- name: Setup JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Cache local Maven repository
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/smoke_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Fetch sources
uses: actions/checkout@v2

- name: Setup JDK 11
- name: Setup JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Cache local Maven repository
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [11]
java: [17, 20]
steps:
- name: Fetch sources
uses: actions/checkout@v2
Expand Down
17 changes: 3 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
| dependency and plugin versions, please keep alphabetical.
| each version property should be of the form "version.<identifier>".
-->
<version.artifactory.api>7.12.5</version.artifactory.api>
<version.artifactory.api>7.63.15</version.artifactory.api>
<version.jsr305.annotations>3.0.2</version.jsr305.annotations>
<version.junit5>5.4.2</version.junit5>
<version.maven.assembly.plugin>3.1.1</version.maven.assembly.plugin>
Expand Down Expand Up @@ -108,17 +108,6 @@

<dependencyManagement>
<dependencies>
<!--
Overrides of transitive deps that have not been fixed in the top level dependency yet.
Maybe circle back to these from time to time to see if the top level dependency was eventually fixed.
-->
<!-- Transitive of artifactory-papi -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.20</version>
</dependency>
<!-- End of overrides -->
<dependency>
<groupId>org.artifactory</groupId>
<artifactId>artifactory-papi</artifactId>
Expand Down Expand Up @@ -160,8 +149,8 @@

<repositories>
<repository>
<id>jcenter</id>
<url>https://jcenter.bintray.com/</url>
<id>jfrog</id>
<url>https://releases.jfrog.io/artifactory/jcenter/</url>
</repository>
</repositories>
</project>

0 comments on commit 4692bf8

Please sign in to comment.