Skip to content

Commit

Permalink
GH-176 - Upgrade to latest Lab parent.
Browse files Browse the repository at this point in the history
  • Loading branch information
odrotbohm committed Sep 24, 2024
1 parent 156dcb1 commit 0a013b9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 22 deletions.
19 changes: 6 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,17 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: 21
cache: 'maven'

- name: Setup Graphviz
uses: ts-graphviz/setup-graphviz@v1

- name: Configure cache
uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
uses: ts-graphviz/setup-graphviz@v2

- name: Build with Maven
run: ./mvnw -Pci -B verify
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.tudresden.inf.st</groupId>
<artifactId>videoshop</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
<version>4.0.0.BUILD-SNAPSHOT</version>
<description>The videoshop is a sample web application based on Spring Boot and the Salespoint framework.</description>

<parent>
<groupId>de.tudresden.inf.st.lab</groupId>
<artifactId>st-lab-parent</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath />
</parent>

Expand Down
14 changes: 7 additions & 7 deletions readme.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Purpose of this sample project is to make students familiar with basic technolog

## Quickstart

NOTE: The Quickstart requires Java 17 and a recent Git (2.20 or newer preferred) to be available on your machine. If you miss any of those go through the steps described in <<prerequisites>>.
NOTE: The Quickstart requires Java 21 and a recent Git (2.46 or newer preferred) to be available on your machine. If you miss any of those go through the steps described in <<prerequisites>>.
Also, note that you have to run `mvnw.cmd` instead of `./mvnw` if you run Windows by accident.

[source, shell]
Expand All @@ -24,16 +24,16 @@ Note that the standard admin user is named `boss` and has the password `123`.

## Prerequisites

### Java 17
### Java 21

https://adoptium.net/temurin/releases/?version=17[Download] the binaries, install. Make sure the console shows something like this:
https://adoptium.net/temurin/releases/?version=21[Download] the binaries, install. Make sure the console shows something like this:

[source, bash]
----
$ java -version
openjdk version "17.0.4.1" 2022-08-12
OpenJDK Runtime Environment Temurin-17.0.4.1+1 (build 17.0.4.1+1)
OpenJDK 64-Bit Server VM Temurin-17.0.4.1+1 (build 17.0.4.1+1, mixed mode)
openjdk version "21.0.4" 2024-07-16 LTS
OpenJDK Runtime Environment Temurin-21.0.4+7 (build 21.0.4+7-LTS)
OpenJDK 64-Bit Server VM Temurin-21.0.4+7 (build 21.0.4+7-LTS, mixed mode)
----

Make sure that the wrapped Maven picks up the same JDK version and that the following command shows similar output:
Expand All @@ -55,7 +55,7 @@ https://git-scm.com/download[Download] the binaries, run the installer. Verify t
[source, bash]
----
$ git --version
git version 2.33.0
git version 2.46.1
----

## IDE Setup
Expand Down

0 comments on commit 0a013b9

Please sign in to comment.