You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/05/12 09:39:28 UTC
[cxf] branch 3.3.x-fixes updated (e7bc226 -> 087247e)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from e7bc226 Recording .gitmergeinfo Changes
new c0caa34 Updating atmosphere to 2.5.15 and re-enabling on JDK 11
new 087247e 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 +
parent/pom.xml | 13 ++++++-------
2 files changed, 7 insertions(+), 7 deletions(-)
[cxf] 01/02: Updating atmosphere to 2.5.15 and re-enabling on JDK 11
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c0caa3431c94a03d1d1e1b5f4120f42aa0f7f253
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue May 12 09:46:57 2020 +0100
Updating atmosphere to 2.5.15 and re-enabling on JDK 11
(cherry picked from commit 12d2f091afde535edab04e56c9df026cc9aad743)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b7bdcb..e42cc41 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -86,7 +86,7 @@
<cxf.artemis.version>2.10.1</cxf.artemis.version>
<cxf.aspectj.version>1.9.1</cxf.aspectj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
- <cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
+ <cxf.atmosphere.version>2.5.15</cxf.atmosphere.version>
<cxf.bcprov.version>1.65</cxf.bcprov.version>
<cxf.brave.reporter.version>2.12.1</cxf.brave.reporter.version>
<cxf.brave.version>5.10.1</cxf.brave.version>
@@ -2804,13 +2804,12 @@
</build>
</profile>
<profile>
- <id>java9-plus</id>
- <properties>
- <org.apache.cxf.transport.websocket.atmosphere.disabled>true</org.apache.cxf.transport.websocket.atmosphere.disabled>
+ <id>java9-plus</id>
+ <properties>
<cxf.jdk.version>11</cxf.jdk.version>
- </properties>
- <activation>
- <jdk>[9,)</jdk>
+ </properties>
+ <activation>
+ <jdk>[9,)</jdk>
</activation>
<build>
<plugins>
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 087247e96cf1652bf2d184fdc7dcf463c02358a4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue May 12 09:49:02 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 91a01d1..59b214c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -234,6 +234,7 @@ B fcd22cd026bc94a95fa19210df193df753afe4d1
B fce6a87bb1a58b4290d749a8ecc141046fa6f9ff
B ff7b028eeea39fedeb06207753fe6dcb9b0d8cca
M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
+M 12d2f091afde535edab04e56c9df026cc9aad743
M 160f50ed9bd9391b61417716b3a67653c9e81a98
M 169be66c11851d723e4a8d93f752e0b3dff1fa60
M 16d285838dc2209ca84af21723478f199403c2b7