Atualizado para Java 21

.docker/Dockerfile

@@ -1,6 +1,6 @@
 # Stage 1
 # Build
-FROM maven:3-openjdk-17 AS build
+FROM maven:3-amazoncorretto-21-debian AS build
 WORKDIR /apsso/
 COPY pom.xml /apsso/
 COPY /backend/pom.xml /apsso/backend/
@@ -9,6 +9,9 @@ RUN mvn --projects login -U clean package --file /apsso/pom.xml -DskipTests
 
 # Stage 2
 # Deploy
-FROM tomcat:10-jre17
+FROM tomcat:10-jdk21-openjdk
 COPY --from=build /apsso/login/target/login.war /usr/local/tomcat/webapps/ROOT.war
 RUN sed -i 's/port="8080"/port="30000"/' ${CATALINA_HOME}/conf/server.xml
+EXPOSE 30000
+
+{bcrypt}$2a$10$DrggBKNTQujqeW2xPABOEuM1GgL.6VvdiZAP/hzChWxTj6TiWyLym

.docker/Dockerfile.backend

@@ -1,6 +1,6 @@
 # Stage 1
 # Build
-FROM maven:3-openjdk-17 AS build
+FROM maven:3-amazoncorretto-21-debian AS build
 WORKDIR /apsso/
 COPY pom.xml /apsso/
 COPY /login/pom.xml /apsso/login/
@@ -9,6 +9,8 @@ RUN mvn --projects backend -U clean package --file /apsso/pom.xml -DskipTests
 
 # Stage 2
 # Deploy
-FROM tomcat:10-jre17
-COPY --from=build /apsso/backend/target/backend.war /usr/local/tomcat/webapps/ROOT.war
-RUN sed -i 's/port="8080"/port="30001"/' ${CATALINA_HOME}/conf/server.xml
+FROM amazoncorretto:21
+WORKDIR /backend
+COPY --from=build /apsso/backend/target/backend.jar /backend/backend.jar
+ENTRYPOINT [ "java", "-jar", "/backend/backend.jar" ]
+EXPOSE 30001

.docker/Dockerfile.backend.pipeline

@@ -1,3 +1,5 @@
-FROM tomcat:10-jre17
-COPY backend/target/backend.war /usr/local/tomcat/webapps/ROOT.war
-RUN sed -i 's/port="8080"/port="30001"/' ${CATALINA_HOME}/conf/server.xml
+FROM amazoncorretto:21
+WORKDIR /backend
+COPY backend/target/backend.jar /backend/backend.jar
+ENTRYPOINT [ "java", "-jar", "/backend/backend.jar" ]
+EXPOSE 30001

.docker/Dockerfile.pipeline

@@ -1,3 +1,3 @@
-FROM tomcat:10-jre17
+FROM tomcat:10-jdk21-openjdk
 COPY login/target/login.war /usr/local/tomcat/webapps/ROOT.war
 RUN sed -i 's/port="8080"/port="30000"/' ${CATALINA_HOME}/conf/server.xml

.docker/docker-compose-debug.yml

@@ -14,7 +14,7 @@ services:
       - 50000:50000
 
   apsso:
-    image: tomcat:10-jre17
+    image: tomcat:10-jdk21-openjdk
     container_name: apsso
     environment:
       - "JPDA_ADDRESS=*:8001"

.github/workflows/build.yml

@@ -36,10 +36,10 @@ jobs:
       - name: Buildar frontend do módulo administrativo
         run: npm --prefix ./frontend run build --omit=dev
 
-      - name: Usar JDK 17
+      - name: Usar JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'corretto'
           cache: 'maven'
 

.run/Backend UP.run.xml

@@ -1,9 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Backend UP" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-21" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="backend" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="com.github.andrepenteado.apsso.backend.ApssoBackendApplication" />
     <method v="2">
-      <option name="Make" enabled="true" />
+      <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/pom.xml" goal="clean package --projects backend -DskipTests" />
     </method>
   </configuration>
 </component>

.tool-versions

@@ -1,2 +1,3 @@
 nodejs lts-gallium
-java openjdk-17
+java corretto-21.0.0.35.1
+maven 3.9.4

Makefile

@@ -2,17 +2,17 @@ VERSAO_APP := $(shell mvn help:evaluate -Dexpression=project.version -q -DforceS
 
 build-login:
 	docker build -f .docker/Dockerfile -t ghcr.io/andrepenteado/apsso/apsso -t ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP) .
-	echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
-	docker push ghcr.io/andrepenteado/apsso/apsso
-	docker push ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP)
-	docker logout ghcr.io
+	#echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
+	#docker push ghcr.io/andrepenteado/apsso/apsso
+	#docker push ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP)
+	#docker logout ghcr.io
 
 build-backend:
 	docker build -f .docker/Dockerfile.backend -t ghcr.io/andrepenteado/apsso/apsso-backend -t ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP) .
-	echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
-	docker push ghcr.io/andrepenteado/apsso/apsso-backend
-	docker push ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP)
-	docker logout ghcr.io
+	#echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
+	#docker push ghcr.io/andrepenteado/apsso/apsso-backend
+	#docker push ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP)
+	#docker logout ghcr.io
 
 start:
 	docker compose -f .docker/docker-compose.yml up -d

backend/pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.github.andrepenteado.sso</groupId>
     <artifactId>backend</artifactId>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
     <name>Backend do Módulo Administrativo</name>
 

pom.xml

@@ -30,14 +30,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
 
     <modules>