Jenkinsfile

+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+asfMavenTlpPlgnBuild()

debian/changelog

+maven-plugin-tools (3.6.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Removed the patches (fixed upstream)
+    - No longer build the maven-plugin-tools-javadoc module (Closes: #898821)
+    - Depend on libasm-java (>= 7.0)
+  * Track and download the new releases from GitHub
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 26 Nov 2018 16:41:49 +0100
+
 maven-plugin-tools (3.5-6) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -2,14 +2,17 @@ Source: maven-plugin-tools
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner@debian.org>,
+Uploaders:
+ Torsten Werner <twerner@debian.org>,
  Ludovic Claude <ludovic.claude@laposte.net>
-Build-Depends: debhelper (>= 10), default-jdk
-Build-Depends-Indep: ant,
+Build-Depends:
+ ant,
  ant-optional,
-                     libbsh-java,
+ debhelper (>= 11),
+ default-jdk,
  junit,
-                     libasm-java (>= 5.0),
+ libasm-java (>= 7.0),
+ libbsh-java,
  libdoxia-sitetools-java,
  libeasymock-java,
  libjtidy-java,
@@ -26,16 +29,16 @@ Build-Depends-Indep: ant,
  libqdox2-java,
  maven-debian-helper (>= 2.0.3),
  velocity
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-plugin-tools.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-plugin-tools.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/maven-plugin-tools.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-plugin-tools
 Homepage: http://maven.apache.org/plugin-tools/
 
 Package: libmaven-plugin-tools-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Suggests: ${maven:OptionalDepends}
-Breaks: maven (<< 3.5.0-2~), libmaven2-core-java (<< 2.2.1-27~)
+Breaks: libmaven2-core-java (<< 2.2.1-27~), maven (<< 3.5.0-2~)
 Description: Maven Plugin Tools
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven Plugin Tools
-Source: http://maven.apache.org
+Source: https://github.com/apache/maven-plugin-tools
 
 Files: *
 Copyright: 2006-2014, The Apache Software Foundation

debian/libmaven-plugin-tools-java.poms

@@ -32,7 +32,6 @@ maven-plugin-tools-annotations/pom.xml --has-package-version
 maven-plugin-tools-api/pom.xml --has-package-version
 maven-plugin-tools-generators/pom.xml --has-package-version
 maven-plugin-tools-java/pom.xml --has-package-version
-maven-plugin-tools-javadoc/pom.xml --has-package-version
 maven-script/pom.xml --has-package-version
 maven-script/maven-plugin-tools-ant/pom.xml --has-package-version
 maven-script/maven-plugin-tools-beanshell/pom.xml --has-package-version

debian/maven.ignoreRules

 
 org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.maven.plugins maven-invoker-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
 org.easytesting fest-assert * * * *

debian/maven.properties

@@ -3,3 +3,4 @@
 # maven.test.skip=true
 
 maven.test.skip=true
+maven.compiler.release=7

debian/orig-tar.sh

-#!/bin/sh -e
-
-TAR=../maven-plugin-tools_$2.orig.tar.xz
-DIR=maven-plugin-tools-$2
-TAG=maven-plugin-tools-$2
-
-svn export http://svn.apache.org/repos/asf/maven/plugin-tools/tags/$TAG $DIR
-tar -c -J -f $TAR $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
-fi

debian/patches/04-reproducible-plugin-descriptor.patch

-Author: Reiner Herrmann <reiner@reiner-h.de>
-Description: Don't include the date in xml files
- Embedding the current date will result in unreproducible files.
-
---- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
-+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
-@@ -24,8 +24,6 @@
- import java.io.IOException;
- import java.io.OutputStreamWriter;
- import java.io.Writer;
--import java.text.SimpleDateFormat;
--import java.util.Date;
- import java.util.LinkedHashMap;
- import java.util.LinkedHashSet;
- import java.util.List;
-@@ -129,8 +127,7 @@
- 
-             XMLWriter w = new PrettyPrintXMLWriter( writer, encoding, null );
- 
--            w.writeMarkup( "\n<!-- Generated by maven-plugin-tools " + getVersion() + " on " + new SimpleDateFormat(
--                "yyyy-MM-dd" ).format( new Date() ) + " -->\n\n" );
-+            w.writeMarkup( "\n<!-- Generated by maven-plugin-tools " + getVersion() + " -->\n\n" );
- 
-             w.startElement( "plugin" );
- 

debian/patches/07-maven-compatibility.patch

-Description: Fixes the compatibility with the version of Maven in Debian
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
---- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
-+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
-@@ -733,9 +733,9 @@
-             return "Unknown";
-         }
- 
--        private static Plugin getCompilerPlugin( Map<String, Object> pluginsAsMap )
-+        private static Plugin getCompilerPlugin( Map<String, Plugin> pluginsAsMap )
-         {
--            return (Plugin) pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" );
-+            return pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" );
-         }
- 
-         private static String getPluginParameter( Plugin plugin, String parameter )
---- a/maven-plugin-plugin/pom.xml
-+++ b/maven-plugin-plugin/pom.xml
-@@ -239,6 +239,14 @@
-         </configuration>
-       </plugin>
-       <plugin>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <excludes>
-+            <exclude>**/UpdatePluginRegistryMojo.java</exclude>
-+          </excludes>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-enforcer-plugin</artifactId>
-         <executions>

debian/patches/series

-04-reproducible-plugin-descriptor.patch
-07-maven-compatibility.patch

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename

debian/watch

 version=3
-http://svn.apache.org/repos/asf/maven/plugin-tools/tags/ \
-  maven-plugin-tools-(.*)/ debian debian/orig-tar.sh
+opts="repack,compression=xz" \
+https://github.com/apache/maven-plugin-tools/tags .*/maven-plugin-tools-(.*).tar.gz

maven-plugin-annotations/pom.xml

@@ -23,13 +23,13 @@
   <parent>
     <artifactId>maven-plugin-tools</artifactId>
     <groupId>org.apache.maven.plugin-tools</groupId>
-    <version>3.5</version>
+    <version>3.6.0</version>
   </parent>
 
   <artifactId>maven-plugin-annotations</artifactId>
 
-  <name>Maven Plugin Tools Java 5 Annotations</name>
-  <description>Java 5 annotations to use in Mojos</description>
+  <name>Maven Plugin Tools Java Annotations</name>
+  <description>Java annotations to use in Mojos</description>
 
   <dependencies>
     <dependency>

maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java

@@ -30,6 +30,10 @@ import java.lang.annotation.Target;
  * Used to configure your Mojo parameters to be injected by
  * <a href="/ref/current/maven-core/apidocs/org/apache/maven/plugin/MavenPluginManager.html">
  * <code>MavenPluginManager.getConfiguredMojo(...)</code></a>.
+ * <p>
+ * Beans injected into Mojo parameters are prepared by <a href="https://www.eclipse.org/sisu/">Sisu</a> JSR330-based
+ * container: this annotation is only effective on fields of the Mojo class itself, nested bean injection
+ * requires Sisu or JSR330 annotations.
  *
  * @author Olivier Lamy
  * @since 3.0

maven-plugin-annotations/src/site/apt/index.apt.vm

@@ -32,7 +32,7 @@ About ${project.name}
 
 * Usage
 
-  To be able to {{{../maven-plugin-tools-annotations/index.html}use Maven Plugin Tools Java 5 Annotations}},
+  To be able to {{{../maven-plugin-tools-annotations/index.html}use Maven Plugin Tools Java Annotations}},
   some configuration has to be done in <<<pom.xml>>>: see
   {{{../maven-plugin-plugin/examples/using-annotations.html#POM_configuration} Using Plugin Tools Java5 Annotations}}
   example in {{{../maven-plugin-plugin} <<<maven-plugin-plugin>>>}} documentation.

maven-plugin-plugin/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <artifactId>maven-plugin-tools</artifactId>
     <groupId>org.apache.maven.plugin-tools</groupId>
-    <version>3.5</version>
+    <version>3.6.0</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>
@@ -33,14 +33,10 @@
   <name>Maven Plugin Plugin</name>
   <description>
     The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's found in the source tree,
-    to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as for updating the
-    plugin registry, the artifact metadata and a generic help goal.
+    to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as the artifact metadata
+    and a generic help goal.
   </description>
 
-  <prerequisites>
-    <maven>2.2.1</maven>
-  </prerequisites>
-
   <properties>
     <doxiaVersion>1.4</doxiaVersion>
     <doxia-sitetoolsVersion>1.4</doxia-sitetoolsVersion>
@@ -48,6 +44,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
@@ -116,24 +116,6 @@
       <artifactId>maven-repository-metadata</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-descriptor</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-registry</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
@@ -214,7 +196,7 @@
           <configuration>
             <excludes combine.children="append">
               <!-- This file should exactly match the output of this project -->
-              <exclude>src/it/help-basic/expected-help.txt</exclude>
+              <exclude>src/it/help-basic**/expected-help**.txt</exclude>
             </excludes>
           </configuration>
         </plugin>
@@ -264,6 +246,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.5</version>
         <!-- will use previous maven-plugin-plugin release to build current maven-plugin-plugin as configured in parent -->
         <executions>
           <execution>
@@ -374,6 +357,7 @@
               <properties>
                 <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
                 <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+                <https.protocols>${https.protocols}</https.protocols>
               </properties>
             </configuration>
             <executions>
@@ -389,34 +373,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>maven-2</id>
-      <activation>
-        <file>
-          <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
-          <missing>${basedir}</missing>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-plugin-plugin</artifactId>
-            <configuration>
-              <!-- see https://issues.apache.org/jira/browse/MNG-5346 -->
-              <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-            </configuration>
-            <executions>
-              <execution>
-                <id>mojo-descriptor</id>
-                <goals>
-                  <goal>descriptor</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>    
   </profiles>
 </project>

maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml

@@ -43,11 +43,6 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
       <version>@mavenVersion@</version>
     </dependency>
     <dependency>

maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml

@@ -56,12 +56,6 @@ under the License.
       <artifactId>junit</artifactId>
       <version>3.8.2</version>
     </dependency>
-    
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>@mavenVersion@</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>