Skip to content

Commit 4428e23

Browse files
kinowmr-c
authored andcommitted
Use Java 17 LTS
1 parent d333c80 commit 4428e23

File tree

6 files changed

+35
-20
lines changed

6 files changed

+35
-20
lines changed

.github/workflows/ci-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/setup-java@v2
3131
with:
3232
distribution: 'adopt'
33-
java-version: '8'
33+
java-version: '17'
3434

3535
- name: Install system packages
3636
run: |
@@ -45,7 +45,7 @@ jobs:
4545
- name: Coverage report
4646
run: |
4747
mvn prepare-package -DskipTests=true
48-
mvn cobertura:cobertura coveralls:report --no-transfer-progress -DrepoToken=$COVERALLS_SECRET -DpullRequest=${{ github.event.number }}
48+
mvn jacoco:report coveralls:report --no-transfer-progress -DrepoToken=$COVERALLS_SECRET -DpullRequest=${{ github.event.number }}
4949
env:
5050
CI_NAME: github
5151
COVERALLS_SECRET: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ jobs:
1616
steps:
1717
- name: Checkout repository
1818
uses: actions/checkout@v2
19+
20+
- name: Set up Java
21+
uses: actions/setup-java@v2
22+
with:
23+
distribution: 'adopt'
24+
java-version: '17'
1925

2026
# Initializes the CodeQL tools for scanning.
2127
- name: Initialize CodeQL

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.6-jdk-8-alpine
1+
FROM maven:3-eclipse-temurin-17-alpine
22
MAINTAINER Stian Soiland-Reyes <[email protected]>
33

44
# Build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md

ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
## Your Environment
2727
<!--- Include as many relevant details about the environment you experienced the bug in -->
2828
* Version used:
29-
* Environment name and version (e.g. Chrome 39, Java 1.8):
29+
* Environment name and version (e.g. Chrome 39, Java 17):

README.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ This is a [Spring Boot](http://projects.spring.io/spring-boot/) MVC application
55
[![Build Status](https://github.com/common-workflow-language/cwlviewer/workflows/CWL%20Viewer%20Build/badge.svg?branch=main)](https://github.com/common-workflow-language/cwlviewer/actions?query=workflow%3A%22CWL%20Viewer%20Build%22) [![Coverage Status](https://coveralls.io/repos/github/common-workflow-language/cwlviewer/badge.svg)](https://coveralls.io/github/common-workflow-language/cwlviewer) [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/common-workflow-language/cwlviewer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![](https://images.microbadger.com/badges/image/commonworkflowlanguage/cwlviewer.svg)](https://microbadger.com/images/commonworkflowlanguage/cwlviewer "MicroBadger commonworkflowlanguage/cwlviewer") [![Docker image commonworkflowlanguage/cwlviewer](https://images.microbadger.com/badges/version/commonworkflowlanguage/cwlviewer.svg)](https://hub.docker.com/r/commonworkflowlanguage/cwlviewer/ "Docker Hub commonworkflowlanguage/cwlviewer")
66
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.823534.svg)](https://doi.org/10.5281/zenodo.823534)
77

8-
9-
108
# Using CWL Viewer
119

1210
You are recommended to use the **production instance** of CWL Viewer at https://view.commonwl.org/ which runs the latest [release](https://github.com/common-workflow-language/cwlviewer/releases). Any downtime should be reported on the [gitter chat for cwlviewer](https://gitter.im/common-workflow-language/cwlviewer).
@@ -117,16 +115,16 @@ by default on `localhost:3030`
117115
118116
## Compiling and Running
119117
120-
To compile you will need [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or OpenJDK 8 (`apt install openjdk-8-jdk`),
121-
as well as [Apache Maven 3](https://maven.apache.org/download.cgi) (`apt install maven`).
118+
To compile you will need [Java 17](https://www.oracle.com/java/technologies/downloads/) or a compatible distribution
119+
(e.g. [Eclipse Adoptium](https://projects.eclipse.org/projects/adoptium)) and version, as well as
120+
[Apache Maven 3](https://maven.apache.org/download.cgi) (`apt install maven`).
122121
123122
Spring Boot uses an embedded HTTP server. The Spring Boot Maven plugin includes a run goal which can be used to quickly compile and run it:
124123
125124
```
126125
$ mvn spring-boot:run
127126
```
128127
129-
130128
Alternatively, you can run the application from your IDE as a simple Java application by importing the Maven project.
131129
132130
You need to install [Graphviz](http://www.graphviz.org/) for all unit tests to pass.
@@ -206,7 +204,6 @@ look like a commit ID. Note that this might break previous permalinks.
206204

207205
2017 Technical Report <https://doi.org/10.5281/zenodo.823295>
208206

209-
210207
## License
211208

212209
Distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
@@ -278,7 +275,7 @@ git push
278275
Then copy the changelog into https://github.com/common-workflow-language/cwlviewer/releases/new
279276
using the tag you just pushed.
280277

281-
Finally make a new PR to bump the version and restore the `-SNAPSHOT` suffix in `pom.xml`.
278+
Finally, make a new PR to bump the version and restore the `-SNAPSHOT` suffix in `pom.xml`.
282279

283280
# Thanks
284281

pom.xml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<java.version>1.8</java.version>
25+
<java.version>17</java.version>
2626
<jena.version>4.5.0</jena.version>
2727
<!-- BEGIN should correspond to https://repo1.maven.org/maven2/org/apache/jena/jena/3.9.0/jena-3.9.0.pom -->
2828
<ver.jsonldjava>0.13.4</ver.jsonldjava>
@@ -221,20 +221,32 @@
221221
</activation>
222222
<build>
223223
<plugins>
224+
<!-- NOTE: We cannot use Cobertura as it is not compatible with Java 11+: https://github.com/mojohaus/cobertura-maven-plugin/issues/43 -->
224225
<plugin>
225-
<groupId>org.codehaus.mojo</groupId>
226-
<artifactId>cobertura-maven-plugin</artifactId>
227-
<version>2.7</version>
228-
<configuration>
229-
<formats>
230-
<format>xml</format>
231-
</formats>
232-
</configuration>
226+
<groupId>org.jacoco</groupId>
227+
<artifactId>jacoco-maven-plugin</artifactId>
228+
<version>0.8.8</version>
229+
<executions>
230+
<execution>
231+
<id>prepare-agent</id>
232+
<goals>
233+
<goal>prepare-agent</goal>
234+
</goals>
235+
</execution>
236+
</executions>
233237
</plugin>
234238
<plugin>
235239
<groupId>org.eluder.coveralls</groupId>
236240
<artifactId>coveralls-maven-plugin</artifactId>
237241
<version>4.3.0</version>
242+
<!-- TODO: required class missing: DatatypeConverter when running coverage report, https://github.com/trautonen/coveralls-maven-plugin/issues/141 -->
243+
<dependencies>
244+
<dependency>
245+
<groupId>javax.xml.bind</groupId>
246+
<artifactId>jaxb-api</artifactId>
247+
<version>2.3.1</version>
248+
</dependency>
249+
</dependencies>
238250
</plugin>
239251
</plugins>
240252
</build>

0 commit comments

Comments
 (0)