Skip to content

Commit

Permalink
#95 Unified to run all Java 11 (but source=target=8 = java-8 compatib…
Browse files Browse the repository at this point in the history
…le code, producing java-8 compatible binaries
  • Loading branch information
dk1844 committed Jan 25, 2024
1 parent 6eb5576 commit 9a0a4b1
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ jobs:
- name: Setup Scala
uses: olafurpg/setup-scala@v10
with:
java-version: "adopt@1.8"
java-version: "adopt@1.11"
- name: Build and run tests
run: sbt test doc
2 changes: 1 addition & 1 deletion .github/workflows/jacoco_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Setup Scala
uses: olafurpg/setup-scala@v10
with:
java-version: "adopt@1.8"
java-version: "adopt@1.11"
- name: Build and run tests
run: sbt ++${{matrix.scala}} jacoco
- name: Add coverage to PR
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ jobs:
- name: Setup Scala
uses: olafurpg/setup-scala@v10
with:
java-version: "adopt@1.8"
java-version: "adopt@1.11"
- run: sbt headerCheck
2 changes: 1 addition & 1 deletion .github/workflows/publish_lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fetch-depth: 0
- uses: olafurpg/setup-scala@v14
with:
java-version: "openjdk@1.17.0"
java-version: "openjdk@1.11.0"
- name: Build and release to Sonatype and Maven Central
run: sbt ci-release
env:
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ build.log
.bsp

# actual application.yaml (just keeping the example one)
/service/**/main/resources/application.yaml
/service/**/main/resources/local.application.yaml
/api/src/main/resources/application.yaml
/api/src/main/resources/local.application.yaml
4 changes: 2 additions & 2 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# change to OFF to disable SSL
ARG SSL=true
# Tomcat OS base image, feel free to use another (e.g. your hardened one)
ARG BASE_IMAGE=tomcat:9-jdk8-corretto
ARG BASE_IMAGE=tomcat:9-jdk11-corretto

# --- Base image part (common for SSL true|false) ---
FROM $BASE_IMAGE as base
Expand Down Expand Up @@ -52,7 +52,7 @@ COPY $LDAP_SSL_CERTS_PATH/*.pem /opt/certs/

RUN for file in `ls /opt/certs/*.pem`; \
do \
echo yes | keytool -import -file $file -alias ldaps$RANDOM -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit; \
echo yes | keytool -import -file $file -alias ldaps$RANDOM -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit; \
done

# uncomment and add packages you would need to install via yum if any
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ lazy val commonJacocoExcludes: Seq[String] = Seq(
// "za.co.absa.loginsvc.rest.config.BaseConfig" // class only
)

lazy val commonJavacOptions = Seq("-source", "1.8", "-target", "1.8", "-Xlint")
lazy val commonJavacOptions = Seq("-source", "1.8", "-target", "1.8", "-Xlint") // deliberately making backwards compatible with J8

lazy val api = project // no need to define file, because path is same as val name
.settings(
Expand Down

0 comments on commit 9a0a4b1

Please sign in to comment.