[Git][java-team/mojo-executor][master] 12 commits: New upstream version 2.3.1

Andrius Merkys gitlab at salsa.debian.org
Mon Nov 25 11:38:37 GMT 2019



Andrius Merkys pushed to branch master at Debian Java Maintainers / mojo-executor


Commits:
522d5131 by Andrius Merkys at 2019-11-25T08:34:54Z
New upstream version 2.3.1
- - - - -
af1b8909 by Andrius Merkys at 2019-11-25T08:34:54Z
Update upstream source from tag 'upstream/2.3.1'

Update to upstream version '2.3.1'
with Debian dir 49c1fa40b13809b65340ae86f416dfd1a91a69cc
- - - - -
19fc19d2 by Andrius Merkys at 2019-11-25T08:35:41Z
Preparing to package 2.3.1.

- - - - -
8ba42e82 by Andrius Merkys at 2019-11-25T10:09:25Z
Removing patches, seeming integrated upstream.

- - - - -
4c8059df by Andrius Merkys at 2019-11-25T10:10:09Z
Ignoring tests.

- - - - -
7a8407d0 by Andrius Merkys at 2019-11-25T10:10:42Z
Removing test dependencies.

- - - - -
df6a84f5 by Andrius Merkys at 2019-11-25T10:19:37Z
Ignoring jacoco-maven-plugin.

- - - - -
b27147b7 by Andrius Merkys at 2019-11-25T10:46:03Z
Ignoring mockito-core.

- - - - -
c822be27 by Andrius Merkys at 2019-11-25T11:17:57Z
Updating my e-mail.

- - - - -
553f53a8 by Andrius Merkys at 2019-11-25T11:18:12Z
Wrapping and sorting.

- - - - -
79fb6073 by Andrius Merkys at 2019-11-25T11:18:36Z
Bumping debhelper compat level (no changes).

- - - - -
98a91105 by Andrius Merkys at 2019-11-25T11:19:25Z
Preparing for upload.

- - - - -


17 changed files:

- .travis.yml
- README.md
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/maven.ignoreRules
- debian/maven.properties
- − debian/patches/series
- − debian/patches/sonatype-to-eclipse.patch
- mojo-executor-maven-plugin/pom.xml
- mojo-executor-maven-plugin/src/main/java/org/twdata/maven/mojoexecutor/plugin/MojoExecutorMojo.java
- mojo-executor/pom.xml
- mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java
- mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MojoExecutor.java
- mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
- pom.xml


Changes:

=====================================
.travis.yml
=====================================
@@ -7,7 +7,7 @@ language: java
 #  - '3.5.0'
 
 jdk:
-  - oraclejdk7
+  - openjdk8
 
 # cache local Maven repo: http://docs.travis-ci.com/user/caching/
 cache:
@@ -26,4 +26,11 @@ env:
     - MAVEN=$PWD/apache-maven-3.5.0
 
 install: /bin/true
