Skip to content

Commit 8684ffb

Browse files
authored
Merge pull request #1389 from WildMeOrg/cleanup-webxml-java-17
Legacy code cleanup and Java 17 upgrades
2 parents c5d3fcf + f851790 commit 8684ffb

File tree

307 files changed

+3637
-65718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+3637
-65718
lines changed

.github/workflows/codecov-report.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111

1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
# Set up Java for backend tests
1717
- name: Set up Java
18-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'zulu'
21-
java-version: '8'
21+
java-version: '17'
2222

2323
# Set up Node.js for frontend tests
2424
- name: Set up Node.js
25-
uses: actions/setup-node@v4
25+
uses: actions/setup-node@v6
2626
with:
2727
node-version: '20'
2828

@@ -54,7 +54,7 @@ jobs:
5454

5555
# Upload test results and coverage
5656
- name: Upload coverage results
57-
uses: actions/upload-artifact@v4
57+
uses: actions/upload-artifact@v5
5858
with:
5959
name: test-results
6060
path: |

.github/workflows/dev-maven-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- name: Set up JDK 8*
18-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'zulu'
21-
java-version: 8
21+
java-version: '17'
2222

2323
- name: Build with Maven
2424
run: |

.github/workflows/master-maven-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919

2020
- name: Set up JDK 8*
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
distribution: 'zulu'
24-
java-version: 8
24+
java-version: '17'
2525

2626
- name: Build with Maven
2727
run: |

.github/workflows/release-maven-publish.yml

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

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Set up JDK 8*
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
distribution: 'zulu'
20-
java-version: 8
20+
java-version: '17'
2121

2222
- name: Release
23-
uses: qcastel/github-actions-maven-release@v1.12.43
23+
uses: qcastel/github-actions-maven-release@v1.12.44
2424
env:
2525
JAVA_HOME: /usr/lib/jvm/zulu-8/
2626
with:

devops/deploy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the base Tomcat image
2-
FROM tomcat:9.0.85-jre8-temurin-jammy
2+
FROM tomcat:9.0.113-jre17-temurin-jammy
33

44
RUN mkdir -p /usr/local/tomcat/webapps/wildbook_data_dir/WEB-INF/classes/bundles
55

devops/deploy/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ services:
3535
WILDBOOK_DB_PASSWORD: "${WILDBOOK_DB_PASSWORD}"
3636

3737
wildbook:
38-
image: tomcat:9.0.85-jre8-temurin-jammy
38+
image: tomcat:9.0.113-jre17-temurin-jammy
3939
depends_on:
4040
db:
4141
condition: service_healthy

devops/development/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the base Tomcat image
2-
FROM tomcat:9.0.85-jre8-temurin-jammy
2+
FROM tomcat:9.0.113-jre17-temurin-jammy
33

44
RUN mkdir -p /usr/local/tomcat/webapps/wildbook_data_dir/WEB-INF/classes/bundles
55

devops/development/docker-compose-wbia.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
WILDBOOK_DB_PASSWORD: "${WILDBOOK_DB_PASSWORD}"
3232

3333
wildbook:
34-
image: tomcat:9.0.85-jre8-temurin-jammy
34+
image: tomcat:9.0.113-jre17-temurin-jammy
3535
depends_on:
3636
db:
3737
condition: service_healthy

devops/development/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
WILDBOOK_DB_PASSWORD: "${WILDBOOK_DB_PASSWORD}"
3131

3232
wildbook:
33-
image: tomcat:9.0.85-jre8-temurin-jammy
33+
image: tomcat:9.0.113-jre17-temurin-jammy
3434
depends_on:
3535
db:
3636
condition: service_healthy

0 commit comments

Comments
 (0)