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:42:09 UTC
[cxf] branch 3.4.x-fixes updated (6ea58a0 -> 39de3d7)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 6ea58a0 Update RxJava3 to 3.0.9
new dc56602 Update maven-war-plugin to unblock OpenJDK 17 (ea) builds
new 39de3d7 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dc5660291478e5429eadc69dfd6dd8c7051b0be1
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)
---
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 ca9ee38..3dd84e7 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -211,7 +211,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/pom.xml b/pom.xml
index 8573ffc..ae9970b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -681,6 +681,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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 39de3d7cefb5a877267418f85fbd2c75d0798aff
Author: reta <dr...@gmail.com>
AuthorDate: Sun Jan 3 12:41:47 2021 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f1b8927..9aaa615 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -21,6 +21,7 @@ M 8c4f04855a5d8623daff2aa8a8856367879c624b
M 9c17f2fb90a9929d0dc8e4f090da78547a4e7a02
M 9df9b22a4032b19ea953600ebdfa84e8c15d2370
M c0690e1fa57e0231461c9dd644d6b3c80852eef9
+M c070a8f50d83b82d864884020a64d1d67f5e7c95
M c0ef051466d775c84ddb20a9a12025d4258fb18b
M d6a299217dd943a3872da9b0afb7f966ab289cc0
M e775237e6dcb16b647d102bcbb3908d3e9fce1de