Skip to content

Commit

Permalink
JAVA 11
Browse files Browse the repository at this point in the history
  • Loading branch information
phavekes committed May 14, 2024
1 parent 53cd883 commit cb0e89b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 1.8
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '11'
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Codecov
uses: codecov/codecov-action@v1.3.1
uses: codecov/codecov-action@v4
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
- name: Set up JAVA 8
uses: actions/setup-java@v4
with:
java-version: 8
java-version: 11
distribution: "temurin"

- name: Determine the version
run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_OUTPUT
id: versioncheck

- name: Exit when workflow_dispatch is triggered, and the version does not contain SNAPSHOT in it's name
- name: Exit when workflow_dispatch is triggered, and the version does not contain SNAPSHOT in the name
run: |
echo "Only SNAPSHOT releases can be triggered with the workflow_dispatch"
exit 1
Expand All @@ -41,21 +41,21 @@ jobs:
exit 1
if: github.event_name != 'workflow_dispatch' && steps.versioncheck.outputs.version != github.ref_name

- name: Set up JDK 8 for snapshots
- name: Set up JDK 11 for snapshots
uses: actions/setup-java@v4
with:
java-version: "8"
java-version: "11"
distribution: "temurin"
cache: "maven"
server-id: openconext-snapshots
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
if: ( endsWith(steps.versioncheck.outputs.version, '-SNAPSHOT'))

- name: Set up JDK 8 for releases
- name: Set up JDK 11 for releases
uses: actions/setup-java@v4
with:
java-version: "8"
java-version: "11"
distribution: "temurin"
cache: "maven"
server-id: openconext-releases
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}

- name: Codecov
uses: codecov/codecov-action@v3.1.1
uses: codecov/codecov-action@v4

- name: Create release
uses: actions/create-release@v1
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:8-jdk-alpine
FROM eclipse-temurin:11-jdk-alpine
RUN apk --update upgrade && apk add openssl openssl-dev ca-certificates libgcc && update-ca-certificates
COPY target/*.jar app.jar
ENTRYPOINT ["java","-jar","/app.jar"]
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<description>home-institution-mock</description>

<properties>
<java.version>1.8</java.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<java.version>11</java.version>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ logging:
level:
root: warn
home: debug
org.springframework: trace
org.springframework: info

delay:
enabled: true
Expand Down

0 comments on commit cb0e89b

Please sign in to comment.