[jboss-modules] 01/04: Merge tag 'upstream/1.5.4'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jboss-modules.

commit 95212ea4fe529d661a72b1d794f6cbe995fa05bd
Merge: 3a942e9 d48ee3a
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jun 20 11:53:35 2017 +0200

    Merge tag 'upstream/1.5.4'
    
    Upstream version 1.5.4
    
    # gpg: Signatur vom Di 20 Jun 2017 11:53:33 CEST
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 pom.xml                                            |   2 +-
 .../java/org/jboss/modules/AliasModuleSpec.java    |  36 ---
 .../java/org/jboss/modules/JarEntryResource.java   |  11 +-
 .../org/jboss/modules/JarFileResourceLoader.java   |  38 ++-
 src/main/java/org/jboss/modules/Linkage.java       |   2 +-
 src/main/java/org/jboss/modules/Module.java        |   5 +
 .../java/org/jboss/modules/ModuleClassLoader.java  |   2 +-
 src/main/java/org/jboss/modules/ModuleLoader.java  |  89 ++++++-
 src/main/java/org/jboss/modules/PathUtils.java     |  32 +++
 src/main/java/org/jboss/modules/Paths.java         |   2 +-
 .../org/jboss/modules/maven/MavenArtifactUtil.java |   2 +-
 .../org/jboss/modules/maven/MavenSettings.java     | 278 ++++++++++++++++++++-
 .../java/org/jboss/modules/MavenResourceTest.java  |  17 +-
 .../modules/ModuleClassLoaderAliasReloadTest.java  |  66 ++++-
 .../jboss/modules/ModuleClassLoaderAliasTest.java  |  60 ++++-
 .../org/jboss/modules/maven/MavenSettingsTest.java |  53 +++-
 .../org/jboss/modules/maven/NonProxyHostTest.java  |  30 +++
 .../org/jboss/modules/maven/jboss-settings.xml     |  89 +++++++
 .../modules/maven/settings-empty-local-repo.xml    | 164 ++++++------
 .../main/dir/dependency-resource.txt               |   1 +
 .../main/dir/org/jboss/modules/test/ClassB.class   | Bin 0 -> 289 bytes
 .../dependency-module/main/module.xml              |  33 +++
 .../dependent-module-alias/main/module.xml         |  26 ++
 .../main/dir/org/jboss/modules/test/ClassA.class   | Bin 0 -> 302 bytes
 .../dependent-module/main/module.xml               |  34 +++
 25 files changed, 905 insertions(+), 167 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-modules.git