Skip to content

Commit 9671d97

Browse files
committed
remove java 8 support
1 parent 007bcb3 commit 9671d97

File tree

3 files changed

+1
-159
lines changed

3 files changed

+1
-159
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -42,58 +42,12 @@ jobs:
4242
name: war-jre11
4343
path: target/plantuml*-${{ steps.version.outputs.VERSION }}.war
4444

45-
build-jdk8:
46-
runs-on: ubuntu-latest
47-
steps:
48-
- uses: actions/checkout@v3
49-
with:
50-
fetch-depth: 0
51-
52-
- uses: actions/setup-java@v3
53-
with:
54-
distribution: "zulu"
55-
java-version: 8
56-
check-latest: true
57-
cache: "maven"
58-
59-
- name: get tag name
60-
id: version
61-
run: echo "VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
62-
63-
- name: Remove test code (not java 8 compatible)
64-
run: rm -rf src/test
65-
66-
- name: build with maven
67-
run: mvn --batch-mode -f pom.jdk8.xml --define java.net.useSystemProxies=true package
68-
69-
- name: create renamed build
70-
run: cp target/plantuml.war target/plantuml-jre8-${{ steps.version.outputs.VERSION }}.war
71-
72-
- name: build with maven (including the apache-jsp artifact)
73-
run: mvn --batch-mode -f pom.jdk8.xml --define java.net.useSystemProxies=true -Dapache-jsp.scope=compile package
74-
75-
- name: create renamed build (including the apache-jsp artifact)
76-
run: cp target/plantuml.war target/plantuml-jre8-jsp-${{ steps.version.outputs.VERSION }}.war
77-
78-
- name: temporarily save generated war files
79-
uses: actions/upload-artifact@v4
80-
with:
81-
name: war-jre8
82-
path: target/plantuml*-${{ steps.version.outputs.VERSION }}.war
83-
8445
publish-releases:
8546
runs-on: ubuntu-latest
8647
needs:
8748
- build-jdk11
88-
- build-jdk8
8949
steps:
90-
- name: retrieve generated war files (jre8)
91-
uses: actions/download-artifact@v4.1.7
92-
with:
93-
name: war-jre8
94-
path: artifacts
95-
96-
- name: retrieve generated war files (jre11)
50+
- name: retrieve generated war files
9751
uses: actions/download-artifact@v4.1.7
9852
with:
9953
name: war-jre11

.github/workflows/tests.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,6 @@ on:
55
- pull_request
66

77
jobs:
8-
test-java-8-war-generation:
9-
runs-on: ubuntu-latest
10-
steps:
11-
- uses: actions/checkout@v3
12-
with:
13-
fetch-depth: 0
14-
15-
- uses: actions/setup-java@v3
16-
with:
17-
distribution: "zulu"
18-
java-version: 8
19-
check-latest: true
20-
cache: "maven"
21-
22-
- name: Remove test code (not java 8 compatible)
23-
run: rm -rf src/test
24-
25-
- name: Generate war file (including apache-jsp artifact)
26-
run: mvn --batch-mode -f pom.jdk8.xml -D java.net.useSystemProxies=true -Dapache-jsp.scope=compile clean package
27-
28-
- name: Generate war file
29-
run: mvn --batch-mode -f pom.jdk8.xml -D java.net.useSystemProxies=true clean package
30-
31-
- name: temporarily save generated files
32-
uses: actions/upload-artifact@v4
33-
with:
34-
name: war-jre8
35-
path: target/plantuml.war
36-
retention-days: 1
37-
388
test-mvn-livecycle:
399
runs-on: ubuntu-latest
4010
strategy:

pom.jdk8.xml

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)