Skip to content

Commit

Permalink
Changed to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-schnell committed Dec 27, 2023
1 parent d075224 commit 3467db4
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
with:
fetch-depth: 0

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

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ A library with common Java types that are mostly immutable value objects.
[![Coverage Status](https://sonarcloud.io/api/project_badges/measure?project=org.fuin%3Aobjects4j&metric=coverage)](https://sonarcloud.io/dashboard?id=org.fuin%3Aobjects4j)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.fuin/objects4j/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.fuin/objects4j/)
[![LGPLv3 License](http://img.shields.io/badge/license-LGPLv3-blue.svg)](https://www.gnu.org/licenses/lgpl.html)
[![Java Development Kit 11](https://img.shields.io/badge/JDK-11-green.svg)](https://openjdk.java.net/projects/jdk/11/)
[![Java Development Kit 17](https://img.shields.io/badge/JDK-17-green.svg)](https://openjdk.java.net/projects/jdk/17/)

## Versions
- 0.8.x (or later) = **Java 11** with new **jakarta** namespace
- 0.9.x (or later) = **Java 17**
- 0.8.0 = **Java 11** with new **jakarta** namespace
- 0.7.x = **Java 11** before namespace change from 'javax' to 'jakarta'
- 0.6.9 (or previous) = **Java 8**

Expand Down
16 changes: 12 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<groupId>org.fuin</groupId>
<artifactId>pom</artifactId>
<version>1.8.0-SNAPSHOT</version>
<version>1.9.0</version>
</parent>

<artifactId>objects4j</artifactId>
<packaging>bundle</packaging>
<version>0.8.1-SNAPSHOT</version>
<version>0.9.0-SNAPSHOT</version>

<description>A library with common Java types that are mostly immutable value objects.</description>
<url>http://www.fuin.org/objects4j/</url>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>org.fuin</groupId>
<artifactId>utils4j</artifactId>
<version>0.12.1-SNAPSHOT</version>
<version>0.13.0</version>
</dependency>


Expand Down Expand Up @@ -100,7 +100,7 @@
<dependency>
<groupId>org.fuin</groupId>
<artifactId>units4j</artifactId>
<version>0.11.0-SNAPSHOT</version>
<version>0.11.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -278,6 +278,14 @@
<artifactId>maven-jdeps-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-opens java.base/java.util=ALL-UNNAMED</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/fuin/objects4j/ui/FieldTextInfoTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ private void assertEquals(final FieldTextInfo expected, final FieldTextInfo actu
public void testEqualsHashCode() throws Exception {
EqualsVerifier.forClass(FieldTextInfo.class)
.withPrefabValues(Field.class, C.class.getDeclaredField("c"), D.class.getDeclaredField("d2"))
.suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED).verify();
.suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED, Warning.REFERENCE_EQUALITY).verify();
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public void testEqualsHashCode() throws Exception {
EqualsVerifier.forClass(TableColumnInfo.class)
.withPrefabValues(Field.class, C.class.getDeclaredField("c"), D.class.getDeclaredField("d2"))
.withPrefabValues(FontSize.class, new FontSize(40, FontSizeUnit.PIXEL), new FontSize(100, FontSizeUnit.POINT))
.suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED).verify();
.suppress(Warning.NULL_FIELDS, Warning.ALL_FIELDS_SHOULD_BE_USED, Warning.REFERENCE_EQUALITY).verify();
}

}
Expand Down

0 comments on commit 3467db4

Please sign in to comment.