[Git][java-team/mojo-executor][upstream] New upstream version 2.3.3
Andrius Merkys (@merkys)
gitlab at salsa.debian.org
Mon Feb 14 09:29:05 GMT 2022
Andrius Merkys pushed to branch upstream at Debian Java Maintainers / mojo-executor
Commits:
8e82710e by Andrius Merkys at 2022-02-14T03:43:36-05:00
New upstream version 2.3.3
- - - - -
17 changed files:
- + .github/workflows/maven.yml
- − .travis.yml
- README.md
- mojo-executor-maven-plugin/pom.xml
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-blocking/pom.xml
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-blocking/postbuild.groovy
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-no-plugin-version/pom.xml
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-no-plugin-version/postbuild.groovy
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-null-maven-project/pom.xml
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-null-maven-project/postbuild.groovy
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-quiet/pom.xml
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project-quiet/postbuild.groovy
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project/pom.xml
- mojo-executor-maven-plugin/src/it/mojo-executor-test-project/postbuild.groovy
- mojo-executor/pom.xml
- mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
- pom.xml
Changes:
=====================================
.github/workflows/maven.yml
=====================================
@@ -0,0 +1,77 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: CI
+
+on:
+ push:
+ branches: master
+ pull_request:
+ branches: master
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ maven: [3.2.5, 3.5.4, 3.6.3, 3.8.1]
+ # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idif
+ if: github.repository == 'mojo-executor/mojo-executor' && github.event_name == 'pull_request'
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout at v2
+ - name: Cache local Maven repository
+ uses: actions/cache at v2
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Set up JDK 11
+ uses: actions/setup-java at v1
+ with:
+ java-version: 11
+ - name: Set up Maven
+ uses: stCarolas/setup-maven at v4
+ with:
+ maven-version: ${{ matrix.maven }}
+ - name: Build with Maven
+ run: mvn -B -V install
+ # - name: Setup tmate session
+ # uses: mxschmitt/action-tmate at v3
+ # if: ${{ failure() }}
+ - name: Codecov
+ uses: codecov/codecov-action at v1
+
+ snapshot:
+ if: github.repository == 'mojo-executor/mojo-executor' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout at v2
+ - name: Cache local Maven repository
+ uses: actions/cache at v2
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Set up JDK 11
+ uses: actions/setup-java at v1
+ with:
+ java-version: 11
+ # https://github.com/marketplace/actions/maven-setings-action
+ - name: Maven Settings
+ uses: s4u/maven-settings-action at v2
+ with:
+ sonatypeSnapshots: true
+ githubServer: false
+ servers: |
+ [{
+ "id": "sonatype-nexus-snapshots",
+ "username": "${{ secrets.SONATYPE_USERNAME }}",
+ "password": "${{ secrets.SONATYPE_PASSWORD }}"
+ }]
+ - name: Deploy Snapshot
+ run: mvn -B -V org.apache.maven.plugins:maven-source-plugin:jar-no-fork deploy
+ - name: Codecov
+ uses: codecov/codecov-action at v1
=====================================
.travis.yml deleted
=====================================
@@ -1,33 +0,0 @@
-# use http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-sudo: false
-
-language: java
-
-jdk:
- - openjdk8
-
-# cache local Maven repo: http://docs.travis-ci.com/user/caching/
-cache:
- directories:
- - '$HOME/.m2/repository'
-
-before_install:
- - wget https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip
- - unzip -q apache-maven-3.2.5-bin.zip
- - wget https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip
- - unzip -q apache-maven-3.5.0-bin.zip
-
-env:
- matrix:
- - MAVEN=$PWD/apache-maven-3.2.5
- - MAVEN=$PWD/apache-maven-3.5.0
-
-install: /bin/true
-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
=====================================
@@ -1,4 +1,4 @@
-[](https://travis-ci.org/TimMoore/mojo-executor)
+[](https://github.com/mojo-executor/mojo-executor/actions/workflows/maven.yml)
[](https://search.maven.org/artifact/org.twdata.maven/mojo-executor)
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.
@@ -149,7 +149,7 @@ It is currently maintained by [Tim Moore][TimMoore] (tmoore at incrementalism.net)
Thanks to the following contributors, who have provided patches and other assistance:
- [Matthew McCullough][matthewmccullough]
-- Gili Tzabari (cowwoc at bbs.darktech.org) — Maven 3 support
+- [Gili Tzabari][cowwoc] — Maven 3 support
- [Joseph Walton][josephw] — support for both Maven 2 and Maven 3 in the same artifact
- [Olivier Lamy][olamy] & [Robert Munteanu][rombert] — Maven 3.1 support
- [Jelmer Kuperus][jelmerk] — support for plugin dependencies
@@ -167,5 +167,6 @@ Thanks to the following contributors, who have provided patches and other assist
[msavelyev]: https://github.com/msavelyev
[ivan-dyachenko]: https://github.com/ivan-dyachenko
[cschoell]: https://github.com/cschoell
+[cowwoc]: https://github.com/cowwoc
[mojo-api]: http://maven.apache.org/developers/mojo-api-specification.html
=====================================
mojo-executor-maven-plugin/pom.xml
=====================================
@@ -20,7 +20,7 @@
<parent>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor-parent</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
</parent>
<artifactId>mojo-executor-maven-plugin</artifactId>
@@ -43,10 +43,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -72,6 +74,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-blocking/pom.xml
=====================================
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>runtime</scope>
</dependency>
<dependency>
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-blocking/postbuild.groovy
=====================================
@@ -20,6 +20,6 @@ def v1 = text.contains("[INFO] Executing 'org.apache.maven.plugins:maven-depende
def v2 = text.contains("""[INFO] The following files have been resolved:
[INFO] junit:junit:jar:4.11:test
[INFO] org.hamcrest:hamcrest-core:jar:1.3:test
-[INFO] org.slf4j:slf4j-api:jar:1.7.4:provided
-[INFO] org.slf4j:slf4j-nop:jar:1.7.4:runtime""");
+[INFO] org.slf4j:slf4j-api:jar:1.7.36:provided
+[INFO] org.slf4j:slf4j-nop:jar:1.7.36:runtime""");
return v1 && v2;
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-no-plugin-version/pom.xml
=====================================
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>runtime</scope>
</dependency>
<dependency>
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-no-plugin-version/postbuild.groovy
=====================================
@@ -20,6 +20,6 @@ return text.contains("""
[INFO] The following files have been resolved:
[INFO] junit:junit:jar:4.11:test
[INFO] org.hamcrest:hamcrest-core:jar:1.3:test
-[INFO] org.slf4j:slf4j-api:jar:1.7.4:provided
-[INFO] org.slf4j:slf4j-nop:jar:1.7.4:runtime
+[INFO] org.slf4j:slf4j-api:jar:1.7.36:provided
+[INFO] org.slf4j:slf4j-nop:jar:1.7.36:runtime
""");
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-null-maven-project/pom.xml
=====================================
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>runtime</scope>
</dependency>
<dependency>
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-null-maven-project/postbuild.groovy
=====================================
@@ -20,6 +20,6 @@ return text.contains("""
[INFO] The following files have been resolved:
[INFO] junit:junit:jar:4.11:test
[INFO] org.hamcrest:hamcrest-core:jar:1.3:test
-[INFO] org.slf4j:slf4j-api:jar:1.7.4:provided
-[INFO] org.slf4j:slf4j-nop:jar:1.7.4:runtime
+[INFO] org.slf4j:slf4j-api:jar:1.7.36:provided
+[INFO] org.slf4j:slf4j-nop:jar:1.7.36:runtime
""");
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-quiet/pom.xml
=====================================
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>runtime</scope>
</dependency>
<dependency>
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project-quiet/postbuild.groovy
=====================================
@@ -20,6 +20,6 @@ return ! text.contains("""
[INFO] The following files have been resolved:
[INFO] junit:junit:jar:4.11:test
[INFO] org.hamcrest:hamcrest-core:jar:1.3:test
-[INFO] org.slf4j:slf4j-api:jar:1.7.4:provided
-[INFO] org.slf4j:slf4j-nop:jar:1.7.4:runtime
+[INFO] org.slf4j:slf4j-api:jar:1.7.36:provided
+[INFO] org.slf4j:slf4j-nop:jar:1.7.36:runtime
""");
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project/pom.xml
=====================================
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.4</version>
+ <version>1.7.36</version>
<scope>runtime</scope>
</dependency>
<dependency>
=====================================
mojo-executor-maven-plugin/src/it/mojo-executor-test-project/postbuild.groovy
=====================================
@@ -20,6 +20,6 @@ return text.contains("""
[INFO] The following files have been resolved:
[INFO] junit:junit:jar:4.11:test
[INFO] org.hamcrest:hamcrest-core:jar:1.3:test
-[INFO] org.slf4j:slf4j-api:jar:1.7.4:provided
-[INFO] org.slf4j:slf4j-nop:jar:1.7.4:runtime
+[INFO] org.slf4j:slf4j-api:jar:1.7.36:provided
+[INFO] org.slf4j:slf4j-nop:jar:1.7.36:runtime
""");
=====================================
mojo-executor/pom.xml
=====================================
@@ -20,7 +20,7 @@
<parent>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor-parent</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
</parent>
<artifactId>mojo-executor</artifactId>
=====================================
mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
=====================================
@@ -25,7 +25,6 @@ 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;
@@ -33,20 +32,22 @@ import org.hamcrest.TypeSafeDiagnosingMatcher;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.AdditionalMatchers;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
import java.util.List;
import java.util.Map;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
import static org.twdata.maven.mojoexecutor.MojoExecutor.attribute;
import static org.twdata.maven.mojoexecutor.MojoExecutor.attributes;
@@ -92,7 +93,7 @@ public class MojoExecutorTest {
dependency("org.apache.maven.plugins", "some-plugin", "1.0")
)
)),
- anyListOf(RemoteRepository.class),
+ AdditionalMatchers.or(anyList(), isNull()),
same(repositorySession)
)).thenReturn(mavenDependencyPluginDescriptor);
}
=====================================
pom.xml
=====================================
@@ -25,7 +25,7 @@
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor-parent</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
<packaging>pom</packaging>
<name>Mojo Executor Parent</name>
@@ -33,7 +33,7 @@
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>
+ <url>https://mojo-executor.github.io/mojo-executor/</url>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -60,6 +60,14 @@
<role>Current Maintainer</role>
</roles>
</developer>
+ <developer>
+ <id>rnc</id>
+ <name>Nick Cross</name>
+ <email>ncross at redhat.com</email>
+ <roles>
+ <role>Current Maintainer</role>
+ </roles>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -79,7 +87,7 @@
</contributor>
<contributor>
<name>Gili Tzabari</name>
- <email>cowwoc at bbs.darktech.org</email>
+ <email>cowwoc2020 at gmail.com</email>
</contributor>
<contributor>
<name>Joseph Walton</name>
@@ -93,14 +101,14 @@
</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>
- <tag>mojo-executor-parent-2.3.2</tag>
+ <connection>scm:git:https://github.com/mojo-executor/mojo-executor.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/mojo-executor/mojo-executor.git</developerConnection>
+ <url>https://github.com/mojo-executor/mojo-executor</url>
+ <tag>mojo-executor-parent-2.3.3</tag>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/TimMoore/mojo-executor/issues</url>
+ <url>https://github.com/mojo-executor/mojo-executor/issues</url>
</issueManagement>
<properties>
@@ -125,17 +133,17 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.4</version>
+ <version>3.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
- <version>3.3.1</version>
+ <version>3.8.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>2.1</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
@@ -146,35 +154,35 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
+ <version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
+ <version>4.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.25</version>
+ <version>1.7.36</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -185,7 +193,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.9.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -194,12 +202,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.6.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -209,7 +217,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -225,12 +233,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.4</version>
+ <version>0.8.7</version>
<executions>
<execution>
<goals>
@@ -251,7 +259,7 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>enforce-dependencies</id>
@@ -311,7 +319,7 @@
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/-/commit/8e82710eaf906972196983a11cba0824b7f43f1f
--
View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/-/commit/8e82710eaf906972196983a11cba0824b7f43f1f
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/20220214/7dcb4cd2/attachment.htm>
More information about the pkg-java-commits
mailing list