.travis.yml

 language: java
 jdk:
-  - oraclejdk7
-  - oraclejdk8
-  - openjdk6
-
+  - openjdk7
+  - openjdk9
+  - openjdk10
+  - openjdk11
 
 # No need for preliminary install step.
 install: true

debian/changelog

+modello (1.11-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Depend on junit4 instead of junit
+  * Removed the -java-doc package
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 07 Jul 2019 16:24:58 +0200
+
 modello (1.9.1-4) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -8,17 +8,15 @@ Uploaders:
 Build-Depends:
  debhelper (>= 11~),
  default-jdk,
- default-jdk-doc,
- junit,
+ junit4,
  libjdom1-java,
  libjsoup-java,
  libmaven-dependency-plugin-java,
- libmaven-javadoc-plugin-java,
  libplexus-build-api-java,
  libplexus-compiler-java,
  libplexus-container-default-java (>= 1.7.1-6~),
  maven-debian-helper (>= 2.2~)
-Standards-Version: 4.1.5
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/modello.git
 Vcs-Browser: https://salsa.debian.org/java-team/modello
 Homepage: http://codehaus-plexus.github.io/modello/
@@ -26,7 +24,7 @@ Homepage: http://codehaus-plexus.github.io/modello/
 Package: libmodello-java
 Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
-Suggests: ${maven:OptionalDepends}, libmodello-java-doc
+Suggests: ${maven:OptionalDepends}
 Description: Data Model toolkit in use by the Maven 2 Project
  Once a DataModel is defined, the toolkit can be used to generate any of the
  following at compile time.
@@ -38,22 +36,3 @@ Description: Data Model toolkit in use by the Maven 2 Project
     * XML Schema to validate the DataModel.
  .
  Modello is used to build the maven system.
-
-Package: libmodello-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
-Suggests: libmodello-java
-Description: Data Model toolkit in use by the Maven 2 Project (documentation)
- Once a DataModel is defined, the toolkit can be used to generate any of the
- following at compile time.
- .
-    * Java Pojos of the DataModel.
-    * Java Pojos to XML Writer. (provided via xpp3, stax, jdom or dom4j)
-    * XML to Java Pojos Reader. (provided via xpp3, stax or dom4j)
-    * XDOC documentation of the DataModel.
-    * XML Schema to validate the DataModel.
- .
- Modello is used to build the maven system.
- .
- This package provides the API documentation for Modello.

debian/libmodello-java-doc.doc-base

-Document: libmodello-java
-Title: API Javadoc for libmodello-java
-Author: Codehaus developers
-Abstract: This is the API Javadoc provided by the libmodello-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libmodello-java/api/index.html
-Files: /usr/share/doc/libmodello-java/api/*

debian/libmodello-java-doc.install

-target/site/apidocs/* usr/share/doc/libmodello-java/api

debian/maven.rules

-junit junit jar s/3\..*/3.x/
+junit junit jar s/.*/4.x/
 org.apache.maven maven-* * s/.*/3.x/ * *

debian/patches/01-plexus-utils-compatibility.patch

@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
 +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
-@@ -267,7 +267,7 @@
+@@ -252,7 +252,7 @@
  
          sc = unmarshall.getSourceCode();
  
@@ -13,7 +13,7 @@ Forwarded: not-needed
  
          sc.add( "" );
  
-@@ -275,6 +275,8 @@
+@@ -260,6 +260,8 @@
  
          sc.add( "" );
  
@@ -22,7 +22,7 @@ Forwarded: not-needed
          sc.add( "" );
  
          sc.add( "return " + readerMethodName + "( parser, strict" + trackingArgs + " );" );
-@@ -355,7 +357,6 @@
+@@ -340,7 +342,6 @@
  
          jClass.addImport( "org.codehaus.plexus.util.ReaderFactory" );
          jClass.addImport( "org.codehaus.plexus.util.xml.pull.MXParser" );
@@ -30,7 +30,7 @@ Forwarded: not-needed
          jClass.addImport( "org.codehaus.plexus.util.xml.pull.XmlPullParser" );
          jClass.addImport( "org.codehaus.plexus.util.xml.pull.XmlPullParserException" );
          jClass.addImport( "java.io.InputStream" );
-@@ -1097,6 +1098,288 @@
+@@ -1092,6 +1093,288 @@
          }
      }
  
@@ -319,7 +319,7 @@ Forwarded: not-needed
      private void writeBuildDomMethod( JClass jClass )
      {
          if ( domAsXpp3 )
-@@ -1250,6 +1533,8 @@
+@@ -1274,6 +1557,8 @@
          jClass.addMethod( getCheckUnknonwElement2Method() );
          jClass.addMethod( getCheckUnknownAttributeMethod() );
          jClass.addMethod( getNextTagMethod() );
@@ -328,7 +328,7 @@ Forwarded: not-needed
      }
  
      private JMethod getCheckUnknonwElement2Method() {
-@@ -1597,6 +1882,20 @@
+@@ -1621,6 +1906,20 @@
  
          return method;
      }

