You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/11/30 11:39:09 UTC
[maven] branch MNG-7028 updated (59d8b9d -> 2777a99)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7028
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 59d8b9d [MNG-7028] Upgrade to Jansi 2.0.1
add 3736be9 Updating version in preparation for Maven 4
add b24c34b [MNG-7041] Update @since, version ranges and other version related strings
add b6cf710 [MNG-7042] Upgrade Maven Wagon to 3.4.2
new 2777a99 [MNG-7028] Upgrade to Jansi 2.0.1
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 (59d8b9d)
\
N -- N -- N refs/heads/MNG-7028 (2777a99)
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:
apache-maven/maven-wrapper.pom | 2 +-
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
.../src/main/java/org/apache/maven/project/ReactorModelPool.java | 4 ++--
.../apache/maven/xml/internal/DefaultConsumerPomXMLFilterFactory.java | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
.../src/main/java/org/apache/maven/feature/Features.java | 4 ++--
.../apache/maven/model/building/AbstractModelSourceTransformer.java | 2 +-
.../java/org/apache/maven/model/building/ArtifactModelSource.java | 2 +-
.../org/apache/maven/model/building/BuildModelSourceTransformer.java | 2 +-
.../apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java | 2 +-
.../java/org/apache/maven/model/building/DefaultModelBuilder.java | 2 +-
.../apache/maven/model/building/DefaultModelSourceTransformer.java | 2 +-
.../java/org/apache/maven/model/building/ModelBuildingRequest.java | 4 ++--
.../src/main/java/org/apache/maven/model/building/ModelCache.java | 4 ++--
.../java/org/apache/maven/model/building/ModelSourceTransformer.java | 2 +-
.../main/java/org/apache/maven/model/building/TransformerContext.java | 2 +-
.../java/org/apache/maven/model/building/TransformerException.java | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
maven-slf4j-wrapper/pom.xml | 2 +-
maven-wrapper/pom.xml | 2 +-
maven-xml/pom.xml | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/Factories.java | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEvent.java | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventFactory.java | 2 +-
maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventUtils.java | 2 +-
.../main/java/org/apache/maven/xml/sax/ext/CommentRenormalizer.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/AbstractEventXMLFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java | 2 +-
.../org/apache/maven/xml/sax/filter/BuildPomXMLFilterFactory.java | 2 +-
.../org/apache/maven/xml/sax/filter/BuildPomXMLFilterListener.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilter.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java | 2 +-
.../org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterFactory.java | 2 +-
.../src/main/java/org/apache/maven/xml/sax/filter/DependencyKey.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/ModulesXMLFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/ParentXMLFilter.java | 2 +-
.../org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/RelativePathXMLFilter.java | 2 +-
.../main/java/org/apache/maven/xml/sax/filter/RelativeProject.java | 2 +-
.../src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java | 2 +-
.../org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java | 2 +-
pom.xml | 4 ++--
55 files changed, 60 insertions(+), 60 deletions(-)
[maven] 01/01: [MNG-7028] Upgrade to Jansi 2.0.1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7028
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2777a9957671b85d9d5911389c8d803033a8ade9
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Nov 21 22:24:29 2020 +0100
[MNG-7028] Upgrade to Jansi 2.0.1
---
apache-maven/pom.xml | 2 +-
apache-maven/src/assembly/maven/component.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index b5c26a4..5697d83 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -153,7 +153,7 @@ under the License.
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<includeArtifactIds>jansi</includeArtifactIds>
- <includes>META-INF/native/**</includes>
+ <includes>org/fusesource/jansi/internal/native/**</includes>
</configuration>
<executions>
<execution>
diff --git a/apache-maven/src/assembly/maven/component.xml b/apache-maven/src/assembly/maven/component.xml
index 9befc3b..5f563e0 100644
--- a/apache-maven/src/assembly/maven/component.xml
+++ b/apache-maven/src/assembly/maven/component.xml
@@ -64,7 +64,7 @@ under the License.
</includes>
</fileSet>
<fileSet>
- <directory>target/dependency/META-INF/native</directory>
+ <directory>target/dependency/org/fusesource/jansi/internal/native</directory>
<outputDirectory>lib/jansi-native</outputDirectory>
<includes>
<include>**</include>
diff --git a/pom.xml b/pom.xml
index d8e39bf..2faecff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,7 +312,7 @@ under the License.
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.18</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>