Skip to content

Commit

Permalink
feat!: update java version to 23
Browse files Browse the repository at this point in the history
  • Loading branch information
kenluluuuluuuuu committed Jan 6, 2025
1 parent 8d9a326 commit c355d21
Show file tree
Hide file tree
Showing 14 changed files with 363 additions and 467 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- name: checkout
uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
java-version: 23
settings-path: ${{ github.workspace }}
- name: Build Project
run: ./mvnw -B --no-transfer-progress install -Prelease
Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Contact us via [styx-user](https://groups.google.com/forum/#!forum/styx-user) gr

## Dependencies

* [Oracle JDK 21](https://www.oracle.com/java/technologies/downloads/#java21)
* [Oracle JDK 23](https://www.oracle.com/java/technologies/downloads/#java23)
* [Apache Maven v3](http://maven.apache.org)
* Makefile (Optional)- There are fairly many ways of running Styx tests with different Maven profiles. Therefore, the
shortcuts for most common usages are compiled into a separate (GNU) Makefile for developer's convenience. To
Expand Down
4 changes: 2 additions & 2 deletions distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<main.basedir>${project.parent.basedir}</main.basedir>
<skipCheckstyle>true</skipCheckstyle>
<main.basedir>${project.parent.basedir}</main.basedir>
<TAG>21-jdk</TAG>
<TAG>23-jdk</TAG>
<styxcore.docker.tag>${project.version}</styxcore.docker.tag>
<styxcore.docker.image>styxcore</styxcore.docker.image>
</properties>
Expand Down Expand Up @@ -180,7 +180,7 @@
</tags>
<args>
<STYX_IMAGE>maven/${artifact.finalName}.zip</STYX_IMAGE>
<TAG>21-jdk</TAG>
<TAG>23-jdk</TAG>
</args>
</build>
</image>
Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

### styx-build

This directory contains a maven:3.9.6-eclipse-temurin-21 based Styx build environment. It
This directory contains a maven:3.9.9-eclipse-temurin-23 based Styx build environment. It
has all necessary build tools (git, maven, make, docker) for building
images and running tests in a Linux environment.

Expand Down
2 changes: 1 addition & 1 deletion docker/styx-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.9.6-eclipse-temurin-21
FROM maven:3.9.9-eclipse-temurin-23

ENV APP_HOME=/build

Expand Down
2 changes: 1 addition & 1 deletion docker/styx-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG TAG=21-jdk
ARG TAG=23-jdk
FROM eclipse-temurin:${TAG}

ARG STYX_VERSION=""
Expand Down
2 changes: 1 addition & 1 deletion docs/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ In this guide we will walk through how to build applications on top of Styx.

## 1.2 System Requirements

Building Styx requires Java 21.
Building Styx requires Java 23.

The build system requires Apache Maven. The Styx team uses Maven version 3
for automated continuous integration builds. On Mac OSX, a version installed
Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/basic-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## System Requirements

Running Styx requires Java 21.
Running Styx requires Java 23.

## Downloading Styx from release

Expand All @@ -11,7 +11,7 @@ Alternatively, you can build styx from source code.

## Building Styx from source code

In order to build styx from source code, Java 21 is required.
In order to build styx from source code, Java 23 is required.
The build system requires Apache Maven. The Styx CI pipeline uses Maven version 3
for the automated continuous integration builds. On Mac OSX, a version installed
by HomeBrew is satisfactory.
Expand Down
Loading

0 comments on commit c355d21

Please sign in to comment.