Skip to content

Commit e2ca369

Browse files
committed
Restrict CI integration for ubuntu and java 8 and 11 for now
1 parent 3c79c8c commit e2ca369

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
java: [ '8', '9', '10', '11' ]
16-
os: [ 'ubuntu-latest', 'windows-latest' ]
15+
java: [ '8', '11' ]
16+
os: [ 'ubuntu-latest' ]
1717
name: Java ${{ matrix.Java }} (${{ matrix.os }})
1818
steps:
1919
- uses: actions/checkout@v2

core/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@
118118
<artifactId>maven-surefire-plugin</artifactId>
119119
<version>2.22.2</version>
120120
<configuration>
121-
<argLine>${jacoco.agent.argLine}</argLine>
121+
<encoding>${project.build.sourceEncoding}</encoding>
122+
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
123+
<outputEncoding>${project.build.sourceEncoding}</outputEncoding>
124+
<argLine>${jacoco.agent.argLine} -Dfile.encoding=${project.build.sourceEncoding} -Dline.separator=\n</argLine>
122125
</configuration>
123126
</plugin>
124127
<plugin>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
1516
<slf4jVersion>1.7.30</slf4jVersion>
1617
<junitVersion>4.13.1</junitVersion>
1718
<logbackVersion>1.2.3</logbackVersion>

toolkit/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@
113113
<artifactId>maven-surefire-plugin</artifactId>
114114
<version>2.22.2</version>
115115
<configuration>
116-
<argLine>${jacoco.agent.argLine}</argLine>
116+
<encoding>${project.build.sourceEncoding}</encoding>
117+
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
118+
<outputEncoding>${project.build.sourceEncoding}</outputEncoding>
119+
<argLine>${jacoco.agent.argLine} -Dfile.encoding=${project.build.sourceEncoding} -Dline.separator=\n</argLine>
117120
</configuration>
118121
</plugin>
119122
</plugins>

0 commit comments

Comments
 (0)