Refactoring to Java 25

Author: Yuriy Bezsonov

apps/java25/dockerfiles/Dockerfile_01_original

@@ -5,7 +5,7 @@ RUN yum install -y shadow-utils
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn clean package -DskipTests && mv target/store-spring-1.0.0-exec.jar store-spring.jar
+RUN mvn clean package -DskipTests -ntp && mv target/store-spring-1.0.0-exec.jar store-spring.jar
 RUN rm -rf ~/.m2/repository
 
 RUN groupadd --system spring -g 1000

apps/java25/dockerfiles/Dockerfile_02_multistage

@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/maven:3-amazoncorretto-25-al2023 AS builder
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn clean package -DskipTests && mv target/store-spring-1.0.0-exec.jar store-spring.jar
+RUN mvn clean package -DskipTests -ntp && mv target/store-spring-1.0.0-exec.jar store-spring.jar
 
 FROM public.ecr.aws/docker/library/amazoncorretto:25-al2023
 

apps/java25/dockerfiles/Dockerfile_03_otel

@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/maven:3-amazoncorretto-25-al2023 AS builder
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn clean package -DskipTests && mv target/store-spring-1.0.0-exec.jar store-spring.jar
+RUN mvn clean package -DskipTests -ntp && mv target/store-spring-1.0.0-exec.jar store-spring.jar
 
 FROM public.ecr.aws/docker/library/amazoncorretto:25-al2023
 

apps/java25/dockerfiles/Dockerfile_04_optimized_JVM

@@ -5,7 +5,7 @@ RUN yum install -y tar gzip unzip
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn clean package -DskipTests && \
+RUN mvn clean package -DskipTests -ntp && \
     mv target/store-spring-1.0.0-exec.jar target/store-spring.jar && \
     cd target && unzip store-spring.jar
 

apps/java25/dockerfiles/Dockerfile_05_native

@@ -13,7 +13,7 @@ COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
 ENV MAVEN_OPTS='-Xmx8g'
-RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && mvn -DskipTests clean package -Pnative"
+RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && mvn -DskipTests -ntp clean package -Pnative"
 
 FROM public.ecr.aws/docker/library/amazoncorretto:25-al2023
 

apps/java25/dockerfiles/Dockerfile_06_SOCI

@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/maven:3-amazoncorretto-25-al2023 AS builder
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn clean package -DskipTests -Psoci && \
+RUN mvn clean package -DskipTests -ntp -Psoci && \
     mv target/store-spring-1.0.0.jar store-spring.jar && \
     java -Djarmode=layertools -jar store-spring.jar extract
 

apps/java25/dockerfiles/Dockerfile_07_AOT

@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/maven:3-amazoncorretto-25-al2023 AS builder
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn -DskipTests clean compile spring-boot:process-aot package && \
+RUN mvn -DskipTests -ntp clean compile spring-boot:process-aot package && \
     mv target/store-spring-1.0.0-exec.jar app.jar
 
 FROM public.ecr.aws/docker/library/amazoncorretto:25-al2023 AS trainer

apps/java25/dockerfiles/Dockerfile_08_CDS

@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/maven:3-amazoncorretto-25-al2023 AS builder
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn clean package -DskipTests && mv target/store-spring-1.0.0-exec.jar store-spring.jar
+RUN mvn clean package -DskipTests -ntp && mv target/store-spring-1.0.0-exec.jar store-spring.jar
 
 FROM public.ecr.aws/docker/library/amazoncorretto:25-al2023 AS trainer
 

apps/java25/unicorn-store-spring/Dockerfile

@@ -5,7 +5,7 @@ RUN yum install -y shadow-utils
 COPY ./pom.xml ./pom.xml
 COPY src ./src/
 
-RUN mvn clean package -DskipTests && mv target/store-spring-1.0.0-exec.jar store-spring.jar
+RUN mvn clean package -DskipTests -ntp && mv target/store-spring-1.0.0-exec.jar store-spring.jar
 RUN rm -rf ~/.m2/repository
 
 RUN groupadd --system spring -g 1000

infra/scripts/setup/unicorn-store-spring.sh

@@ -46,12 +46,26 @@ fi
 cp -r ~/java-on-aws/apps/java25/jvm-ai-analyzer ~/environment/
 log_success "Copied jvm-ai-analyzer to ~/environment"
 
+# Configure global git user
+log_info "Configuring global git user..."
+git config --global user.name "Workshop User"
+git config --global user.email "user@sample.com"
+log_success "Git user configured: Workshop User <user@sample.com>"
+
+# Initialize git repository in unicorn-store-spring
+log_info "Initializing git repository in unicorn-store-spring..."
+cd ~/environment/unicorn-store-spring
+git init
+git add .
+git commit -m "Initial commit"
+log_success "Git repository initialized with initial commit"
+
 # Change to the app directory
 cd ~/environment/unicorn-store-spring
 
 # Build the application with Maven
 log_info "Building application with Maven..."
-mvn clean package -DskipTests -ntp
+mvn clean package -ntp
 log_success "Maven build completed"
 
 # Login to ECR