.travis.yml

+language: java
+jdk:
+  - openjdk7
+  - openjdk8
+  - openjdk9
+  - openjdk10
+  - openjdk11
+  - openjdk-ea
+  
+dist: trusty
+
+#
+# Run all integration tests.
+script: 
+  - "mvn --show-version --errors --batch-mode clean verify"
+# -XX:MaxPermSize in mavenrc deprecated
+env: "MAVEN_SKIP_RC=true"
+#
+cache:
+    directories:
+    - $HOME/.m2
+branches:
+    except:
+        - gh-pages
+notifications:
+    email:
+        - rfscholte@apache.org

README.md

+Plexus-Classworlds
+===============
+
+[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/codehaus-plexus/plexus-classworlds.svg?label=License)](http://www.apache.org/licenses/)
+[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-classworlds.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%22plexus-classworlds%22)
+[![Build Status](https://travis-ci.org/codehaus-plexus/plexus-classworlds.svg?branch=master)](https://travis-ci.org/codehaus-plexus/plexus-classworlds)
+
+Current master is now at https://github.com/codehaus-plexus/plexus-classworlds

debian/changelog

+plexus-classworlds (2.6.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+  * Standards-Version updated to 4.3.0
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 11 Jan 2019 13:53:01 +0100
+
 plexus-classworlds (2.5.2-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -7,7 +7,7 @@ Uploaders:
  Damien Raude-Morvan <drazzib@debian.org>
 Build-Depends:
  ant,
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
  libcommons-logging-java,
@@ -16,9 +16,9 @@ Build-Depends:
  libmaven-dependency-plugin-java,
  libmaven-javadoc-plugin-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-classworlds.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-classworlds.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/plexus-classworlds.git
+Vcs-Browser: https://salsa.debian.org/java-team/plexus-classworlds
 Homepage: https://codehaus-plexus.github.io/plexus-classworlds/
 
 Package: libplexus-classworlds-java

debian/patches/01-tests.patch

@@ -3,9 +3,9 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -46,6 +46,15 @@
-     </site>
-   </distributionManagement>
+@@ -54,6 +54,15 @@
+     <javaVersion>7</javaVersion>
+   </properties> 
  
 +  <dependencies>
 +    <dependency>
@@ -19,7 +19,7 @@ Forwarded: not-needed
    <build>
      <pluginManagement>
        <plugins>
-@@ -137,17 +146,17 @@
+@@ -148,17 +157,17 @@
                  <artifactItem>
                    <groupId>org.apache.ant</groupId>
                    <artifactId>ant</artifactId>

debian/rules

@@ -9,6 +9,3 @@ override_dh_auto_install:
 	# Install the old 2.x pom in libplexus-classworlds2-java
 	mh_installpom -plibplexus-classworlds2-java -e2.x pom.xml
 	rm -Rf debian/libplexus-classworlds2-java/usr/share/maven-repo/org/codehaus/plexus/plexus-classworlds/debian
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename

debian/watch

-version=3
+version=4
+opts="repack,compression=xz" \
 https://github.com/codehaus-plexus/plexus-classworlds/tags/ .*/plexus-classworlds-(.*).tar.gz

pom.xml

@@ -21,11 +21,11 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus</artifactId>
-    <version>3.3.1</version>
+    <version>5.1</version>
   </parent>
 
   <artifactId>plexus-classworlds</artifactId>
-  <version>2.5.2</version>
+  <version>2.6.0</version>
   <packaging>bundle</packaging>
 
   <name>Plexus Classworlds</name>
@@ -33,36 +33,35 @@
   <inceptionYear>2002</inceptionYear>
 
   <scm>
-    <connection>scm:git:git@github.com:sonatype/plexus-classworlds.git</connection>
-    <developerConnection>scm:git:git@github.com:sonatype/plexus-classworlds.git</developerConnection>
-    <url>http://github.com/sonatype/plexus-classworlds</url>
-    <tag>plexus-classworlds-2.5.2</tag>
+    <connection>scm:git:git@github.com:codehaus-plexus/plexus-classworlds.git</connection>
+    <developerConnection>scm:git:git@github.com:codehaus-plexus/plexus-classworlds.git</developerConnection>
+    <url>http://github.com/codehaus-plexus/plexus-classworlds/tree/${project.scm.tag}/</url>
+    <tag>plexus-classworlds-2.6.0</tag>
   </scm>
+  <issueManagement>
+    <system>github</system>
+    <url>http://github.com/codehaus-plexus/plexus-classworlds/issues</url>
+  </issueManagement>
 
   <distributionManagement>
     <site>
-      <id>adm-site</id>
-      <url>scm:git:git@github.com:sonatype/plexus-classworlds.git</url>
+      <id>github:gh-pages</id>
+      <url>${project.scm.developerConnection}</url>
     </site>
   </distributionManagement>
   
+  <properties>
+    <javaVersion>7</javaVersion>
+  </properties> 
+
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.0</version>
-          <configuration>
-            <scmBranch>gh-pages</scmBranch>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
           <configuration>
-            <scmBranch>gh-pages</scmBranch>
+            <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->
           </configuration>
         </plugin>
         <plugin>
@@ -80,9 +79,23 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>scm-publish</id>
+            <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+            <goals>
+              <goal>publish-scm</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <version>3.5.1</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -115,8 +128,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
           <excludes>
             <exclude>org/codehaus/plexus/classworlds/event/*</exclude>
           </excludes>
@@ -184,7 +195,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.7</version>
         <configuration>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
         </configuration>

src/main/java/org/codehaus/classworlds/BytesURLConnection.java

@@ -22,10 +22,6 @@ import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 
 /**
- * @author Hani Suleiman (hani@formicary.net)
- *         <p/>
- *         Date: Oct 20, 2003
- *         Time: 12:46:01 AM
  */
 @Deprecated
 public class BytesURLConnection extends URLConnection

src/main/java/org/codehaus/classworlds/ClassRealm.java

@@ -51,13 +51,11 @@ import java.net.URL;
 import java.util.Enumeration;
 
 /**
- * Autonomous sub-portion of a <code>ClassWorld</code>.
- * <p/>
- * <p/>
- * This class most closed maps to the <code>ClassLoader</code>
+ * <p>Autonomous sub-portion of a <code>ClassWorld</code>.</p>
+ * 
+ * <p>This class most closed maps to the <code>ClassLoader</code>
  * role from Java and in facts can provide a <code>ClassLoader</code>
- * view of itself using {@link #getClassLoader}.
- * </p>
+ * view of itself using {@link #getClassLoader}.</p>
  *
  * @author <a href="mailto:bob@eng.werken.com">bob mcwhirter</a>
  * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>

src/main/java/org/codehaus/classworlds/ConfiguratorAdapter.java

@@ -21,10 +21,6 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 
 /**
- * Created by IntelliJ IDEA.
- *
- * @uthor: Andrew Williams
- * @since: Nov 25, 2006
  */
 @Deprecated
 public class ConfiguratorAdapter

src/main/java/org/codehaus/classworlds/DefaultClassRealm.java

@@ -92,6 +92,7 @@ public class DefaultClassRealm
      *
      *  @param constituent class name
      *  @param b the class definition as a byte[]
+     *  @throws ClassNotFoundException when class couldn't be loaded
      */
     public void addConstituent(String constituent,
                                byte[] b) throws ClassNotFoundException

src/main/java/org/codehaus/plexus/classworlds/launcher/ConfigurationHandler.java

@@ -40,18 +40,18 @@ public interface ConfigurationHandler
     /**
      * Define a new realm
      * @param realmName the new realm name
-     * @throws DuplicateRealmException
+     * @throws DuplicateRealmException when realm with name already exists
      */
     void addRealm( String realmName )
         throws DuplicateRealmException;
 
     /**
      * Add an import specification from a realm
-     * @param relamName the realm name
+     * @param realmName the realm name
      * @param importSpec the import specification
-     * @throws NoSuchRealmException
+     * @throws NoSuchRealmException if realm doesn't exist 
      */
-    void addImportFrom( String relamName, String importSpec )
+    void addImportFrom( String realmName, String importSpec )
         throws NoSuchRealmException;
 
     /**

src/main/java/org/codehaus/plexus/classworlds/launcher/ConfigurationParser.java

@@ -66,6 +66,12 @@ public class ConfigurationParser
 
     /**
      * Parse launcher configuration file and send events to the handler.
+     * 
+     * @param is the inputstream
+     * @throws IOException when IOException occurs
+     * @throws ConfigurationException when ConfigurationException occurs
+     * @throws DuplicateRealmException when realm already exists
+     * @throws NoSuchRealmException when realm doesn't exist 
      */
     public void parse( InputStream is )
         throws IOException, ConfigurationException, DuplicateRealmException, NoSuchRealmException
@@ -315,7 +321,7 @@ public class ConfigurationParser
      *                               a valid path element.
      * @throws FileNotFoundException If the line does not represent
      *                               a valid path element in the filesystem.
-     * @throws ConfigurationException 
+     * @throws ConfigurationException will never occur (thrown for backwards compatibility)
      */
     protected void loadGlob( String line,
                              boolean optionally )

src/main/java/org/codehaus/plexus/classworlds/launcher/Launcher.java

@@ -31,19 +31,15 @@ import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
 import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
 
 /**
- * Command-line invokable application launcher.
- * <p/>
- * <p/>
- * This launcher class assists in the creation of classloaders and <code>ClassRealm</code>s
+ * <p>Command-line invokable application launcher.</p>
+ * 
+ * <p>This launcher class assists in the creation of classloaders and <code>ClassRealm</code>s
  * from a configuration file and the launching of the application's <code>main</code>
- * method from the correct class loaded through the correct classloader.
- * </p>
- * <p/>
- * <p/>
- * The path to the configuration file is specified using the <code>classworlds.conf</code>
+ * method from the correct class loaded through the correct classloader.</p>
+ * 
+ * <p> The path to the configuration file is specified using the <code>classworlds.conf</code>
  * system property, typically specified using the <code>-D</code> switch to
- * <code>java</code>.
- * </p>
+ * <code>java</code>.</p>
  *
  * @author <a href="mailto:bob@eng.werken.com">bob mcwhirter</a>
  */
@@ -239,12 +235,9 @@ public class Launcher
     }
 
     /**
-     * Attempt to launch the application through the enhanced main method.
-     * <p/>
-     * <p/>
-     * This will seek a method with the exact signature of:
-     * </p>
-     * <p/>
+     * <p>Attempt to launch the application through the enhanced main method.</p>
+     * 
+     * <p>This will seek a method with the exact signature of:</p>
      * <pre>
      *  public static void main(String[] args, ClassWorld world)
      *  </pre>
@@ -297,12 +290,10 @@ public class Launcher
     }
 
     /**
-     * Attempt to launch the application through the standard main method.
-     * <p/>
-     * <p/>
-     * This will seek a method with the exact signature of:
-     * </p>
-     * <p/>
+     * <p>Attempt to launch the application through the standard main method.</p>
+     * 
+     * <p>This will seek a method with the exact signature of:</p>
+
      * <pre>
      *  public static void main(String[] args)
      *  </pre>

src/main/java/org/codehaus/plexus/classworlds/realm/ClassRealm.java

@@ -272,6 +272,30 @@ public class ClassRealm
         }
     }
 
+    // java11
+    protected Class<?> findClass( String moduleName, String name )
+    {
+        if ( moduleName != null )
+        {
+            return null;
+        }
+        try
+        {
+            return super.findClass( name );
+        }
+        catch ( ClassNotFoundException e )
+        {
+            try
+            {
+                return strategy.getRealm().findClass( name );
+            }
+            catch ( ClassNotFoundException nestedException )
+            {
+                return null;
+            }
+        }
+    }
+
     protected Class<?> findClass( String name )
         throws ClassNotFoundException
     {

src/main/java/org/codehaus/plexus/classworlds/strategy/Strategy.java

@@ -25,9 +25,6 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
 /**
  * A strategy is a class for defining how classes and resources are located
  * in classworlds.
- *
- * @uthor: Andrew Williams
- * @since: Nov 19, 2006
  */
 public interface Strategy
 {

src/main/java/org/codehaus/plexus/classworlds/strategy/StrategyFactory.java

@@ -20,9 +20,6 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
 
 /**
  * StrategyFactory loads a strategy, either default or from a given hint.
- *
- * @uthor: Andrew Williams
- * @since: Nov 19, 2006
  */
 public class StrategyFactory
 {

src/site/site.xml

@@ -3,14 +3,11 @@
   <bannerLeft>
     <name>Plexus Classworlds</name>
   </bannerLeft>
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
-  </skin>
   <body>
     <menu name="Overview">
       <item name="Introduction" href="index.html"/>
+      <item name="Launcher" href="launcher.html"/>
+      <item name="API Usage" href="apiusage.html"/>
       <item name="JavaDocs" href="apidocs/index.html"/>
       <item name="Source Xref" href="xref/index.html"/>
       <!--item name="FAQ" href="faq.html"/-->