Markus Koschany pushed to branch master at Debian Java Maintainers / jboss-modules
Commits: 8f18f4bb by Markus Koschany at 2018-09-01T12:06:56Z Declare compliance with Debian Policy 4.2.1. - - - - - 595e3476 by Markus Koschany at 2018-09-01T12:08:35Z New upstream version 1.8.6 - - - - - d4e3fc66 by Markus Koschany at 2018-09-01T12:08:40Z Update upstream source from tag 'upstream/1.8.6' Update to upstream version '1.8.6' with Debian dir 13844738ebb4b8da3331fe690e926dd6896aa9ef - - - - - 6f7916ea by Markus Koschany at 2018-09-01T12:09:25Z Declare compliance with Debian Policy 4.2.1. - - - - - 6 changed files: - debian/changelog - debian/control - pom.xml - src/main/java/org/jboss/modules/ModuleClassLoader.java - src/main/java/org/jboss/modules/log/JDKModuleLogger.java - src/main/java/org/jboss/modules/xml/ModuleXmlParser.java Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +jboss-modules (1.8.6-1) unstable; urgency=medium + + * New upstream version 1.8.6. + * Declare compliance with Debian Policy 4.2.1. + + -- Markus Koschany <[email protected]> Sat, 01 Sep 2018 14:09:09 +0200 + jboss-modules (1.8.5-1) unstable; urgency=medium * New upstream version 1.8.5. ===================================== debian/control ===================================== @@ -14,7 +14,7 @@ Build-Depends: libmaven-javadoc-plugin-java, libmaven-source-plugin-java, maven-debian-helper (>= 1.5) -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jboss-modules.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jboss-modules.git Homepage: https://github.com/jboss-modules/jboss-modules ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.modules</groupId> <artifactId>jboss-modules</artifactId> - <version>1.8.5.Final</version> + <version>1.8.6.Final</version> <name>JBoss Modules</name> <parent> ===================================== src/main/java/org/jboss/modules/ModuleClassLoader.java ===================================== @@ -509,7 +509,7 @@ public class ModuleClassLoader extends ConcurrentClassLoader { if (transformed != null) { byteBuffer = transformed; bytes = null; - } else { + } else if (byteBuffer != null) { byteBuffer.position(0); byteBuffer.limit(lim); byteBuffer.position(pos); ===================================== src/main/java/org/jboss/modules/log/JDKModuleLogger.java ===================================== @@ -203,8 +203,8 @@ public final class JDKModuleLogger implements ModuleLogger { } public void providerUnloadable(String name, ClassLoader loader) { - if (defineLogger.isLoggable(TRACE)) { - doLog(defineLogger, TRACE, String.format("Could not load provider %s in %s", name, loader), null); + if (defineLogger.isLoggable(DEBUG)) { + doLog(defineLogger, DEBUG, String.format("Could not load provider %s in %s", name, loader), null); } } ===================================== src/main/java/org/jboss/modules/xml/ModuleXmlParser.java ===================================== @@ -50,7 +50,6 @@ import org.jboss.modules.ModuleDependencySpecBuilder; import org.jboss.modules.Version; import org.jboss.modules.VersionDetection; import org.jboss.modules.maven.ArtifactCoordinates; -import org.jboss.modules.maven.MavenArtifactUtil; import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoadException; import org.jboss.modules.ModuleLoader; @@ -908,7 +907,7 @@ public final class ModuleXmlParser { break; } case E_ARTIFACT: { - final Version version = parseArtifact(mavenResolver, reader, specBuilder); + final Version version = parseArtifact(factory, mavenResolver, reader, specBuilder); if (version != null) detectedVersions.add(version); break; } @@ -988,7 +987,7 @@ public final class ModuleXmlParser { } } - private static Version parseArtifact(final MavenResolver mavenResolver, final XmlPullParser reader, final ModuleSpec.Builder specBuilder) throws XmlPullParserException, IOException { + private static Version parseArtifact(final ResourceRootFactory factory, final MavenResolver mavenResolver, final XmlPullParser reader, final ModuleSpec.Builder specBuilder) throws XmlPullParserException, IOException { String name = null; final Set<String> required = new HashSet<>(LIST_A_NAME); final int count = reader.getAttributeCount(); @@ -1019,7 +1018,8 @@ public final class ModuleXmlParser { final ArtifactCoordinates coordinates; try { coordinates = ArtifactCoordinates.fromString(name); - resourceLoader = MavenArtifactUtil.createMavenArtifactLoader(mavenResolver, coordinates, name); + final File file = mavenResolver.resolveJarArtifact(coordinates); + resourceLoader = factory.createResourceLoader("", file.getPath(), name); } catch (IOException | IllegalArgumentException e) { throw new XmlPullParserException(String.format("Failed to add artifact '%s'", name), reader, e); } View it on GitLab: https://salsa.debian.org/java-team/jboss-modules/compare/8096e925dedfd3a4ce596765db9b8a43714f92ba...6f7916eaccce073d36861a1613eedce28da5b9ea -- View it on GitLab: https://salsa.debian.org/java-team/jboss-modules/compare/8096e925dedfd3a4ce596765db9b8a43714f92ba...6f7916eaccce073d36861a1613eedce28da5b9ea 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