debian/patches/02-ignore-removed-modules.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -175,9 +175,7 @@
+@@ -183,9 +183,7 @@
    </mailingLists>
  
    <modules>

modello-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>modello</artifactId>
     <groupId>org.codehaus.modello</groupId>
-    <version>1.9.1</version>
+    <version>1.11</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

modello-core/src/main/java/org/codehaus/modello/ModelloParameterConstants.java

@@ -65,6 +65,11 @@ public class ModelloParameterConstants
      */
     public static final String DOM_AS_XPP3 = "modello.dom.xpp3";
 
+    /**
+     * @since 1.10
+     */
+    public static final String EXTENDED_CLASSNAME_SUFFIX = "modello.xpp3.extended.suffix";
+
     private ModelloParameterConstants()
     {
     }

modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java

@@ -180,7 +180,7 @@ public abstract class AbstractModelloGenerator
             return str;
         }
 
-        return new StringBuffer( str.length() )
+        return new StringBuilder( str.length() )
             .append( Character.toTitleCase( str.charAt( 0 ) ) )
             .append( str.substring( 1 ) )
             .toString();
@@ -220,7 +220,7 @@ public abstract class AbstractModelloGenerator
             return str;
         }
 
-        return new StringBuffer( str.length() )
+        return new StringBuilder( str.length() )
             .append( Character.toLowerCase( str.charAt( 0 ) ) )
             .append( str.substring( 1 ) )
             .toString();

modello-plugins/modello-plugin-converters/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>modello-plugins</artifactId>
     <groupId>org.codehaus.modello</groupId>
-    <version>1.9.1</version>
+    <version>1.11</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

modello-plugins/modello-plugin-converters/src/test/resources/models/maven.mdo

@@ -493,7 +493,7 @@
           <code>
             public String getId()
             {
-            StringBuffer id = new StringBuffer();
+            StringBuilder id = new StringBuilder();
 
             id.append( getGroupId() );
             id.append( ":" );

modello-plugins/modello-plugin-dom4j/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>modello-plugins</artifactId>
     <groupId>org.codehaus.modello</groupId>
-    <version>1.9.1</version>
+    <version>1.11</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

modello-plugins/modello-plugin-dom4j/src/test/resources/maven.mdo

@@ -491,7 +491,7 @@
           <code>
             public String getId()
             {
-            StringBuffer id = new StringBuffer();
+            StringBuilder id = new StringBuilder();
 
             id.append( getGroupId() );
             id.append( ":" );

modello-plugins/modello-plugin-jackson/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>modello-plugins</artifactId>
     <groupId>org.codehaus.modello</groupId>
-    <version>1.9.1</version>
+    <version>1.11</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

modello-plugins/modello-plugin-jackson/src/site/xdoc/index.xml

@@ -36,7 +36,7 @@
       </subsection>
 
       <subsection name="jackson-writer">
-      <p><code>stax-writer</code> generator creates
+      <p><code>jackson-writer</code> generator creates
         <code><i>my.model.package</i><b>.io.jackson.</b><i>ModelName</i><b>JacksonWriter</b></code> class with following
         public methods:
       </p>
@@ -49,6 +49,14 @@
       </ul>
       </subsection>
 
+      <subsection name="jackson-extended-reader">
+      <p><code>jackson-extended-reader</code> generator creates
+      <code><i>my.model.package</i><b>.io.jackson.</b><i>ModelName</i><b>JacksonReaderEx</b></code> class with same public methods
+      as <code>jackson-reader</code>, but with <a href="../../location-tracking.html">location tracking enabled</a>.</p>
+      <p>If source tracking is enabled in addition to location tracking, the public methods have an extra parameter which
+      is the source tracker instance.</p>
+      </subsection>
+
     </section>
 
   </body>

modello-plugins/modello-plugin-jackson/src/test/resources/maven.mdo

@@ -515,7 +515,7 @@
           <code>
             public String getId()
             {
-            StringBuffer id = new StringBuffer();
+            StringBuilder id = new StringBuilder();
 
             id.append( getGroupId() );
             id.append( ":" );

modello-plugins/modello-plugin-java/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>modello-plugins</artifactId>
     <groupId>org.codehaus.modello</groupId>
-    <version>1.9.1</version>
+    <version>1.11</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java

@@ -158,7 +158,7 @@ public abstract class AbstractJavaModelloGenerator
         }
     }
 
-    private void addModelImport( JClass jClass, ModelType modelType, String basePackageName )
+    protected void addModelImport( JClass jClass, ModelType modelType, String basePackageName )
     {
         String packageName = modelType.getPackageName( isPackageWithVersion(), getGeneratedVersion() );