Emmanuel Bourg pushed to branch master at Debian Java Maintainers / openjpa
Commits: f6bd8c0e by Emmanuel Bourg at 2023-02-06T01:29:10+01:00 Fixed the build failure with Java 17 (Closes: #1012101 - - - - - bfc9c0fe by Emmanuel Bourg at 2023-02-06T01:29:16+01:00 Standards-Version updated to 4.6.2 - - - - - 00f2dcc2 by Emmanuel Bourg at 2023-02-06T01:29:43+01:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/java17-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +openjpa (2.4.2-8) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 17 (Closes: #1012101) + * Standards-Version updated to 4.6.2 + + -- Emmanuel Bourg <[email protected]> Mon, 06 Feb 2023 01:29:28 +0100 + openjpa (2.4.2-7) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -40,7 +40,7 @@ Build-Depends: libxbean-java, maven-debian-helper, xmlto -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/java-team/openjpa.git Vcs-Browser: https://salsa.debian.org/java-team/openjpa Homepage: http://openjpa.apache.org ===================================== debian/patches/java17-compatibility.patch ===================================== @@ -0,0 +1,14 @@ +Description: Fixes the build failure with Java 17 +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java ++++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java +@@ -210,7 +210,7 @@ + } + + public Set<Join<?,?>> getCorrelatedJoins() { +- return _corrJoins == null ? Collections.emptySet() : new CopyOnWriteArraySet(_corrJoins); ++ return (Set) (_corrJoins == null ? Collections.emptySet() : new CopyOnWriteArraySet(_corrJoins)); + } + + /** ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ exclude-was-uow.diff openjpa-xmlstore-no-tests.patch javacc-compatibility.patch +java17-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/openjpa/-/compare/d757d1696b951b3906ca6a7b0692f8547fc9677b...00f2dcc2a53cb1bf2e38b14c6800aad72fea983a -- View it on GitLab: https://salsa.debian.org/java-team/openjpa/-/compare/d757d1696b951b3906ca6a7b0692f8547fc9677b...00f2dcc2a53cb1bf2e38b14c6800aad72fea983a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
