Skip to content

SED-4530 java-25-support-for-step #34

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

Draft
david-stephan wants to merge 22 commits into
base: 29
Choose a base branch
from
Draft

SED-4530 java-25-support-for-step #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9d31ea4
SED-0000 bumped Chart version to be used
rubij Nov 26, 2025
d67e536
SED-0000 bumped Chart version to be used
rubij Dec 5, 2025
0b218a1
EI-496 migrate docker images to GCP (#29)
rubij Dec 18, 2025
051cba0
EI-496 migrate docker images to GCP (chart settings update)
rubij Dec 18, 2025
d83155b
EI-488 cleaned up useless build parameter (SHARE_ON_FTP)
rubij Jan 6, 2026
f1d39f2
Ei 485 create new nexus staging host (#31)
rubij Jan 15, 2026
3f71583
SED-4523 bumped Chart version to be used
rubij Feb 10, 2026
24d93af
SED-4530 added java 25 Docker image builds
rubij Feb 10, 2026
0018b06
SED-4530 added java 25 Docker image builds
rubij Feb 10, 2026
7e51dac
SED-4521 step-cli-does-not-support-local-execution-of-jar-files-with-…
david-stephan Feb 12, 2026
12e5a4e
Merge branch 'refs/heads/master' into SED-4530-java-25-support-for-step
rubij Feb 17, 2026
120695f
SED-4530 Upgrading groovy version for Java 25 support
david-stephan Feb 25, 2026
dc4033a
SED-4530 Upgrading groovy version for Java 25 support
david-stephan Feb 25, 2026
68b6a8e
SED-4530 Upgrading groovy version for Java 25 support
david-stephan Feb 26, 2026
a4b1ad3
SED-4530 Upgrading groovy version for Java 25 support
david-stephan Feb 26, 2026
dae6a1a
SED-4530 Upgrading groovy version for Java 25 support
david-stephan Feb 26, 2026
7e09c00
SED-4573 port-java-25-support-to-master (#35)
david-stephan Mar 2, 2026
646ecf4
Merge remote-tracking branch 'origin/SED-4530-java-25-support-for-ste…
rubij Mar 3, 2026
d4cefef
Merge branch 'refs/heads/master' into SED-4530-java-25-support-for-step
rubij Mar 3, 2026
bea2950
SED-4530 java 25 builds on INTEGRATION, removed deprecated FTP sectio…
rubij Mar 3, 2026
b6920d8
Revert "SED-4530 java 25 builds on INTEGRATION, removed deprecated FT…
rubij Mar 3, 2026
35b6b59
Revert "Merge branch 'refs/heads/master' into SED-4530-java-25-suppor…
rubij Mar 3, 2026
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
18 changes: 18 additions & 0 deletions build_parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,15 @@
"SBOM_DIRECTORY": "/step/${SIMPLIFIED_BRANCH_NAME}-${ENVIRONMENT}/sbom/",
"DOCKER_BUILD_ARGS": "--build-arg BASE_IMAGE=debian:12-slim --target java-21"
},
{
"DEACTIVATED": "PRODUCTION",
"ORIGIN": "step-distribution-controller/target/step-controller-${VERSION}.zip",
"DESTINATION": "step/controller:${BRANCH}-${ENVIRONMENT}-java-25",
"CONFIG": "controller.dockerfile",
"IMAGE_BASENAME": "step-controller-${BRANCH}-${ENVIRONMENT}-java-25",
"SBOM_DIRECTORY": "/step/${SIMPLIFIED_BRANCH_NAME}-${ENVIRONMENT}/sbom/",
"DOCKER_BUILD_ARGS": "--build-arg BASE_IMAGE=debian:12-slim --target java-25"
},
{
"DEACTIVATED": "DEVELOPMENT,INTEGRATION",
"ORIGIN": "step-distribution-controller/target/step-controller-${VERSION}.zip",
Expand Down Expand Up @@ -221,6 +230,15 @@
"SBOM_DIRECTORY": "/step/${SIMPLIFIED_BRANCH_NAME}-${ENVIRONMENT}/sbom/",
"DOCKER_BUILD_ARGS": "--build-arg BASE_IMAGE=debian:12-slim"
},
{
"DEACTIVATED": "PRODUCTION",
"ORIGIN": "step-distribution-agent/target/step-agent-${VERSION}.zip",
"DESTINATION": "step/agent:${BRANCH}-${ENVIRONMENT}-java-25",
"CONFIG": "agent.dockerfile",
"IMAGE_BASENAME": "step-agent-${BRANCH}-${ENVIRONMENT}-java-25",
"SBOM_DIRECTORY": "/step/${SIMPLIFIED_BRANCH_NAME}-${ENVIRONMENT}/sbom/",
"DOCKER_BUILD_ARGS": "--build-arg BASE_IMAGE=debian:12-slim"
},
{
"DEACTIVATED": "DEVELOPMENT,INTEGRATION",
"ORIGIN": "step-distribution-agent/target/step-agent-${VERSION}.zip",
Expand Down
16 changes: 16 additions & 0 deletions docker/dockerfiles/controller.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,20 @@ RUN curl --output /tmp/jdk.tgz https://download.oracle.com/java/21/latest/jdk-21
# Switch to regular user
USER 1000
# Update path environment variable
ENV PATH=$JAVA_HOME/bin:$PATH

# Multistage build - java 25
FROM common AS java-25
# Switch to root user
USER 0
# Set Java environment
ENV JAVA_HOME=/usr/java/jdk-25
# Install Java 21
RUN curl --output /tmp/jdk.tgz https://download.oracle.com/java/25/latest/jdk-25_linux-x64_bin.tar.gz && \
mkdir -p "$JAVA_HOME" && \
tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1 && \
rm -rf /tmp/jdk.tgz \
# Switch to regular user
USER 1000
# Update path
ENV PATH=$JAVA_HOME/bin:$PATH
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<!-- Exense projects -->
<step-backend.version>0.0.0-SNAPSHOT</step-backend.version>
<step-frontend.version>0.0.0</step-frontend.version>
<groovy.version>3.0.10</groovy.version>
<groovy.version>5.0.4</groovy.version>

<!-- maven plugin versions -->
<dep.mvn.antrun.version>1.7</dep.mvn.antrun.version>
Expand Down
2 changes: 1 addition & 1 deletion step-distribution-controller/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<configuration>
<rules>
<requireFilesSize>
<maxsize>300000000</maxsize>
<maxsize>310000000</maxsize>
<minsize>150000000</minsize>
<files>
<file>${project.build.directory}/step-controller-${project.version}.zip</file>
Expand Down
2 changes: 1 addition & 1 deletion step-distribution-ide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<configuration>
<rules>
<requireFilesSize>
<maxsize>300000000</maxsize>
<maxsize>310000000</maxsize>
<minsize>150000000</minsize>
<files>
<file>${project.build.directory}/step-ide-${project.version}.zip</file>
Expand Down
47 changes: 35 additions & 12 deletions step-groovy-libraries/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<artifactId>step-groovy-libraries</artifactId>
<version>0.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<packaging>jar</packaging>
<name>Step OSS Groovy Lib</name>

<parent>
Expand All @@ -16,7 +16,7 @@

<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
Expand All @@ -40,7 +40,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-dateutil</artifactId>
<version>${groovy.version}</version>
</dependency>
Expand All @@ -50,21 +50,44 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>${project.build.finalName}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>assemble-all</id>
<phase>package</phase>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
<configuration>
<finalName>${project.build.finalName}</finalName>
<shadedArtifactAttached>false</shadedArtifactAttached>
<transformers>
<!-- Merges all Groovy extension module descriptors into one -->
<transformer implementation="org.apache.maven.plugins.shade.resource.GroovyResourceTransformer">
<extModuleName>${project.artifactId}-aggregated</extModuleName>
<extModuleVersion>${project.version}</extModuleVersion>
</transformer>
<!-- Merges META-INF/services/* SPI files (also needed for Groovy internals) -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<!-- Preserves the correct main manifest entry if needed -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>ch.exense.step</mainClass>
</transformer>
</transformers>
<filters>
<!-- Exclude module-info.class files to avoid JPMS conflicts in fat jars -->
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>module-info.class</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
Expand Down