[Git][java-team/mojo-executor][upstream] New upstream version 2.4.0

Andrius Merkys (@merkys) gitlab at salsa.debian.org
Mon Mar 14 09:32:22 GMT 2022



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


Commits:
46d74cf2 by Andrius Merkys at 2022-03-14T04:42:00-04:00
New upstream version 2.4.0
- - - - -


6 changed files:

- .github/workflows/maven.yml
- 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
- pom.xml


Changes:

=====================================
.github/workflows/maven.yml
=====================================
@@ -5,16 +5,16 @@ name: CI
 
 on:
   push:
-    branches: master
+    branches: main
   pull_request:
-    branches: master
+    branches: main
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        maven: [3.2.5, 3.5.4, 3.6.3, 3.8.1]
+        maven: [3.3.1, 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
@@ -44,7 +44,7 @@ jobs:
       uses: codecov/codecov-action at v1
 
   snapshot:
-    if: github.repository == 'mojo-executor/mojo-executor' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+    if: github.repository == 'mojo-executor/mojo-executor' && github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout at v2
@@ -72,6 +72,6 @@ jobs:
                 "password": "${{ secrets.SONATYPE_PASSWORD }}"
             }]
     - name: Deploy Snapshot
-      run: mvn -B -V org.apache.maven.plugins:maven-source-plugin:jar-no-fork deploy
+      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


=====================================
README.md
=====================================
@@ -116,7 +116,7 @@ Add this to your pom.xml:
     <dependency>
         <groupId>org.twdata.maven</groupId>
         <artifactId>mojo-executor</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.3</version>
     </dependency>
 </dependencies>
 ```


=====================================
mojo-executor-maven-plugin/pom.xml
=====================================
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.twdata.maven</groupId>
         <artifactId>mojo-executor-parent</artifactId>
-        <version>2.3.3</version>
+        <version>2.4.0</version>
     </parent>
 
     <artifactId>mojo-executor-maven-plugin</artifactId>
@@ -34,6 +34,9 @@
         testing purposes.
     </description>
 
+    <prerequisites>
+        <maven>${maven.version}</maven>
+    </prerequisites>
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -56,25 +59,32 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-embedder</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mojo-executor</artifactId>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <scope>compile</scope><!-- use compile scope due to https://issues.apache.org/jira/browse/MNG-6965  -->
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.plexus</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-embedder</artifactId>
-            <scope>provided</scope>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mojo-executor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
     </dependencies>
 
@@ -101,6 +111,7 @@
                     <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                     <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
                     <settingsFile>src/it/settings.xml</settingsFile>
+                    <streamLogsOnFailures>true</streamLogsOnFailures>
                 </configuration>
                 <executions>
                     <execution>


=====================================
mojo-executor-maven-plugin/src/main/java/org/twdata/maven/mojoexecutor/plugin/MojoExecutorMojo.java
=====================================
@@ -15,7 +15,7 @@
  */
 package org.twdata.maven.mojoexecutor.plugin;
 
-import org.apache.commons.lang.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.maven.cli.logging.Slf4jConfiguration;
 import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
 import org.apache.maven.execution.MavenSession;


=====================================
mojo-executor/pom.xml
=====================================
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.twdata.maven</groupId>
         <artifactId>mojo-executor-parent</artifactId>
-        <version>2.3.3</version>
+        <version>2.4.0</version>
     </parent>
 
     <artifactId>mojo-executor</artifactId>
@@ -28,21 +28,36 @@
     <name>Mojo Executor</name>
 
     <dependencies>
+        <!-- if you use this outside a Maven plugin the following transitive dependencies need to be provided, otherwise they are provided by the Maven Core classloader  -->
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <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.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
+            <scope>compile</scope><!-- use compile scope due to https://issues.apache.org/jira/browse/MNG-6965  -->
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.plexus</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -59,10 +74,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>


=====================================
pom.xml
=====================================
@@ -25,7 +25,7 @@
 
   <groupId>org.twdata.maven</groupId>
   <artifactId>mojo-executor-parent</artifactId>
-  <version>2.3.3</version>
+  <version>2.4.0</version>
   <packaging>pom</packaging>
 
   <name>Mojo Executor Parent</name>
@@ -104,7 +104,7 @@
     <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>
+    <tag>mojo-executor-parent-2.4.0</tag>
   </scm>
   <issueManagement>
     <system>GitHub</system>
@@ -113,11 +113,13 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.version>3.5.0</maven.version>
+    <maven.version>3.3.1</maven.version><!-- this is the minimum Maven distribution being supported -->
   </properties>
 
   <dependencyManagement>
     <dependencies>
+      <!-- dependencies exposed from the Maven Core classloader (https://maven.apache.org/guides/mini/guide-maven-classloading.html#2-core-classloader)
+           exported via https://github.com/apache/maven/blob/maven-3.3.1/maven-core/src/main/resources/META-INF/maven/extension.xml -->
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven</artifactId>
@@ -138,12 +140,24 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-embedder</artifactId>
-        <version>3.8.4</version>
+        <version>${maven.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.4.1</version>
+        <version>3.0.24</version><!-- should match version exported from Maven: https://github.com/apache/maven/blob/cab6659f9874fa96462afef40fcf6bc033d58c1c/pom.xml#L52
+        Using slightly newer (forward-compatible) version to silence warnings from security scanners
+         -->
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>org.eclipse.sisu.plexus</artifactId>
+        <version>0.3.0</version><!-- must match version exported from Maven: https://github.com/apache/maven/blob/cab6659f9874fa96462afef40fcf6bc033d58c1c/pom.xml#L56 -->
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.5</version><!-- must match version exported from Maven: https://github.com/apache/maven/blob/cab6659f9874fa96462afef40fcf6bc033d58c1c/pom.xml#L63 -->
       </dependency>
 
       <dependency>
@@ -170,19 +184,14 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.7.36</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>1.7.36</version>
+        <version>1.7.5</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -212,7 +221,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
+          <version>3.0.0-M2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>



View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/-/commit/46d74cf291b0b31289e76be7631c26862f8f7fc2

-- 
View it on GitLab: https://salsa.debian.org/java-team/mojo-executor/-/commit/46d74cf291b0b31289e76be7631c26862f8f7fc2
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/20220314/6fd34a36/attachment.htm>


More information about the pkg-java-commits mailing list