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 2022/06/20 00:46:12 UTC
[cxf] branch 3.4.x-fixes updated (190caae795 -> 5596907b7f)
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 190caae795 Recording .gitmergeinfo Changes
new e38ef55f07 Update Apache Johnzon to 1.2.18
new 894f21cf06 Fixing javadoc generation under JDK-17
new 5596907b7f Recording .gitmergeinfo Changes
The 3 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 | 9 +++++++++
maven-plugins/java2wadl-plugin/pom.xml | 9 ++++++++-
parent/pom.xml | 2 +-
pom.xml | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
[cxf] 03/03: 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 5596907b7fa09a95b73cab82c6de0b0c829036ca
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jun 19 20:45:19 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f9ecd0909f..c4f3b8da45 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -10,6 +10,7 @@ B 0d47c86fce89c3709cca97f44904b6b24a5c2021
B 0dce4cd3c0362da3a9864a1a93da0f6e5d480d7f
B 0e235a4d7ca094ebd2a8afc6b22c00a841e2e554
B 0e96fca5e25a68971b7944276af029b0f0df801c
+B 0eafad923f8d2b6eeba7fae9951450de6d368c7d
B 124fae280460ca911c6040868271328e6ca8fe98
B 1496f441b221c540c6e4260b757da09e2460e2db
B 14add09ab01626d5af2d341aabf503ab5953ce6d
@@ -24,6 +25,7 @@ B 2634ed5bcfb6001c1a72788a1152bedc6315585e
B 269c7c8fe4553c5307fd938dbba51af5a1535482
B 27d9f6ac75162f9bbcfcf2bb2f5b569baf424a5d
B 28780a99ff888d6e27c1c6d92dda0046bf513d33
+B 2b362428d53b59fd8f97982ff0f2ec83218e2bf1
B 2c89d63ad40544c7b346d252398f010ba3b50a66
B 2d2b6443d93ebe40d752bf02d2b8c0432d103e87
B 2ec061d12343efbc93cd05d65002c8efad8622bd
@@ -59,6 +61,7 @@ B 5915e900fdfe5f3b5622ba0d0772606d101680a6
B 59561de9192dfdb218477ddae64f25ab1e2aca4b
B 5a546d9c0b50298e954e712cc992ed91150b45f9
B 5ac24299998ad1891f50c0cc13e91c3dfc8b1aa4
+B 5d8d806a8dfa4fe38f48f72eb3d861068adc7cf4
B 61550ceb83004e01a8683e5c2cd578c528df8ec3
B 63dcd46765370f242d2c1a2db1689c6c0128a24d
B 6588a958996031e2f213f11f44ea166687d26af5
@@ -323,6 +326,7 @@ M 9ead0c6d83fad73ad3c3098e17ee0cffb2008184
M 9f939eefbd41ee5c0e88b41c2e177fdbc5cbdd26
M 9fb50062390769e1c0e16b4180bef7736c8ad3ba
M a018a587094cb822feb56705fd9f5fcba4322804
+M a28c4a4f8f1f8f5abd24cfd655cd55ed620746ab
M a2a48bd789e66ffae82d35d156d02e58fbb4bb2b
M a2fc449969afa082065b1be644a3af890abcc1db
M a3a49c7ee82f83bc683b898594d5c4948578f25a
@@ -330,6 +334,7 @@ M a5699a05bd53de364ac3282fc6a4927ee93e0afc
M a59dff0ba50418ced57ae8ef425f96df78af9f5c
M a6ed23b66394b260145b08ecdd8145b647fa43e5
M a7e7e62fd3c68fa3f262bd021ae62076335c359c
+M a85cfb923ce2cf72c944d8ce774de273c947ff78
M a894689ac803c234bf38a59f7d845aec4f4d70e0
M ac656dd13ac54b83aeb0c877e01dfb277d38ca96
M ad194637ee3dd22f445e34b6db72d314ee650d79
@@ -347,6 +352,7 @@ M b8a2f139f8a4f80a90ef49c2a0757395cb303be6
M b909e6dd478272d2c3e094922801a201ef94eeb5
M bb73cfaaebea3c74025c51da7b6478b91122a245
M bc03476635143bc867908996e6cf572b9340d786
+M bc5b52650de305e705aafeb482ccef9d369ab848
M bc5d02a1823de215646508b22976358b1905adab
M bd0cbb621f42899f64d4d769376c1c9218c9e3d4
M bfc509c206d67124d3f0ae46cea6963cabb8f3ca
@@ -372,7 +378,9 @@ M cc4f758e89da58b2f47c95fb68df186e0533ca74
M ccb76b7c2c02b0f295405fd9bb0b585544c40869
M cd1759306c9a907d9228ccf023f085857fc7977c
M cd5a10c84dc5f37ee724e8e5015ed4b44a4463c8
+M cdae079b62f4b16c5f88a4ccbd405a7657f16b09
M ce25fb1f72ee161a653bd178b42c2a939c5910b8
+M cf17b66af86a035bd378028688f3c7d7bf29888f
M cf2f79a5de150773b8dd1c4975de7e679a6d4d17
M cfbdb6b855b5845335d07bf1c73ac29159fd032b
M d0b2e5c12dc2b6151122255dba0b3f72a365756f
@@ -388,6 +396,7 @@ M d82affb26323105189121a34a9ada035c7c601b5
M d88202133e39bebdb966b6ccfed57e1ff9d73638
M d8a15260afc47116674f60585702076e4994e470
M d8eb0627ec5e878ef58e16b387a36c4cf3d1457c
+M da9b167cd2c4c988e31f1b8e3f4f9ab06b5708dd
M dd08a4a9649c33226f56570cb0394bcf62a28fba
M dd5db1155870c2f5df684d1a0f77e7c0909ee7c5
M dd9e67bef536068ce3956b9b94e380e780e78ee8
[cxf] 02/03: Fixing javadoc generation under JDK-17
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 894f21cf069fdbd14dfda9d84b4e3dc047415231
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jun 19 12:00:35 2022 -0400
Fixing javadoc generation under JDK-17
(cherry picked from commit 3a4d179b5860f45511f616af4e2f3bf03c9280c4)
(cherry picked from commit 6f008abce36c9903b99d0254371d087ad742a144)
(cherry picked from commit 90b5bec3ee58d57c814fa91dac1eb09adcce17aa)
---
maven-plugins/java2wadl-plugin/pom.xml | 9 ++++++++-
pom.xml | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 4fd0c59e62..f805c3d28a 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -230,7 +230,7 @@
</execution>
</executions>
<configuration>
- <release>9</release>
+ <release>11</release>
</configuration>
</plugin>
<plugin>
@@ -249,6 +249,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <release>11</release>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/pom.xml b/pom.xml
index b6f17790db..33eacb0faa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,7 +459,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.4.0</version>
<configuration>
<attach>true</attach>
<source>${cxf.jdk.version}</source>
[cxf] 01/03: Update Apache Johnzon to 1.2.18
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 e38ef55f072dddcfba1a0aaf1392f581a6668180
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jun 19 11:19:35 2022 -0400
Update Apache Johnzon to 1.2.18
(cherry picked from commit 380f8f5f342e7cad3f470a076ab41b3519604d7a)
(cherry picked from commit 1735be2e55072686c340054e3323308b4dc309f8)
(cherry picked from commit bc5b52650de305e705aafeb482ccef9d369ab848)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index be44841547..ffbe7947a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -159,7 +159,7 @@
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jexl.version>3.1</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.version>
- <cxf.johnzon.version>1.2.14</cxf.johnzon.version>
+ <cxf.johnzon.version>1.2.18</cxf.johnzon.version>
<cxf.json.api.version>1.1.6</cxf.json.api.version>
<cxf.json.bind-api.version>1.0.2</cxf.json.bind-api.version>
<cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>