Skip to content

Commit

Permalink
java 21 support (also in docker)
Browse files Browse the repository at this point in the history
  • Loading branch information
danigiri committed Oct 2, 2024
1 parent 962bd40 commit 731fe48
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM eclipse-temurin:20 AS build
FROM eclipse-temurin:21 AS build

LABEL maintainer="Daniel Giribet - dani [at] calidos [dot] cat"
# docker build -t morfeu-webapp:latest --build-arg PROXY='http://192.168.1.30:3128/' --build-arg PROXY_HOST=192.168.1.30 --build-arg PROXY_PORT=3128 .

# variables build stage
ARG MORFEU_VERSION=v0.8.20
ARG MORFEU_VERSION=v0.8.22
ARG MAVEN_URL=https://archive.apache.org/dist/maven/maven-3/3.9.8/binaries/apache-maven-3.9.8-bin.tar.gz
ENV MORFEU_VERSION=${MORFEU_VERSION}
ENV MAVEN_HOME /usr/share/maven
Expand Down Expand Up @@ -58,7 +58,7 @@ RUN /usr/bin/mvn test war:war package
#RUN echo 'build finished'


FROM eclipse-temurin:20 AS main
FROM eclipse-temurin:21 AS main

# arguments and variables run stage
ENV JETTY_HOME /var/lib/jetty
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<scm.host_>github.com</scm.host_>
<developer.id_>danigiri</developer.id_>
<maven.compiler.release>20</maven.compiler.release>
<maven.compiler.release>21</maven.compiler.release>
<angular.folder_>src/main/angular</angular.folder_> <!-- release perform /target/ folder -->
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,16 @@ interface Builder {
}

/*
* Copyright 2024 Daniel Giribet
* Copyright 2024 Daniel Giribet
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/

0 comments on commit 731fe48

Please sign in to comment.