From 282fd78425d627f9c395b258a137b429b109e230 Mon Sep 17 00:00:00 2001 From: openeuler_bot Date: Fri, 12 Dec 2025 00:13:09 +0000 Subject: [PATCH] 24.03-lts-sp2 update spring-framework to 7.0.2 --- .../7.0.2/24.03-lts-sp2/Dockerfile | 28 ++++++++++++ .../24.03-lts-sp2/example/AppConfig.java | 9 ++++ .../24.03-lts-sp2/example/HelloService.java | 10 +++++ .../7.0.2/24.03-lts-sp2/example/MainApp.java | 12 +++++ .../7.0.2/24.03-lts-sp2/pom.xml.template | 44 +++++++++++++++++++ Others/spring-framework/README.md | 1 + Others/spring-framework/doc/image-info.yml | 1 + Others/spring-framework/meta.yml | 4 +- 8 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 Others/spring-framework/7.0.2/24.03-lts-sp2/Dockerfile create mode 100644 Others/spring-framework/7.0.2/24.03-lts-sp2/example/AppConfig.java create mode 100644 Others/spring-framework/7.0.2/24.03-lts-sp2/example/HelloService.java create mode 100644 Others/spring-framework/7.0.2/24.03-lts-sp2/example/MainApp.java create mode 100644 Others/spring-framework/7.0.2/24.03-lts-sp2/pom.xml.template diff --git a/Others/spring-framework/7.0.2/24.03-lts-sp2/Dockerfile b/Others/spring-framework/7.0.2/24.03-lts-sp2/Dockerfile new file mode 100644 index 00000000..bc3a8cff --- /dev/null +++ b/Others/spring-framework/7.0.2/24.03-lts-sp2/Dockerfile @@ -0,0 +1,28 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} +ARG TARGETARCH +ARG VERSION=6.2.6 + +RUN dnf update -y \ + && dnf install -y java-17-openjdk gettext wget \ + && dnf clean all \ + && rm -rf /var/cache/dnf/* + +ARG MAVEN_VERSION=3.9.11 +RUN wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \ + && mkdir -p /usr/local/maven \ + && tar -zxvf apache-maven-3.9.11-bin.tar.gz -C /usr/local/maven --strip-components=1 + +ENV PATH=/usr/local/maven/bin:$PATH + +WORKDIR /home/spring-framework +COPY example src/main/java/com/example +COPY pom.xml.template pom.xml.template + +ENV SPRING_VERSION=${VERSION} + +RUN envsubst < pom.xml.template > pom.xml \ + && mvn clean compile dependency:build-classpath -Dmdep.outputFile=target/classpath.txt + +CMD CLASS_PATH="target/classes:$(cat target/classpath.txt)" && \ + java -cp "$CLASS_PATH" com.example.MainApp \ No newline at end of file diff --git a/Others/spring-framework/7.0.2/24.03-lts-sp2/example/AppConfig.java b/Others/spring-framework/7.0.2/24.03-lts-sp2/example/AppConfig.java new file mode 100644 index 00000000..2b8cc986 --- /dev/null +++ b/Others/spring-framework/7.0.2/24.03-lts-sp2/example/AppConfig.java @@ -0,0 +1,9 @@ +package com.example; + +import org.springframework.context.annotation.*; + +@Configuration +@ComponentScan("com.example") +public class AppConfig { + +} diff --git a/Others/spring-framework/7.0.2/24.03-lts-sp2/example/HelloService.java b/Others/spring-framework/7.0.2/24.03-lts-sp2/example/HelloService.java new file mode 100644 index 00000000..429261ea --- /dev/null +++ b/Others/spring-framework/7.0.2/24.03-lts-sp2/example/HelloService.java @@ -0,0 +1,10 @@ +package com.example; + +import org.springframework.stereotype.Component; + +@Component +public class HelloService { + public void sayHello() { + System.out.println("Hello, Spring Framework!"); + } +} diff --git a/Others/spring-framework/7.0.2/24.03-lts-sp2/example/MainApp.java b/Others/spring-framework/7.0.2/24.03-lts-sp2/example/MainApp.java new file mode 100644 index 00000000..c72324b1 --- /dev/null +++ b/Others/spring-framework/7.0.2/24.03-lts-sp2/example/MainApp.java @@ -0,0 +1,12 @@ +package com.example; + +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +public class MainApp { + public static void main(String[] args) { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(AppConfig.class); + HelloService helloService = context.getBean(HelloService.class); + helloService.sayHello(); + context.close(); + } +} diff --git a/Others/spring-framework/7.0.2/24.03-lts-sp2/pom.xml.template b/Others/spring-framework/7.0.2/24.03-lts-sp2/pom.xml.template new file mode 100644 index 00000000..555ade97 --- /dev/null +++ b/Others/spring-framework/7.0.2/24.03-lts-sp2/pom.xml.template @@ -0,0 +1,44 @@ + + 4.0.0 + + com.example + spring-framework-demo + 1.0-SNAPSHOT + + + 17 + ${SPRING_VERSION} + + + + + + org.springframework + spring-context + ${spring.version} + + + + org.springframework + spring-aop + ${spring.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + ${java.version} + ${java.version} + + + + + diff --git a/Others/spring-framework/README.md b/Others/spring-framework/README.md index dbb60b97..19534d6d 100644 --- a/Others/spring-framework/README.md +++ b/Others/spring-framework/README.md @@ -20,6 +20,7 @@ The tag of each `spring-framework` docker image is consist of the version of `sp | Tag | Currently | Architectures | |---------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------|---------------| +|[7.0.2-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/7.0.2/24.03-lts-sp2/Dockerfile) | spring 7.0.2 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[6.2.11-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/6.2.11/24.03-lts-sp2/Dockerfile) | spring 6.2.11 on openEuler 24.03-LTS-SP2 | amd64, arm64 | | [6.2.6-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/6.2.6/24.03-lts-sp1/Dockerfile) | Spring Framework 6.2.6 on openEuler 24.03-LTS-SP1 | amd64, arm64 | | [6.2.10-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/6.2.10/24.03-lts-sp2/Dockerfile) | Spring Framework 6.2.10 on openEuler 24.03-LTS-SP2 | amd64, arm64 | diff --git a/Others/spring-framework/doc/image-info.yml b/Others/spring-framework/doc/image-info.yml index 758d1220..06ec0266 100644 --- a/Others/spring-framework/doc/image-info.yml +++ b/Others/spring-framework/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |---------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------|---------------| + |[7.0.2-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/7.0.2/24.03-lts-sp2/Dockerfile) | spring 7.0.2 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[6.2.11-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/6.2.11/24.03-lts-sp2/Dockerfile) | spring 6.2.11 on openEuler 24.03-LTS-SP2 | amd64, arm64 | | [6.2.6-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/6.2.6/24.03-lts-sp1/Dockerfile) | Spring Framework 6.2.6 on openEuler 24.03-LTS-SP1 | amd64, arm64 | | [6.2.10-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/spring-framework/6.2.10/24.03-lts-sp2/Dockerfile) | Spring Framework 6.2.10 on openEuler 24.03-LTS-SP2 | amd64, arm64 | diff --git a/Others/spring-framework/meta.yml b/Others/spring-framework/meta.yml index 1dc9fd66..be79e1e1 100644 --- a/Others/spring-framework/meta.yml +++ b/Others/spring-framework/meta.yml @@ -3,4 +3,6 @@ 6.2.10-oe2403sp2: path: 6.2.10/24.03-lts-sp2/Dockerfile 6.2.11-oe2403sp2: - path: 6.2.11/24.03-lts-sp2/Dockerfile \ No newline at end of file + path: 6.2.11/24.03-lts-sp2/Dockerfile +7.0.2-oe2403sp2: + path: 7.0.2/24.03-lts-sp2/Dockerfile \ No newline at end of file -- Gitee