You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/01/03 17:44:23 UTC
[cxf] branch 3.3.x-fixes updated (8572aa7 -> 7baaa24)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 8572aa7 Recording .gitmergeinfo Changes
new b2a334a Update maven-war-plugin to unblock OpenJDK 17 (ea) builds
new 7baaa24 Recording .gitmergeinfo Changes
The 2 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:
.gitmergeinfo | 1 +
distribution/src/main/release/samples/pom.xml | 2 +-
pom.xml | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
[cxf] 01/02: Update maven-war-plugin to unblock OpenJDK 17 (ea)
builds
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b2a334a69a1d073bb7e85866f0eacc4e1eff91b7
Author: reta <dr...@gmail.com>
AuthorDate: Sun Jan 3 10:11:27 2021 -0500
Update maven-war-plugin to unblock OpenJDK 17 (ea) builds
(cherry picked from commit c070a8f50d83b82d864884020a64d1d67f5e7c95)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
pom.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index f5b52a4..75c01c0 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -204,7 +204,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.3.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/pom.xml b/pom.xml
index 681c87a..d1059d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -698,6 +698,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7baaa24659d3dc822014323fb019984ab439021d
Author: reta <dr...@gmail.com>
AuthorDate: Sun Jan 3 12:44:01 2021 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 35f4287..c9e77bc 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -617,6 +617,7 @@ M bbf08b76836c3d4c592d91ee2039317332599b8e
M be41158d8c65b227c77d927ace7ca30c7c6dd015
M bf1b85003e89c4b3e28384f0de476cf0e5b1af12
M c0690e1fa57e0231461c9dd644d6b3c80852eef9
+M c070a8f50d83b82d864884020a64d1d67f5e7c95
M c0ef051466d775c84ddb20a9a12025d4258fb18b
M c1b729ea9f0c43e6560099dbc427751fe33ee088
M c673affb1cc40a38953dd9ce6b567705fa6eef46