[Git][java-team/jboss-modules][upstream] New upstream version 1.8.6
Markus Koschany
gitlab at salsa.debian.org
Sat Sep 1 13:13:31 BST 2018
Markus Koschany pushed to branch upstream at Debian Java Maintainers / jboss-modules
Commits:
595e3476 by Markus Koschany at 2018-09-01T12:08:35Z
New upstream version 1.8.6
- - - - -
4 changed files:
- 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:
=====================================
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/commit/595e3476eedd64f81a1cb1c5879e6a3aff69f888
--
View it on GitLab: https://salsa.debian.org/java-team/jboss-modules/commit/595e3476eedd64f81a1cb1c5879e6a3aff69f888
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180901/7a569bb7/attachment.html>
More information about the pkg-java-commits
mailing list