diff --git a/pom.xml b/pom.xml index bb630f9c7df1672e6e260691375c4e1112a09ee8..211c54aa2a25cf11eba8cab184ca61a8b96e02a7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.10</version> + <version>3.2.2</version> <relativePath /> </parent> <groupId>de.landsh.opendata</groupId> @@ -14,7 +14,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x <name>dcat-catalog-proxy</name> <description>DCAT catalog proxy</description> <properties> - <java.version>1.8</java.version> + <java.version>11</java.version> <jena.version>4.7.0</jena.version> </properties> <dependencies> diff --git a/rules.xml b/rules.xml index 5525ad6ea0595e655ed09cdd01f9c7d65f76f6da..f5be1873c4c6edd8ba93a4e86628febd3e61deaf 100644 --- a/rules.xml +++ b/rules.xml @@ -11,39 +11,14 @@ <ignoreVersion type="regex">(?i).*M(?:-?\d+)?</ignoreVersion> </ignoreVersions> <rules> - <rule groupId="org.springframework.boot" comparisonMethod="maven"> + + <!-- 4.7.0 is the last version that work. There is an additional rule for + IRIs in later versions that prevents some of CKAN's responses + to be parsed. --> + <rule groupId="org.apache.jena" comparisonMethod="maven"> <ignoreVersions> - <ignoreVersion type="regex">3.*</ignoreVersion> - </ignoreVersions> - </rule> - <rule groupId="org.springframework.security" comparisonMethod="maven"> - <ignoreVersions> - <ignoreVersion type="regex">6.*</ignoreVersion> - </ignoreVersions> - </rule> - <rule groupId="org.springframework.ws" comparisonMethod="maven"> - <ignoreVersions> - <ignoreVersion type="regex">4.*</ignoreVersion> - </ignoreVersions> - </rule> - <rule groupId="org.apache.cxf" comparisonMethod="maven"> - <ignoreVersions> - <ignoreVersion type="regex">4.*</ignoreVersion> - </ignoreVersions> - </rule> - <rule groupId="org.elasticsearch" comparisonMethod="maven"> - <ignoreVersions> - <ignoreVersion type="regex">[78].*</ignoreVersion> - </ignoreVersions> - </rule> - <rule groupId="org.elasticsearch.client" comparisonMethod="maven"> - <ignoreVersions> - <ignoreVersion type="regex">[78].*</ignoreVersion> - </ignoreVersions> - </rule> - <rule groupId="org.thymeleaf.extras" comparisonMethod="maven"> - <ignoreVersions> - <ignoreVersion type="regex">3.1.*</ignoreVersion> + <ignoreVersion type="regex">4.[89].*</ignoreVersion> + <ignoreVersion type="regex">4.1[0-9].*</ignoreVersion> </ignoreVersions> </rule> </rules> diff --git a/src/main/java/de/landsh/opendata/catalogproxy/FilterController.java b/src/main/java/de/landsh/opendata/catalogproxy/FilterController.java index 2434b5c5f9257586ae7ab5aa5654783726c7ce9f..73f41787bd8afea6b68d0a511cb98a1c371a085d 100644 --- a/src/main/java/de/landsh/opendata/catalogproxy/FilterController.java +++ b/src/main/java/de/landsh/opendata/catalogproxy/FilterController.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.Writer;