Skip to content

Commit

Permalink
Support for Java 17 (winery#691)
Browse files Browse the repository at this point in the history
  • Loading branch information
lharzenetter authored Jan 12, 2023
1 parent 86b6876 commit fe7b0e0
Show file tree
Hide file tree
Showing 61 changed files with 277 additions and 1,119 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- id: skip_check
uses: fkirc/skip-duplicate-actions@master

java11:
java17:
needs: pre_job
if: |
needs.pre_job.outputs.should_skip != 'true'
Expand All @@ -32,14 +32,14 @@ jobs:
run: |
if grep -i -q '\.all()' org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/AbstractResourceTest.java;
then
echo "Log output should be shortend. Use .ifValidationFails()!";
echo "Log output should be shortened. Use .ifValidationFails()!";
exit 1;
fi
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
java-version: 17
cache: 'maven'
- name: Build with Maven
run: mvn -Pjava -B package
Expand All @@ -66,11 +66,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 11
java-version: 17
cache: 'maven'
- name: Build with Maven
run: mvn -Pfrontend -B package
Expand All @@ -82,7 +82,7 @@ jobs:
path: ${{ github.workspace }}/org.eclipse.winery.frontends/target/*.war

dockerBuild:
needs: [ java11, frontend ]
needs: [ java17, frontend ]
runs-on: ubuntu-latest
if: ${{ needs.pre_job.outputs.docker_run_required == 'true' }}
steps:
Expand Down
9 changes: 8 additions & 1 deletion .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM maven:3-openjdk-11 as builder
RUN apt-get update -qq && apt-get install -qqy python build-essential
FROM maven:3-openjdk-17 as builder
#RUN apt-get update -qq && apt-get install -qqy python build-essential
COPY . /tmp/winery
WORKDIR /tmp/winery
RUN mvn package -DskipTests=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -B

FROM tomcat:9-jdk11-openjdk-buster
FROM tomcat:9-jdk17-openjdk-buster
LABEL maintainer = "Oliver Kopp <[email protected]>, Michael Wurster <[email protected]>, Lukas Harzenetter <[email protected]>"

ENV WINERY_USER_ID 1724
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM openjdk:11-jre
FROM openjdk:17
LABEL maintainer "Oliver Kopp <[email protected]>, Lukas Harzenetter <[email protected]>"

RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
RUN apt-get update && apt-get install -y git git-lfs

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.noBuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tomcat:9-jdk11-openjdk-buster
FROM tomcat:9-jdk17-openjdk-buster
LABEL maintainer = "Oliver Kopp <[email protected]>, Michael Wurster <[email protected]>, Lukas Harzenetter <[email protected]>"

ENV WINERY_USER_ID 1724
Expand Down
8 changes: 4 additions & 4 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The project maintains the following source code repository:

== Copyright Holders

Copyright (c) 2012-2022 University of Stuttgart
Copyright (c) 2012-2023 University of Stuttgart
Copyright (c) 2012-2018 C. Timurhan Sungur
Copyright (c) 2012-2018 Oliver Kopp
Copyright (c) 2012-2017 Uwe Breitenbücher
Expand All @@ -38,7 +38,7 @@ Copyright (c) 2016 Andrew Grimberg
Copyright (c) 2016-2017 Armin Hueneburg
Copyright (c) 2016-2018 Kálmán Képes
Copyright (c) 2016-2017 Lukas Balzer
Copyright (c) 2016-2022 Lukas Harzenetter
Copyright (c) 2016-2023 Lukas Harzenetter
Copyright (c) 2016-2017 Nicole Keppler
Copyright (c) 2016-2017 Niko Stadelmaier
Copyright (c) 2016-2017 Philipp Meyer
Expand All @@ -49,7 +49,7 @@ Copyright (c) 2017-2020 Clemens Lieb
Copyright (c) 2017 Heiko Nickerl
Copyright (c) 2017 Huabing Zhao
Copyright (c) 2017 Huixin Liu
Copyright (c) 2017-2021 Karoline Saatkamp
Copyright (c) 2017-2023 Karoline Saatkamp
Copyright (c) 2017 Marvin Wohlfarth
Copyright (c) 2017 Michael Falkenthal
Copyright (c) 2017-2021 Michael Wurster
Expand All @@ -64,7 +64,7 @@ Copyright (c) 2017 ZTE Coperation
Copyright (c) 2018, 2020-2021 Adrian Wersching
Copyright (c) 2018-2021 Björn Müller
Copyright (c) 2018 Christoph Krieger
Copyright (c) 2018-2020 Ghareeb Falazi
Copyright (c) 2018-2023 Ghareeb Falazi
Copyright (c) 2018 Julian Sudendorf
Copyright (c) 2018 Marius Altmann
Copyright (c) 2018 Markus Fischer
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Further development is also funded by the European Union’s Horizon 2020 projec

## License

Copyright (c) 2012-2022 Contributors to the Eclipse Foundation
Copyright (c) 2012-2023 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.
Expand Down
69 changes: 0 additions & 69 deletions docs/config/Eclipse/cleanup.xml

This file was deleted.

111 changes: 0 additions & 111 deletions docs/config/Eclipse/codetemplates.xml

This file was deleted.

Binary file removed docs/config/Eclipse/figures/eclipse_save_actions.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit fe7b0e0

Please sign in to comment.