Skip to content

Java11 upgrade #19

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

Merged
yingbull merged 5 commits into from
Nov 13, 2024
Merged

Java11 upgrade #19

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
1db9821
fix: reverted tomcat to previous version with java11
garciaerin Nov 8, 2024
873cb07
fix: compilation errors when building the application
garciaerin Nov 8, 2024
0d062df
fix: removed the maven.compiler property in pom.xml
garciaerin Nov 11, 2024
6dd838e
update: tomcat9.0.56 to tomcat 9.0.97
garciaerin Nov 13, 2024
8ee12fb
fix: OpenJDK version of java 11
garciaerin Nov 13, 2024
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
13 changes: 10 additions & 3 deletions .devcontainer/development/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
FROM tomcat:9.0.56-jdk8-openjdk
FROM openjdk:11-jdk-slim

# Set environment variables for Tomcat
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH

# Copy Tomcat installation from the official Tomcat image
COPY --from=tomcat:9.0.97 /usr/local/tomcat $CATALINA_HOME

# Labels
LABEL author="OpenOSP" \
Expand All @@ -16,8 +23,8 @@ WORKDIR /workspace
RUN apt-get update && apt-get install -y --no-install-recommends \
dos2unix curl git wget apt-transport-https ca-certificates gnupg lsb-release \
locales iputils-ping gettext fontconfig libc6 libfreetype6 libjpeg62-turbo \
libpng16-16 libssl1.1 libstdc++6 libx11-6 libxcb1 libxext6 libxtst6 \
libxrender1 xfonts-75dpi xfonts-base zlib1g maven mariadb-client \
libpng16-16 libssl-dev libstdc++6 libx11-6 libxcb1 libxext6 libxtst6 \
libxrender1 libxi6 xfonts-75dpi xfonts-base zlib1g maven mariadb-client \
nano openssh-client vim-tiny \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

Expand Down
32 changes: 24 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,12 +1431,28 @@
<version>4.4.1</version>
</dependency>
<!-- Coming soon: JAVA 11 -->
<!--<dependency>-->
<!-- <groupId>com.sun.xml.ws</groupId>-->
<!-- <artifactId>jaxws-ri</artifactId>-->
<!-- <version>2.3.0</version>-->
<!-- <type>pom</type>-->
<!--</dependency>-->
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
<version>2.3.3</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<!-- Added for Tomcat9.0.97 -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
Expand Down Expand Up @@ -1534,8 +1550,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>

Expand Down