debian/changelog

+modello-maven-plugin (1.11-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Depend on libmodello-java (>= 1.11)
+    - Depend on junit4 instead of junit
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889441)
+  * Standards-Version updated to 4.3.0
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 07 Jul 2019 22:19:57 +0200
+
 modello-maven-plugin (1.9.1-2) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -2,20 +2,22 @@ Source: modello-maven-plugin
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude@laposte.net>,
-           Damien Raude-Morvan <drazzib@debian.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.1)
-Build-Depends-Indep: junit,
+Uploaders: Ludovic Claude <ludovic.claude@laposte.net>
+Build-Depends:
+ debhelper (>= 10),
+ default-jdk,
+ junit4,
  libmaven-javadoc-plugin-java,
  libmaven-plugin-tools-java (>= 3.2),
  libmaven3-core-java,
-                     libmodello-java (>= 1.9.1-2~),
+ libmodello-java (>= 1.11),
  libplexus-build-api-java,
  libplexus-container-default1.5-java,
-                     libplexus-utils-java
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/modello-maven-plugin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/modello-maven-plugin.git
+ libplexus-utils-java,
+ maven-debian-helper (>= 2.1)
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/modello-maven-plugin.git
+Vcs-Browser: https://salsa.debian.org/java-team/modello-maven-plugin
 Homepage: http://codehaus-plexus.github.io/modello/modello-maven-plugin/
 
 Package: libmodello-maven-plugin-java

debian/maven.rules

@@ -16,6 +16,6 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/.*/4.x/ * *
 org.codehaus.plexus plexus-velocity jar s/.*/debian/ * *
 org.sonatype.plexus plexus-build-api jar s/.*/debian/ * *

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>
@@ -174,7 +174,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>2.0.0</version>
+            <version>3.0.1</version>
             <configuration>
               <projectsDirectory>src/it</projectsDirectory>
               <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -188,6 +188,7 @@
               <filterProperties>
                 <plexusUtilsVersion>3.0.22</plexusUtilsVersion>
                 <junitVersion>3.8.2</junitVersion>
+                <java.version>${java.version}</java.version>
               </filterProperties>
               <goals>
                 <goal>clean</goal>

src/it/clone-java5/pom.xml

@@ -31,21 +31,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.22.0</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>

src/it/clone/pom.xml

@@ -31,21 +31,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.22.0</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>

src/it/dom4j-no-plexus-utils/pom.xml

@@ -29,21 +29,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.22.0</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>

src/it/features/pom.xml

@@ -53,26 +53,26 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.22.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.7.1</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
@@ -125,7 +125,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
+        <version>3.0.1</version>
         <configuration>
           <show>private</show>
           <linksource>true</linksource>
@@ -133,12 +133,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.0.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.0.0</version>
         <reportSets>
           <reportSet>
             <reports>

src/it/javadoc/pom.xml

@@ -37,21 +37,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.22.0</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>

src/it/jdom-no-plexus-utils/pom.xml

@@ -29,21 +29,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.22.0</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>

src/it/maven-model/pom.xml

@@ -9,6 +9,15 @@
   <description>Maven Model</description>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>

src/it/maven-model/src/main/mdo/maven.mdo

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

src/it/stax-no-plexus-utils/pom.xml

@@ -35,21 +35,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.22.0</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>

src/main/java/org/codehaus/modello/maven/ModelloSnakeYamlExtendedReaderMojo.java

+package org.codehaus.modello.maven;
+
+/*
+ * Copyright (c) 2004-2012, Codehaus.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+
+/**
+ * Creates an Snake Yaml extended reader from the model. An extended reader populates the parsed model with metadata about
+ * the line/column from which the data was read if the model supports this.
+ *
+ * @since 1.8
+ * @author <a href="mailto:simonetripodi@apache.org">Simone Tripodi</a>
+ */
+@Mojo( name = "snakeyaml-extended-reader", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true )
+public class ModelloSnakeYamlExtendedReaderMojo
+    extends ModelloXpp3ReaderMojo
+{
+
+    @Override
+    protected String getGeneratorType()
+    {
+        return "snakeyaml-extended-reader";
+    }
+
+}

