diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bc86c824..b3e681290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # JOPA - Change Log +## 1.2.2 - 2024-01-30 +- Modify `DefaultClasspathScanner` to handle Spring Boot nested JAR introduced in 3.2.0 (Bug #227). + ## 1.2.1 - 2024-01-22 - Unwrap `IndirectMultilingualString` instances when owner entity is detached from the persistence context. diff --git a/datatype/pom.xml b/datatype/pom.xml index b3bc04d0e..6f586efc8 100644 --- a/datatype/pom.xml +++ b/datatype/pom.xml @@ -6,7 +6,7 @@ jopa-all cz.cvut.kbss.jopa - 1.2.1 + 1.2.2 ../pom.xml diff --git a/jopa-api/pom.xml b/jopa-api/pom.xml index ab907108d..6f1e794f6 100644 --- a/jopa-api/pom.xml +++ b/jopa-api/pom.xml @@ -6,7 +6,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml diff --git a/jopa-distribution/pom.xml b/jopa-distribution/pom.xml index 167d501c6..c89fb89ca 100644 --- a/jopa-distribution/pom.xml +++ b/jopa-distribution/pom.xml @@ -6,7 +6,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml diff --git a/jopa-impl/pom.xml b/jopa-impl/pom.xml index 52dc3b5d3..e42f31954 100644 --- a/jopa-impl/pom.xml +++ b/jopa-impl/pom.xml @@ -6,7 +6,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/loaders/DefaultClasspathScanner.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/loaders/DefaultClasspathScanner.java index 37c4c127e..4c8790f87 100644 --- a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/loaders/DefaultClasspathScanner.java +++ b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/loaders/DefaultClasspathScanner.java @@ -105,7 +105,7 @@ protected void processElements(Enumeration urls, String scanPath) throws IO * @throws UnsupportedEncodingException Should not happen, using standard UTF-8 encoding */ protected static String sanitizePath(URL url) throws UnsupportedEncodingException { - return URLDecoder.decode(url.getFile(), StandardCharsets.UTF_8.toString()); + return URLDecoder.decode(url.getFile(), StandardCharsets.UTF_8); } protected static boolean isJar(String filePath) { @@ -113,8 +113,9 @@ protected static boolean isJar(String filePath) { } protected static JarFile createJarFile(URL elementUrl) throws IOException { - final String jarPath = sanitizePath(elementUrl).replaceFirst("[.]jar[!].*", JAR_FILE_SUFFIX) - .replaceFirst("file:", ""); + final String jarPath = sanitizePath(elementUrl).replaceFirst("[.]jar/?!.*", JAR_FILE_SUFFIX) + .replaceFirst("file:", "") + .replaceFirst("nested:", ""); return new JarFile(jarPath); } diff --git a/jopa-integration-tests-jena/pom.xml b/jopa-integration-tests-jena/pom.xml index 2f14382de..3c8df1914 100644 --- a/jopa-integration-tests-jena/pom.xml +++ b/jopa-integration-tests-jena/pom.xml @@ -5,7 +5,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml 4.0.0 diff --git a/jopa-integration-tests-owlapi/pom.xml b/jopa-integration-tests-owlapi/pom.xml index 3829095fd..fa2b5ad9b 100644 --- a/jopa-integration-tests-owlapi/pom.xml +++ b/jopa-integration-tests-owlapi/pom.xml @@ -5,7 +5,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml 4.0.0 diff --git a/jopa-integration-tests-rdf4j/pom.xml b/jopa-integration-tests-rdf4j/pom.xml index 4a102badc..de75105c2 100644 --- a/jopa-integration-tests-rdf4j/pom.xml +++ b/jopa-integration-tests-rdf4j/pom.xml @@ -6,7 +6,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml jopa-integration-tests-rdf4j diff --git a/jopa-integration-tests/pom.xml b/jopa-integration-tests/pom.xml index 873f81ecc..b670aadd7 100644 --- a/jopa-integration-tests/pom.xml +++ b/jopa-integration-tests/pom.xml @@ -6,7 +6,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml 4.0.0 diff --git a/jopa-maven-plugin/pom.xml b/jopa-maven-plugin/pom.xml index c524258ef..6e0e459be 100644 --- a/jopa-maven-plugin/pom.xml +++ b/jopa-maven-plugin/pom.xml @@ -5,7 +5,7 @@ jopa-all cz.cvut.kbss.jopa - 1.2.1 + 1.2.2 ../pom.xml 4.0.0 diff --git a/jopa-owl2java/pom.xml b/jopa-owl2java/pom.xml index 017dc0cfe..06e7443fc 100644 --- a/jopa-owl2java/pom.xml +++ b/jopa-owl2java/pom.xml @@ -6,7 +6,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml diff --git a/jopa-owlapi-utils/pom.xml b/jopa-owlapi-utils/pom.xml index 2ca9bd873..404fdef6e 100644 --- a/jopa-owlapi-utils/pom.xml +++ b/jopa-owlapi-utils/pom.xml @@ -6,7 +6,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml diff --git a/modelgen/pom.xml b/modelgen/pom.xml index c2669810b..c27bc5e05 100644 --- a/modelgen/pom.xml +++ b/modelgen/pom.xml @@ -6,7 +6,7 @@ jopa-all cz.cvut.kbss.jopa - 1.2.1 + 1.2.2 ../pom.xml diff --git a/ontodriver-api/pom.xml b/ontodriver-api/pom.xml index 67ae693b3..2a842381d 100644 --- a/ontodriver-api/pom.xml +++ b/ontodriver-api/pom.xml @@ -6,7 +6,7 @@ jopa-all cz.cvut.kbss.jopa - 1.2.1 + 1.2.2 ../pom.xml diff --git a/ontodriver-jena/pom.xml b/ontodriver-jena/pom.xml index e01fe4e14..38d0b7330 100644 --- a/ontodriver-jena/pom.xml +++ b/ontodriver-jena/pom.xml @@ -8,7 +8,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml diff --git a/ontodriver-owlapi/pom.xml b/ontodriver-owlapi/pom.xml index 1b7865bb2..0c0644a1f 100644 --- a/ontodriver-owlapi/pom.xml +++ b/ontodriver-owlapi/pom.xml @@ -11,7 +11,7 @@ cz.cvut.kbss.jopa jopa-all - 1.2.1 + 1.2.2 ../pom.xml diff --git a/ontodriver-rdf4j/pom.xml b/ontodriver-rdf4j/pom.xml index 091029b73..0383a6ff2 100644 --- a/ontodriver-rdf4j/pom.xml +++ b/ontodriver-rdf4j/pom.xml @@ -10,7 +10,7 @@ jopa-all cz.cvut.kbss.jopa - 1.2.1 + 1.2.2 diff --git a/pom.xml b/pom.xml index 03f9f8249..4a51d33f5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 cz.cvut.kbss.jopa - 1.2.1 + 1.2.2 jopa-all pom JOPA