Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use Java 11 as compiler target #341

Merged
merged 5 commits into from
Aug 11, 2023
Merged

feat: use Java 11 as compiler target #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ada2cca
feat: declare java 11 as source target
kschrab Aug 8, 2023
b471e5e
Merge remote-tracking branch 'origin/main' into 640-jdk-11
kschrab Aug 8, 2023
e3d2d79
ci: use JDK11 in Jenkins pipeline
kschrab Aug 9, 2023
7ef9435
doc: adjust Java version in README
kschrab Aug 9, 2023
224dd49
ci: adjust Github action
kschrab Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Build with Maven
run: mvn -B package --file pom.xml
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ kind: Pod
spec:
containers:
- name: maven-sumo
image: eclipsemosaic/mosaic-ci:jdk8-sumo-1.18.0
image: eclipsemosaic/mosaic-ci:jdk11-sumo-1.18.0
command:
- cat
tty: true
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ For further questions we are available via [email protected]
For a successful build you need the following software to be installed:

* **Maven 3.1.x** or higher.
* **Java 8, 11, or 17** - We recommend using the [Adoptium OpenJDK (aka Eclipse Temurin)](https://adoptium.net/?variant=openjdk8).
* **Java 11, or 17** - We recommend using the [Adoptium OpenJDK (aka Eclipse Temurin)](https://adoptium.net/?variant=openjdk11).
* **SUMO 1.18.0** - Additionally, the environment variable `SUMO_HOME` should be configured properly.

## Build
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<properties>
<mosaic.version>23.1-SNAPSHOT</mosaic.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceTarget>1.8</project.build.sourceTarget>
<project.build.sourceTarget>11</project.build.sourceTarget>
<skip.coverage>true</skip.coverage>
<skip.javadoc>true</skip.javadoc>
<version.commons-cli>1.4</version.commons-cli><!-- 1.4 is approved in CQ19371 -->
Expand Down
2 changes: 1 addition & 1 deletion test/ci/ci-image-mvn-sumo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.6.3-adoptopenjdk-8
FROM maven:3.6.3-adoptopenjdk-11

ENV DEBIAN_FRONTEND=noninteractive
ENV USER_NAME=jenkins
Expand Down
4 changes: 2 additions & 2 deletions test/ci/ci-image-mvn-sumo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ build and tag the docker image with the latest SUMO version. This image should b
and available in the PPA.

```shell script
docker build . -t eclipsemosaic/mosaic-ci:jdk8-sumo-1.18.0
docker build . -t eclipsemosaic/mosaic-ci:jdk11-sumo-1.18.0
docker login
docker push eclipsemosaic/mosaic-ci:jdk8-sumo-1.18.0
docker push eclipsemosaic/mosaic-ci:jdk11-sumo-1.18.0
```

Afterwards, the image should be available here: https://hub.docker.com/r/eclipsemosaic/mosaic-ci/tags
Expand Down
Loading