[Git][java-team/mojo-executor][upstream] New upstream version 2.4.1
Andrius Merkys (@merkys)
gitlab at salsa.debian.org
Wed Apr 16 14:55:34 BST 2025
Andrius Merkys pushed to branch upstream at Debian Java Maintainers / mojo-executor
Commits:
d187b4fe by Andrius Merkys at 2025-04-16T08:34:42-04:00
New upstream version 2.4.1
- - - - -
10 changed files:
- + .github/dependabot.yml
- .github/workflows/maven.yml
- .gitignore
- README.md
- 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/MojoExecutor.java
- mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
- pom.xml
Changes:
=====================================
.github/dependabot.yml
=====================================
@@ -0,0 +1,13 @@
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ target-branch: "main"
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ target-branch: "main"
=====================================
.github/workflows/maven.yml
=====================================
@@ -5,73 +5,66 @@ name: CI
on:
push:
- branches: main
+ branches: [main]
pull_request:
- branches: main
+ branches: [main]
jobs:
build:
strategy:
fail-fast: false
matrix:
- maven: [3.3.1, 3.5.4, 3.6.3, 3.8.1]
+ maven: [3.3.1, 3.5.4, 3.6.3, 3.8.8, 3.9.6, 4.0.0-alpha-13]
+ jdk: [11, 17]
+ exclude:
+ - maven: 4.0.0-alpha-13
+ jdk: 11
# 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
+ - uses: actions/checkout at v4
+ - name: Set up JDK
+ uses: actions/setup-java at v4
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
+ java-version: ${{ matrix.jdk }}
+ distribution: "temurin"
+ cache: 'maven'
- name: Set up Maven
- uses: stCarolas/setup-maven at v4
- with:
- maven-version: ${{ matrix.maven }}
+ run:
+ mvn -e -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper "-Dmaven=${{ matrix.maven }}"
- name: Build with Maven
- run: mvn -B -V install
+ run: ./mvnw -B -V -e install
# - name: Setup tmate session
# uses: mxschmitt/action-tmate at v3
# if: ${{ failure() }}
- name: Codecov
- uses: codecov/codecov-action at v1
+ uses: codecov/codecov-action at v4
snapshot:
- if: github.repository == 'mojo-executor/mojo-executor' && github.event_name == 'push' && github.ref == 'refs/heads/main'
+ if: github.repository == 'mojo-executor/mojo-executor' && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.actor != 'dependabot[bot]'
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-
+ - uses: actions/checkout at v4
- name: Set up JDK 11
- uses: actions/setup-java at v1
+ uses: actions/setup-java at v4
with:
java-version: 11
- # https://github.com/marketplace/actions/maven-setings-action
+ distribution: "temurin"
+ cache: 'maven'
+ # https://github.com/marketplace/actions/maven-settings-action
- name: Maven Settings
- uses: s4u/maven-settings-action at v2
+ uses: s4u/maven-settings-action at v3.0.0
with:
sonatypeSnapshots: true
githubServer: false
servers: |
[{
- "id": "sonatype-nexus-snapshots",
+ "id": "ossrh",
"username": "${{ secrets.SONATYPE_USERNAME }}",
"password": "${{ secrets.SONATYPE_PASSWORD }}"
}]
- name: Deploy Snapshot
run: mvn -B -V -Dmaven.deploy.skip=releases org.apache.maven.plugins:maven-source-plugin:jar-no-fork deploy
- name: Codecov
- uses: codecov/codecov-action at v1
+ uses: codecov/codecov-action at v4
=====================================
.gitignore
=====================================
@@ -6,3 +6,5 @@ target
.classpath
.project
.settings
+.mvn/wrapper/
+mvnw*
=====================================
README.md
=====================================
@@ -1,7 +1,7 @@
[](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.
+The Mojo Executor provides a way 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 Maintainers
=========================
@@ -35,8 +35,10 @@ Cheers,
News
====
-* 1 Sep 2021 — Mojo Executor 2.3.2 released (by Nick Cross) with various bug fixes and minor improvements
-* 21 Nov 2019 — Mojo Executor 2.3.1 released (by Nick Cross) with various bug fixes and minor improvements
+- 10 Mar 2022 — [Mojo Executor 2.4.0](https://github.com/mojo-executor/mojo-executor/releases/tag/mojo-executor-parent-2.4.0) released
+- 10 Feb 2022 — Mojo Executor 2.3.3 released with updated dependencies
+- 1 Sep 2021 — Mojo Executor 2.3.2 released (by Nick Cross) with various bug fixes and minor improvements
+- 21 Nov 2019 — Mojo Executor 2.3.1 released (by Nick Cross) with various bug fixes and minor improvements
- 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!
@@ -116,17 +118,20 @@ Add this to your pom.xml:
<dependency>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor</artifactId>
- <version>2.3.3</version>
+ <version>2.4.0</version>
</dependency>
</dependencies>
```
-There are a few versions available, and the best one to use will depend on the version(s) of Maven you need to support:
- - 1.0.1 — Supports Maven 2.x only
- - 1.5 — Supports both Maven 2.x and Maven 3.x
- - 2.0.x — Supports Maven 3.0.x only
- - 2.1.x — Supports Maven 3.0.x and 3.1.x
+Maven Compatibility
+===================
+
+- 2.4.x — Requires Maven 3.3.1 or later
+- 2.1.x/2.2.x — Support Maven 3.x
+- 2.0.x — Supports Maven 3.0.x only
+- 1.5.x — Supports both Maven 2.x and Maven 3.x
+- 1.0.1 — Supports Maven 2.x only
License
=======
=====================================
mojo-executor-maven-plugin/pom.xml
=====================================
@@ -20,7 +20,7 @@
<parent>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor-parent</artifactId>
- <version>2.4.0</version>
+ <version>2.4.1</version>
</parent>
<artifactId>mojo-executor-maven-plugin</artifactId>
=====================================
mojo-executor-maven-plugin/src/main/java/org/twdata/maven/mojoexecutor/plugin/MojoExecutorMojo.java
=====================================
@@ -25,7 +25,7 @@ import org.apache.maven.plugin.BuildPluginManager;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.*;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory;
@@ -62,7 +62,7 @@ public class MojoExecutorMojo extends AbstractMojo {
* Plugin configuration to use in the execution.
*/
@Parameter
- private XmlPlexusConfiguration configuration;
+ private PlexusConfiguration configuration;
/**
* The project currently being build.
=====================================
mojo-executor/pom.xml
=====================================
@@ -20,7 +20,7 @@
<parent>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor-parent</artifactId>
- <version>2.4.0</version>
+ <version>2.4.1</version>
</parent>
<artifactId>mojo-executor</artifactId>
=====================================
mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MojoExecutor.java
=====================================
@@ -125,10 +125,12 @@ public class MojoExecutor {
private static MojoExecution mojoExecution(MojoDescriptor mojoDescriptor, String executionId,
Xpp3Dom configuration) {
+ configuration = Xpp3DomUtils.mergeXpp3Dom(configuration, toXpp3Dom(mojoDescriptor.getMojoConfiguration()));
if (executionId != null) {
- return new MojoExecution(mojoDescriptor, executionId);
+ MojoExecution mojoExecution = new MojoExecution(mojoDescriptor, executionId);
+ mojoExecution.setConfiguration(configuration);
+ return mojoExecution;
} else {
- configuration = Xpp3DomUtils.mergeXpp3Dom(configuration, toXpp3Dom(mojoDescriptor.getMojoConfiguration()));
return new MojoExecution(mojoDescriptor, configuration);
}
}
=====================================
mojo-executor/src/test/java/org/twdata/maven/mojoexecutor/MojoExecutorTest.java
=====================================
@@ -288,10 +288,14 @@ public class MojoExecutorTest {
pluginManager
)
);
+ MojoExecution mojoExecution = new MojoExecution(copyDependenciesMojoDescriptor, "execution");
+ mojoExecution.setConfiguration(configuration(
+ element(name("outputDirectory"), "${project.build.directory}/foo")
+ ));
verify(pluginManager)
.executeMojo(
same(session),
- argThat(is(equalTo(new MojoExecution(copyDependenciesMojoDescriptor, "execution"))))
+ argThat(is(equalTo(mojoExecution)))
);
}
=====================================
pom.xml
=====================================
@@ -15,22 +15,16 @@
limitations under the License.
-->
<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>9</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor-parent</artifactId>
- <version>2.4.0</version>
+ <version>2.4.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
+ The Mojo Executor provides a way to execute other Mojos (plugins) within a Maven plugin, allowing you to
easily create Maven plugins that are composed of other plugins.
</description>
<url>https://mojo-executor.github.io/mojo-executor/</url>
@@ -104,13 +98,25 @@
<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.4.0</tag>
+ <tag>mojo-executor-parent-2.4.1</tag>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/mojo-executor/mojo-executor/issues</url>
</issueManagement>
+ <!-- https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication -->
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <repository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ </repository>
+ </distributionManagement>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.3.1</maven.version><!-- this is the minimum Maven distribution being supported -->
@@ -135,7 +141,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.4</version>
+ <version>3.13.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -180,7 +186,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.3.1</version>
+ <version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -202,7 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.9.0</version>
+ <version>3.12.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -211,43 +217,67 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.4</version>
+ <version>3.12.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.1</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <detectOfflineLinks>false</detectOfflineLinks>
- </configuration>
- </execution>
- </executions>
+ <version>3.6.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>3.2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.7</version>
+ <version>0.8.12</version>
<executions>
<execution>
<goals>
@@ -263,12 +293,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.13</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.4.1</version>
<executions>
<execution>
<id>enforce-dependencies</id>
@@ -278,7 +314,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[3.0,4.0)</version>
+ <version>[3.3.1,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>
@@ -286,12 +322,26 @@
</execution>
</executions>
</plugin>
+ <!-- https://central.sonatype.org/publish/publish-maven/#performing-a-release-deployment-with-the-maven-release-plugin -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
- <mavenExecutorId>forked-path</mavenExecutorId>
+ <useReleaseProfile>false</useReleaseProfile>
+ <releaseProfiles>release</releaseProfiles>
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+ <!-- https://central.sonatype.org/publish/publish-maven/#nexus-staging-maven-plugin-for-deployment-and-release -->
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
@@ -316,19 +366,40 @@
</build>
<profiles>
+ <!-- https://central.sonatype.org/publish/publish-maven/#using-a-profile -->
<profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
+ <id>release</id>
<build>
<plugins>
+ <!-- https://central.sonatype.org/publish/publish-maven/#javadoc-and-sources-attachments -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- https://central.sonatype.org/publish/publish-maven/#gpg-signed-components -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/-/commit/d187b4feafed9779688effcd35dcd5d494cba528
--
View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/-/commit/d187b4feafed9779688effcd35dcd5d494cba528
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/20250416/7e529080/attachment.htm>
More information about the pkg-java-commits
mailing list