You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2024/04/21 17:54:20 UTC

(maven-file-management) branch mvn4 updated (850d7a2 -> 029f42f)

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-file-management.git


 discard 850d7a2  mvn4 aggregator
     add c7153b1  [MSHARED-1090] Update module (#11)
     add 70c60f9  Bump version to 3.1.0
     add 2d8c1d2  Fix GIT URLs
     add 37b3d9e  [maven-release-plugin] prepare release file-management-3.1.0
     add 65d0e04  [maven-release-plugin] prepare for next development iteration
     add 925d494  Add ciManagement
     add c2cb608  add Reproducible Builds badge
     add 027c5e4  update to parent pom 39 (#12)
     add 3a1e97d  MSHARED-1203 use Java 7 symbolic links (#13)
     add fe8d3a1  Auto-link MSHARED Jira
     add 8baf14e  Add GitHub Actions setup and Dependabot
     add a1cb60c  Revert "MSHARED-1203 use Java 7 symbolic links (#13)"
     add ec4e1eb  [MSHARED-1264] Convert to JUnit5
     add 4e31ef4  use JUnit @TempDir (#19)
     add 564c257  [MSHARED-1265] use JUnit assumptions (#22)
     add 638f36a  [MSHARED-1266] upgrade commons-io 2.11.0 --> 2.13.0 (#21)
     add af5229e  Java 7 has can detect symbolic links (#20)
     add 540165d  [MSHARED-1203] no longer need to shell out to create a symbolic link (#24)
     add 198b7c0  fix JUnit dependencies (#25)
     add 269ee1b  Ignore reformat commit after parent pom update
     add e301d1e  remove duplicate tests and unneeded code (#23)
     add 9ded36b  Bump org.junit:junit-bom from 5.9.3 to 5.10.0
     add d1d0e7d  Bump org.junit:junit-bom from 5.10.0 to 5.10.1
     add c94fa7d  Bump org.junit:junit-bom from 5.10.1 to 5.10.2
     add 1e77a55  Bump apache/maven-gh-actions-shared from 3 to 4
     add 9fd9cd9  [MSHARED-1381] Upgrade parent pom to 42
     add 0176d64  [MSHARED-1380] Upgrade commons-io to 2.16.1
     new 029f42f  mvn4 aggregator

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (850d7a2)
            \
             N -- N -- N   refs/heads/mvn4 (029f42f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .asf.yaml                                          |  11 +
 .../download.cgi => .git-blame-ignore-revs         |   9 +-
 .../download.cgi => .github/dependabot.yml         |  24 +-
 .../workflows/maven-verify.yml                     |  19 +-
 README.md                                          |   1 +
 pom.xml                                            |  73 +--
 .../model/fileset/mappers/FileNameMapper.java      |  12 +-
 .../model/fileset/mappers/FlatFileNameMapper.java  |  24 +-
 .../model/fileset/mappers/GlobPatternMapper.java   |  81 ++--
 .../model/fileset/mappers/IdentityMapper.java      |  22 +-
 .../model/fileset/mappers/MapperException.java     |  17 +-
 .../shared/model/fileset/mappers/MapperUtil.java   |  82 ++--
 .../model/fileset/mappers/MergingMapper.java       |  22 +-
 .../model/fileset/mappers/PackageNameMapper.java   |  16 +-
 .../model/fileset/mappers/RegexpPatternMapper.java |  33 +-
 .../model/fileset/mappers/UnPackageNameMapper.java |  16 +-
 .../shared/model/fileset/util/FileSetManager.java  | 496 +++++++--------------
 .../shared/model/fileset/util/MessageHolder.java   | 231 ----------
 .../shared/model/fileset/util/MessageLevels.java   |  93 ----
 .../shared/model/fileset/util/MessageSink.java     |  35 --
 .../shared/model/fileset/util/MojoLogSink.java     |  60 ---
 .../model/fileset/util/PlexusLoggerSink.java       |  63 ---
 .../model/fileset/mappers/MapperUtilTest.java      |  86 ++--
 .../model/fileset/util/FileSetUtilsTest.java       | 335 ++++++--------
 24 files changed, 537 insertions(+), 1324 deletions(-)
 copy src/site/resources/download.cgi => .git-blame-ignore-revs (78%)
 copy src/site/resources/download.cgi => .github/dependabot.yml (65%)
 copy src/site/resources/download.cgi => .github/workflows/maven-verify.yml (77%)
 delete mode 100644 src/main/java/org/apache/maven/shared/model/fileset/util/MessageHolder.java
 delete mode 100644 src/main/java/org/apache/maven/shared/model/fileset/util/MessageLevels.java
 delete mode 100644 src/main/java/org/apache/maven/shared/model/fileset/util/MessageSink.java
 delete mode 100644 src/main/java/org/apache/maven/shared/model/fileset/util/MojoLogSink.java
 delete mode 100644 src/main/java/org/apache/maven/shared/model/fileset/util/PlexusLoggerSink.java


(maven-file-management) 01/01: mvn4 aggregator

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-file-management.git

commit 029f42f11549f48d343fa71f5269dfebd883d2f6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:15:50 2022 +0100

    mvn4 aggregator
---
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 56cea16..bcccf2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>42</version>
+    <version>43-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -61,7 +61,19 @@
       <url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
     </site>
   </distributionManagement>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-xml</artifactId>
+        <version>4.0.3</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <properties>
+    <javaVersion>17</javaVersion>
+    <mavenVersion>4.0.0-alpha-9</mavenVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <project.build.outputTimestamp>2022-06-29T11:20:20Z</project.build.outputTimestamp>
   </properties>