src/main/java/org/codehaus/modello/maven/ModelloXpp3ExtendedWriterMojo.java

+package org.codehaus.modello.maven;
+
+/*
+ * Copyright (c) 2004, Codehaus.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import java.util.Properties;
+
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.codehaus.modello.ModelloParameterConstants;
+
+/**
+ * Creates an XPP3 extended writer from the model. An extended writer renders the content with comments about the
+ * line/column from which the data was read if the model supports this.
+ *
+ * @author Hervé Boutemy
+ * @since 1.10
+ */
+@Mojo( name = "xpp3-extended-writer", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true )
+public class ModelloXpp3ExtendedWriterMojo
+    extends ModelloXpp3WriterMojo
+{
+    /**
+     * The class name suffix for the generated writer.
+     */
+    @Parameter( defaultValue = "Ex" )
+    private String extendedClassnameSuffix;
+
+    @Override
+    protected String getGeneratorType()
+    {
+        return "xpp3-extended-writer";
+    }
+
+    protected void customizeParameters( Properties parameters )
+    {
+        super.customizeParameters( parameters );
+
+        if ( extendedClassnameSuffix != null )
+        {
+            parameters.put( ModelloParameterConstants.EXTENDED_CLASSNAME_SUFFIX, extendedClassnameSuffix );
+        }
+    }
+}

src/site/apt/index.apt

@@ -25,7 +25,10 @@ Modello Maven Plugin
   * {{{./xpp3-reader-mojo.html}modello:xpp3-reader}} Generates an XML Pull Parser reader from the Modello model.
 
   * {{{./xpp3-extended-reader-mojo.html}modello:xpp3-extended-reader}} Generates an XML Pull Parser reader from the
-    Modello model that records line/column number metadata in the parsed model.
+    Modello model that records line/column number metadata and eventual source in the parsed model.
+
+  * {{{./xpp3-extended-writer-mojo.html}modello:xpp3-extended-writer}} Generates an XML Pull Parser writer from the
+    Modello model that writes line/column number and source info as comments on each line.
 
   * {{{./dom4j-writer-mojo.html}modello:dom4j-writer}} Generates a DOM4J writer from the Modello model.
 
@@ -37,6 +40,20 @@ Modello Maven Plugin
 
   * {{{./jdom-writer-mojo.html}modello:jdom-writer}} Generates a {{{http://www.jdom.org/}jdom}} writer from the model that is capable of preserving element ordering and comments.
 
+  * {{{./jackson-writer-mojo.html}modello:jackson-writer}} Generates a JSON writer based on Jackson Streaming APIs from the Modello model.
+
+  * {{{./jackson-reader-mojo.html}modello:jackson-reader}} Generates a JSON reader based on Jackson Streaming APIs from the Modello model.
+
+  * {{{./jackson-extended-reader-mojo.html}modello:jackson-extended-reader}} Generates a JSON reader based on Jackson Streaming APIs from the.
+    Modello model that records line/column number metadata in the parsed model.
+
+  * {{{./snakeyaml-writer-mojo.html}modello:snakeyaml-writer}} Generates a YAML writer based on SnakeYaml Streaming APIs from the Modello model.
+
+  * {{{./snakeyaml-reader-mojo.html}modello:snakeyaml-reader}} Generates a YAML reader based on SnakeYaml Streaming APIs from the Modello model.
+
+  * {{{./snakeyaml-extended-reader-mojo.html}modello:snakeyaml-extended-reader}} Generates a YAML reader based on SnakeYaml Streaming APIs from the.
+    Modello model that records line/column number metadata in the parsed model.
+
   * {{{./converters-mojo.html}modello:converters}} Generates classes that can convert between different versions of the model.
 
   []