Skip to content

Commit

Permalink
feat: java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
Nolife999 committed Jan 4, 2024
1 parent 27560aa commit 95c58df
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-on-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Verify with Maven
run: mvn verify
push_to_registry:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Package with Maven
run: mvn package
- uses: ncipollo/release-action@v1
Expand Down
4 changes: 2 additions & 2 deletions app-web.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ COPY . /usr/src/app/
# Run a conditional script for the maven build
RUN chmod +x usr/src/app/script.sh && usr/src/app/script.sh

# Get a tomcat 8.5
FROM tomcat:8.5
# Get a tomcat
FROM tomcat:9-jdk17

# Clean it
RUN rm -rf $CATALINA_HOME/webapps/*
Expand Down
4 changes: 2 additions & 2 deletions app-ws.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ COPY . /usr/src/app/
# Run a conditional script for the maven build
RUN chmod +x usr/src/app/script.sh && usr/src/app/script.sh

# Get a tomcat 8.5
FROM tomcat:8.5
# Get a tomcat
FROM tomcat:9-jdk17

# Clean it
RUN rm -rf $CATALINA_HOME/webapps/*
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.springboot.version>2.6.7</project.springboot.version>
<project.jackson.version>2.13.2</project.jackson.version>
<project.postgres.version>42.5.1</project.postgres.version>
<project.java.version>11</project.java.version>
<project.java.version>17</project.java.version>
<project.maven.compiler.version>3.11.0</project.maven.compiler.version>

<project.org.json>20231013</project.org.json>
Expand Down

0 comments on commit 95c58df

Please sign in to comment.