-script: export M2_HOME=$MAVEN ; export PATH=$M2_HOME/bin:$PATH ; mvn --version ; mvn clean install
+script:
+  - echo $JAVA_HOME
+  - export M2_HOME=$MAVEN
+  - export PATH=$M2_HOME/bin:$PATH
+  - mvn --version
+  - mvn clean install
+
+after_success: bash <(curl -s https://codecov.io/bash)


=====================================
README.md
=====================================
@@ -2,10 +2,14 @@
 
 The Mojo Executor provides a way to to execute other Mojos (plugins) within a Maven plugin, allowing you to easily create Maven plugins that are composed of other plugins.
 
-Note from the Maintainer
-========================
+Note from the Maintainers
+=========================
 
-I'm no longer maintaning this project actively, as I no longer use it (and have moved away from Maven and Java entirely). It's a simple library that does its job, and a lot of people are using it effectively in its current state.
+
+Tim Moore
+---------
+
+I'm no longer maintaining this project actively, as I no longer use it (and have moved away from Maven and Java entirely). It's a simple library that does its job, and a lot of people are using it effectively in its current state.
 
 I am happy to continue reviewing and merging pull requests, and releasing new versions to Maven Central. Most of the contributions so far have come from other people, and I'm very grateful to the people that have helped to improve Mojo Executor.
 
@@ -13,12 +17,24 @@ I do want to make it clear, however, that I won't be personally working on any b
 
 If anyone in the community would like to take over as full-time maintainer, let's talk! Email me at tmoore at incrementalism.net and we can set up a Skype call or Google Hangout to discuss it in detail.
 
-Cheers,  
+Cheers,
 — Tim
 
+
+Nick Cross
+----------
+
+While I am no longer actively using this plugin I am happy to review, assist with contributions, merge PRs and release new versions. I have released the last two versions (2.3.0/2.3.1) rolling up all the various fixes and improvements.
+
+Cheers,
+— Nick
+
+
+
 News
 ====
 
+-  4 May 2017 — Mojo Executor 2.3.0 released (by Nick Cross) with various bug fixes and minor improvements.
 - 27 Mar 2014 — Mojo Executor 1.5.2 released with support for Maven 2 through 3.1.
 - 12 Feb 2014 — I'm looking for a new maintainer for this project. If you're interested, please get in touch!
 - 26 Nov 2013 — Mojo Executor 2.2.0 released with support for attributes in plugin configuration.
@@ -74,7 +90,7 @@ private MavenSession mavenSession;
 private BuildPluginManager pluginManager;
 ```
 
-An alternative form for the executionEnvironment, ignoring the optional MavenProject, is: 
+An alternative form for the executionEnvironment, ignoring the optional MavenProject, is:
 ```
     executionEnvironment(
         mavenSession,
@@ -97,7 +113,7 @@ Add this to your pom.xml:
     <dependency>
         <groupId>org.twdata.maven</groupId>
         <artifactId>mojo-executor</artifactId>
-        <version>2.2.0</version>
+        <version>2.3.0</version>
     </dependency>
 </dependencies>
 ```


=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+mojo-executor (2.3.1-1) unstable; urgency=medium
+
+  * New upstream version 2.3.1
+  * Ignoring tests.
+  * Updating my e-mail.
+  * Wrapping and sorting.
+  * Bumping debhelper compat level (no changes).
+
+ -- Andrius Merkys <merkys at debian.org>  Mon, 25 Nov 2019 06:18:50 -0500
+
 mojo-executor (2.3.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #911286)


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12


=====================================
debian/control
=====================================
@@ -2,20 +2,18 @@ Source: mojo-executor
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andrius Merkys <andrius.merkys at gmail.com>
+Uploaders:
+ Andrius Merkys <merkys at debian.org>,
 Build-Depends:
- debhelper (>= 11),
+ debhelper (>= 12),
  default-jdk,
- junit4 (>= 4.12),
  libcommons-lang-java (>= 2.5),
- libhamcrest-java,
  libmaven-invoker-plugin-java,
  libmaven-plugin-tools-java (>= 3.5),
  libmaven3-core-java,
- libmockito-java,
  libplexus-utils2-java (>= 2.1),
  libslf4j-java (>= 1.7.22),
- maven-debian-helper (>= 2.1)
+ maven-debian-helper (>= 2.1),
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/mojo-executor.git
 Vcs-Browser: https://salsa.debian.org/java-team/mojo-executor
@@ -23,8 +21,11 @@ Homepage: https://timmoore.github.com/mojo-executor/
 
 Package: libmojo-executor-java
 Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}
-Suggests: ${maven:OptionalDepends}
+Depends:
+ ${maven:Depends},
+ ${misc:Depends},
+Suggests:
+ ${maven:OptionalDepends},
 Description: Maven Mojo Executor
  The Mojo Executor provides a way to execute other Mojos (plugins) within a
  Maven plugin, allowing one to easily create Maven plugins that are composed


=====================================
debian/copyright
=====================================
@@ -11,7 +11,7 @@ Copyright: 2008-2009, Don Brown <mrdon at twdata.org>
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2018, Andrius Merkys <andrius.merkys at gmail.com>
+Copyright: 2018-2019, Andrius Merkys <merkys at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,3 +1,5 @@
 
 org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
+org.jacoco jacoco-maven-plugin * * * *
+org.mockito mockito-core * * * *


=====================================
debian/maven.properties
=====================================
@@ -3,3 +3,4 @@
 # maven.test.skip=true
 # project.build.sourceEncoding=UTF-8
 
+maven.test.skip=true


=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-sonatype-to-eclipse.patch


=====================================
debian/patches/sonatype-to-eclipse.patch deleted
=====================================
@@ -1,24 +0,0 @@
---- a/mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java
-+++ b/mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java
-@@ -26,7 +26,7 @@
- import org.apache.maven.plugin.descriptor.PluginDescriptor;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
--import org.sonatype.aether.repository.RemoteRepository;
-+import org.eclipse.aether.repository.RemoteRepository;
- import org.twdata.maven.mojoexecutor.MojoExecutor.ExecutionEnvironment;
- 
- import java.lang.reflect.InvocationTargetException;
---- a/mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
-+++ b/mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
-@@ -34,8 +34,8 @@
- import org.junit.runner.RunWith;
- import org.mockito.Mock;
- import org.mockito.runners.MockitoJUnitRunner;
--import org.sonatype.aether.RepositorySystemSession;
--import org.sonatype.aether.repository.RemoteRepository;
-+import org.eclipse.aether.RepositorySystemSession;
-+import org.eclipse.aether.repository.RemoteRepository;
- 
- import java.util.List;
- import java.util.Map;


=====================================
mojo-executor-maven-plugin/pom.xml
=====================================
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.twdata.maven</groupId>
         <artifactId>mojo-executor-parent</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
     </parent>
 
     <artifactId>mojo-executor-maven-plugin</artifactId>
@@ -80,7 +80,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.4</version>
                 <executions>
                     <execution>
                         <id>default-descriptor</id>
@@ -94,7 +93,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-invoker-plugin</artifactId>
-                <version>2.0.0</version>
                 <configuration>
                     <!-- <debug>true</debug> -->
                     <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>


=====================================
mojo-executor-maven-plugin/src/main/java/org/twdata/maven/mojoexecutor/plugin/MojoExecutorMojo.java
=====================================
@@ -41,6 +41,7 @@ import static org.twdata.maven.mojoexecutor.PlexusConfigurationUtils.toXpp3Dom;
 /**
  * Execute a Mojo using the MojoExecutor.
  */
+ at SuppressWarnings("unused")
 @Mojo( name = "execute-mojo", defaultPhase = LifecyclePhase.TEST, requiresDependencyResolution = ResolutionScope.TEST)
 public class MojoExecutorMojo extends AbstractMojo {
     /**


=====================================
mojo-executor/pom.xml
=====================================
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.twdata.maven</groupId>
         <artifactId>mojo-executor-parent</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
     </parent>
 
     <artifactId>mojo-executor</artifactId>
@@ -66,6 +66,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>


=====================================
mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java
=====================================
@@ -24,9 +24,9 @@ import org.apache.maven.plugin.PluginDescriptorParsingException;
 import org.apache.maven.plugin.PluginNotFoundException;
 import org.apache.maven.plugin.PluginResolutionException;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.eclipse.aether.repository.RemoteRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonatype.aether.repository.RemoteRepository;
 import org.twdata.maven.mojoexecutor.MojoExecutor.ExecutionEnvironment;
 
 import java.lang.reflect.InvocationTargetException;


=====================================
mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MojoExecutor.java
=====================================
@@ -65,6 +65,7 @@ import static org.twdata.maven.mojoexecutor.PlexusConfigurationUtils.toXpp3Dom;
  *          );
  * </pre>
  */
+ at SuppressWarnings("WeakerAccess")
 public class MojoExecutor {
 
     private static final Logger logger = LoggerFactory.getLogger( MojoExecutor.class );
@@ -117,20 +118,7 @@ public class MojoExecutor {
             }
             MojoExecution exec = mojoExecution(mojoDescriptor, executionId, configuration);
             env.getPluginManager().executeMojo(session, exec);
-        // TODO : Consider using JDK7 multi-catch
-        } catch (PluginConfigurationException e) {
-            throw new MojoExecutionException("Unable to execute mojo", e);
-        } catch (PluginNotFoundException e) {
-            throw new MojoExecutionException("Unable to execute mojo", e);
-        } catch (InvalidPluginDescriptorException e) {
-            throw new MojoExecutionException("Unable to execute mojo", e);
-        } catch (PluginManagerException e) {
-            throw new MojoExecutionException("Unable to execute mojo", e);
-        } catch (PluginDescriptorParsingException e) {
-            throw new MojoExecutionException("Unable to execute mojo", e);
-        } catch (MojoFailureException e) {
-            throw new MojoExecutionException("Unable to execute mojo", e);
-        } catch (PluginResolutionException e) {
+        } catch (PluginConfigurationException | PluginNotFoundException | InvalidPluginDescriptorException | PluginManagerException | PluginDescriptorParsingException | MojoFailureException | PluginResolutionException e) {
             throw new MojoExecutionException("Unable to execute mojo", e);
         }
     }
@@ -209,7 +197,7 @@ public class MojoExecutor {
      * @return The plugin instance
      */
     public static Plugin plugin(String groupId, String artifactId, String version) {
-        return plugin(groupId, artifactId, version, Collections.<Dependency>emptyList());
+        return plugin(groupId, artifactId, version, Collections.emptyList());
     }
 
     /**


=====================================
mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
=====================================
@@ -24,18 +24,17 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.repository.RemoteRepository;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.repository.RemoteRepository;
 
 import java.util.List;
 import java.util.Map;
@@ -49,6 +48,8 @@ import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.attribute;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.attributes;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.dependencies;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.dependency;
@@ -60,8 +61,6 @@ import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.name;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.attributes;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.attribute;
 
 @RunWith(MockitoJUnitRunner.class)
 public class MojoExecutorTest {


=====================================
pom.xml
=====================================
@@ -17,244 +17,313 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>9</version>
+  </parent>
 
-    <groupId>org.twdata.maven</groupId>
-    <artifactId>mojo-executor-parent</artifactId>
-    <version>2.3.0</version>
-    <packaging>pom</packaging>
+  <groupId>org.twdata.maven</groupId>
+  <artifactId>mojo-executor-parent</artifactId>
+  <version>2.3.1</version>
+  <packaging>pom</packaging>
 
-    <name>Mojo Executor Parent</name>
-    <description>
-        The Mojo Executor provides a way to to execute other Mojos (plugins) within a Maven plugin, allowing you to
-        easily create Maven plugins that are composed of other plugins.
-    </description>
-    <url>http://timmoore.github.com/mojo-executor/</url>
-    <inceptionYear>2008</inceptionYear>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+  <name>Mojo Executor Parent</name>
+  <description>
+    The Mojo Executor provides a way to to execute other Mojos (plugins) within a Maven plugin, allowing you to
+    easily create Maven plugins that are composed of other plugins.
+  </description>
+  <url>http://timmoore.github.com/mojo-executor/</url>
+  <inceptionYear>2008</inceptionYear>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
-    <developers>
-        <developer>
-            <id>mrdon</id>
-            <name>Don Brown</name>
-            <email>mrdon at twdata.org</email>
-            <roles>
-                <role>Original Author</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>TimMoore</id>
-            <name>Tim Moore</name>
-            <email>tmoore at incrementalism.net</email>
-            <roles>
-                <role>Current Maintainer</role>
-            </roles>
-        </developer>
-    </developers>
-    <contributors>
-        <contributor>
-            <name>Jelmer Kuperus</name>
-        </contributor>
-        <contributor>
-            <name>Olivier Lamy</name>
-            <email>olamy at apache.org</email>
-        </contributor>
-        <contributor>
-            <name>Matthew McCullough</name>
-            <email>matthewm at ambientideas.com</email>
-        </contributor>
-        <contributor>
-            <name>Robert Munteanu</name>
-            <email>robert.munteanu at gmail.com</email>
-        </contributor>
-        <contributor>
-            <name>Gili Tzabari</name>
-            <email>cowwoc at bbs.darktech.org</email>
-        </contributor>
-        <contributor>
-            <name>Joseph Walton</name>
-            <email>joe at kafsemo.org</email>
-        </contributor>
-    </contributors>
+  <developers>
+    <developer>
+      <id>mrdon</id>
+      <name>Don Brown</name>
+      <email>mrdon at twdata.org</email>
+      <roles>
+        <role>Original Author</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>TimMoore</id>
+      <name>Tim Moore</name>
+      <email>tmoore at incrementalism.net</email>
+      <roles>
+        <role>Current Maintainer</role>
+      </roles>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Jelmer Kuperus</name>
+    </contributor>
+    <contributor>
+      <name>Olivier Lamy</name>
+      <email>olamy at apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Matthew McCullough</name>
+      <email>matthewm at ambientideas.com</email>
+    </contributor>
+    <contributor>
+      <name>Robert Munteanu</name>
+      <email>robert.munteanu at gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Gili Tzabari</name>
+      <email>cowwoc at bbs.darktech.org</email>
+    </contributor>
+    <contributor>
+      <name>Joseph Walton</name>
+      <email>joe at kafsemo.org</email>
+    </contributor>
+  </contributors>
 
-    <modules>
-        <module>mojo-executor</module>
-        <module>mojo-executor-maven-plugin</module>
-    </modules>
+  <modules>
+    <module>mojo-executor</module>
+    <module>mojo-executor-maven-plugin</module>
+  </modules>
 
-    <scm>
-        <connection>scm:git:git://github.com/TimMoore/mojo-executor.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/TimMoore/mojo-executor.git</developerConnection>
-        <url>https://github.com/TimMoore/mojo-executor</url>
-    </scm>
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/TimMoore/mojo-executor/issues</url>
-    </issueManagement>
+  <scm>
+    <connection>scm:git:git://github.com/TimMoore/mojo-executor.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/TimMoore/mojo-executor.git</developerConnection>
+    <url>https://github.com/TimMoore/mojo-executor</url>
+    <tag>mojo-executor-parent-2.3.1</tag>
+  </scm>
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/TimMoore/mojo-executor/issues</url>
+  </issueManagement>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.version>3.0.5</maven.version>
-    </properties>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.version>3.5.0</maven.version>
+  </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven</artifactId>
-                <version>${maven.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-model</artifactId>
-                <version>${maven.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven.plugin-tools</groupId>
-                <artifactId>maven-plugin-annotations</artifactId>
-                <version>3.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-embedder</artifactId>
-                <version>3.3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-utils</artifactId>
-                <version>2.1</version>
-            </dependency>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven</artifactId>
+        <version>${maven.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>${maven.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-annotations</artifactId>
+        <version>3.4</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-embedder</artifactId>
+        <version>3.3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>2.1</version>
+      </dependency>
 
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mojo-executor</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.12</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-core</artifactId>
-                <version>1.2</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>1.8.5</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.22</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.7.22</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>mojo-executor</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>1.3</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>1.8.5</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.25</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>1.7.25</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven</groupId>
-                    <artifactId>maven-invoker-plugin</artifactId>
-                    <version>2.0.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>3.6.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>3.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.1.1</version>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+              <configuration>
+                <detectOfflineLinks>false</detectOfflineLinks>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.8.4</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>report</id>
+              <phase>test</phase>
+              <goals>
+                <goal>report</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M2</version>
+        <executions>
+          <execution>
+            <id>enforce-dependencies</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[3.0,4.0)</version>
+                  <message>Version 2.x of Mojo Executor requires Maven ${maven.version}. Use Mojo Executor 1.x with Maven 2.</message>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <autoVersionSubmodules>true</autoVersionSubmodules>
+          <mavenExecutorId>forked-path</mavenExecutorId>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
         <plugins>
-             <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>[3.0,4.0)</version>
-                                    <message>Version 2.x of Mojo Executor requires Maven ${maven.version}. Use Mojo Executor 1.x with Maven 2.</message>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <mavenExecutorId>forked-path</mavenExecutorId>
-                </configuration>
-            </plugin>
+          <plugin>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.2</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+  </profiles>
 </project>



View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/compare/33c87a1a39d728560aac780269b438da79a3ac37...98a911053391be3dec2be532b081b14f5ad1085c

-- 
View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/compare/33c87a1a39d728560aac780269b438da79a3ac37...98a911053391be3dec2be532b081b14f5ad1085c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20191125/84db3bc2/attachment.html>


More information about the pkg-java-commits mailing list