Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java 11 --> 17 #203

Closed
wants to merge 4 commits into from
Closed

Java 11 --> 17 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e168ff0
update to java 17
ahmadshadab Nov 10, 2023
1969a33
update objectmapper
ahmadshadab Nov 13, 2023
e39ea93
use hibernate validtor 6.2
ahmadshadab Nov 14, 2023
00b8fe1
change junit version to same as store
ahmadshadab Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ff-parser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<antlr4.version>4.5.3</antlr4.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
</properties>

<dependencies>
Expand Down
6 changes: 5 additions & 1 deletion json-parser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<artifactId>json-parser</artifactId>

<properties>
<jackson.version>2.11.4</jackson.version>
<mbknor-jackson-jsonschema.version>1.0.31</mbknor-jackson-jsonschema.version>
</properties>

Expand All @@ -38,6 +37,11 @@
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.kjetland</groupId>
<artifactId>mbknor-jackson-jsonschema_2.12</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions json-parser/src/main/java/org/uniprot/core/json/parser/JsonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.ser.PropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.github.bohnman.squiggly.filter.SquigglyPropertyFilter;
import com.github.bohnman.squiggly.filter.SquigglyPropertyFilterMixin;

Expand Down
5 changes: 4 additions & 1 deletion ...-parser/src/main/java/org/uniprot/core/json/parser/uniparc/UniParcCrossRefJsonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.time.LocalDate;

import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.uniprot.core.CrossReference;
import org.uniprot.core.Database;
import org.uniprot.core.impl.CrossReferenceImpl;
Expand Down Expand Up @@ -48,7 +49,9 @@ public ObjectMapper getFullObjectMapper() {

@Override
public ObjectMapper getSimpleObjectMapper() {
return this.prettyMapper;
ObjectMapper simpleObjectMapper = getDefaultSimpleObjectMapper();
simpleObjectMapper.registerModule(new JavaTimeModule());
return simpleObjectMapper;
}

private ObjectMapper initObjectMapper() {
Expand Down
1 change: 1 addition & 0 deletions ...ser/src/test/java/org/uniprot/core/json/parser/uniparc/UniParcCrossRefJsonConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.junit.jupiter.api.Assertions.fail;
import static org.uniprot.core.json.parser.uniparc.UniParcEntryTest.getCompleteUniParcEntry;

import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.junit.jupiter.api.Test;
import org.uniprot.core.json.parser.ValidateJson;
import org.uniprot.core.uniparc.UniParcCrossReference;
Expand Down
9 changes: 6 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@
<name>UniProt Core Aggregator</name>

<properties>
<jackson-bom.version>2.13.4</jackson-bom.version>
<jackson.version>2.13.4</jackson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire-version>2.22.2</surefire-version>
<failsafe-version>2.22.2</failsafe-version>
<mockito-version>3.0.0</mockito-version>
<slf4j.version>1.7.28</slf4j.version>
<logback.version>1.2.3</logback.version>
<junit-jupiter.version>5.5.2</junit-jupiter.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<hamcrest.version>1.3</hamcrest.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
<http-uniprot-private-url>https://wwwdev.ebi.ac.uk/uniprot/artifactory</http-uniprot-private-url>
<java.version>11</java.version>
<java.version>17</java.version>
<skipITs>false</skipITs>
<skipUTs>false</skipUTs>
<guava.version>30.0-jre</guava.version>
Expand All @@ -40,7 +42,7 @@
<!-- Integration test report path -->
<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
<jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</jacoco.itReportPath>
<jacoco.version>0.8.5</jacoco.version>
<jacoco.version>0.8.8</jacoco.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -184,6 +186,7 @@
<includes>
<include>*</include>
</includes>
<argLine>--add-opens java.base/java.time=ALL-UNNAMED</argLine>
</configuration>
</plugin>
<plugin>
Expand Down
Loading