You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2019/01/17 18:56:43 UTC
[cxf] branch 3.2.x-fixes updated (1132a21 -> d14c174)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 1132a21 Recording .gitmergeinfo Changes
new ad7b1aa update maven-enforcer-plugin
new 660ff06 update maven-enforcer-plugin
new d03dc93 [CXF-7947] avoid NPE for classes in default package
new d14c174 Recording .gitmergeinfo Changes
The 4 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 | 6 ++++++
.../codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 2 +-
pom.xml | 2 +-
.../jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java | 15 +++++++++------
4 files changed, 17 insertions(+), 8 deletions(-)
[cxf] 03/04: [CXF-7947] avoid NPE for classes in default package
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d03dc931df389e7dbab72d1b1fb3ae5993f9c6f2
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Thu Jan 17 16:41:26 2019 +0100
[CXF-7947] avoid NPE for classes in default package
(cherry picked from commit d9c0c2ffb468315c9e538736ac8e731782209640)
---
.../jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
index 2e77410..05e4da9 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
@@ -266,12 +266,15 @@ final class Utils {
adapter = f.getType().getAnnotation(XmlJavaTypeAdapter.class);
}
if (adapter == null) {
- XmlJavaTypeAdapters adapters = f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class);
- if (adapters != null) {
- for (XmlJavaTypeAdapter candidate : adapters.value()) {
- if (candidate != null && candidate.type().equals(f.getType())) {
- adapter = candidate;
- break;
+ Package packageDeclaration = f.getDeclaringClass().getPackage();
+ if (packageDeclaration != null) {
+ XmlJavaTypeAdapters adapters = packageDeclaration.getAnnotation(XmlJavaTypeAdapters.class);
+ if (adapters != null) {
+ for (XmlJavaTypeAdapter candidate : adapters.value()) {
+ if (candidate != null && candidate.type().equals(f.getType())) {
+ adapter = candidate;
+ break;
+ }
}
}
}
[cxf] 02/04: update maven-enforcer-plugin
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 660ff06c18f974a7ccb93cd7aec42e01a44d0a47
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Thu Jan 10 12:17:32 2019 +0100
update maven-enforcer-plugin
(cherry picked from commit 09ad8cfd16872c4d6e3882b500cbe78f2b2d9b69)
---
maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index d60ef58..20edf5b 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
+ <version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-jdk9-of-higher</id>
[cxf] 04/04: Recording .gitmergeinfo Changes
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d14c1740252b0170e77d81c7824b2da8646e88dc
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Thu Jan 17 19:55:59 2019 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 733bfee..cf6876b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -22,6 +22,7 @@ B 16077ac65e46710865a883d1c60d87bcd422bb33
B 180750ab68aeeae60731dbdfb943eca8608fe94a
B 189e23aa82a2a05d60396a8cdd6c8faef5be41b5
B 19f212a3f770250bcaae87bb52c19e6f5d02fa7a
+B 1b46339f841756b35846c1389860ee615ba91ddf
B 1cfdb42724549fdef21a9d50d62cd9dbdc5d8dd3
B 1e35c3ac012c3acda3b82f225bada42c883e4098
B 1e3f132d74bf032be991995a587b7d107424ff05
@@ -54,6 +55,7 @@ B 35fd40f5b5e043f0044dce9286a9ce922bc30d2c
B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d
B 384a11f419c06c52ec07d9f7114bb2134c18ba3c
B 38f8280925eead756fdcd299ca7476d17cbde0c2
+B 3912e7beb77beb5782abc46488a1f648515c62bc
B 39a58f3c6ab6f1d20e66664a11b76edf5a443e83
B 3a0b939b04d5e59388ff536ac93e7cf3f8793571
B 3a99c26ad254f34525837ceaf0c8baaac24f4336
@@ -92,6 +94,7 @@ B 5d43800e5a3b8d65e97b8c5c3262e81c11070edb
B 5dfd0e0ee068c0f424a2a9ac513ebf74b7e7b618
B 5ecf2214e4cfa0992da3ca74cd92128a3048b4f4
B 5fdfd70af65f53b0bd73ecfc10906e28648ede94
+B 60c4c6418a285d71fc197dc953332d987e7651d9
B 612b03ea00b8a9e747411dbfa9a4eb1c6ff4b529
B 6228a705ec8e101667a786ecd039dd309f6ab474
B 63f3a02afddd8e8e82aed4c18e24627b4c284a12
@@ -138,6 +141,7 @@ B 95ed122581f3de2afea2d2a557300f96c71b2c3d
B 963d44ba9e499c36c2d06e9f668abff19a16e751
B 976ecb5f43bd873d01e07078194636a99e812906
B 97fb80a52b9b016c42b021eef52b216acfd5add8
+B 9893bdd40b539bb37a17933b5334fc43ff511d66
B 98edc71f3b8690ce694327673c3e7a15d1be798a
B 9d532c0c6be68fb08460c2bc51c076395e658210
B 9db243c1aa44732996514200b490eb63683540b4
@@ -198,6 +202,7 @@ B cfab2ec2eced0dc0b026bc4bfbeeb18fff28e1b6
B cff773f4f750b7bdc3f955c1a5b1b5f4a311dd71
B d22aff30192d828b71a2fa7f9ffdc31c9f29324b
B d2f7dc5a86c53e1e68e15c7eb71cfc0b3efa033d
+B d347d4442c26990e6e256d2c6e7208f29971282f
B d3de21c45a8f6c74996b5edecfe2e03f8b6a2bd3
B d52e54049991cad01ac269e4e144dff6ea72e9a1
B d7c48adcb1eb48a9677c3b9a79a522734c763d57
@@ -230,6 +235,7 @@ B f64fa00245bf0749ddb807df3a0292ab46900976
B f652464526edb0cb7eac277ff64c9f2d02e2b920
B f68311f3de3e66526303b9292d07468499703eb6
B f70768f7b7fa95305949a5b7df9bbc14bb48add3
+B f781f775143c4cae90ed76787f569cc96220dd19
B f8c59c182755eaa3570831916718d69f5eed1efb
B fa3c4d45a9891bc17882cf43a5ef8653f1659da0
B fba2a61edbe1f0410b1818a3e8891e47ae164659
[cxf] 01/04: update maven-enforcer-plugin
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ad7b1aa6f4eb4fd83e0e9e8130bd23127f8964f4
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Tue Jan 8 15:39:56 2019 +0100
update maven-enforcer-plugin
(cherry picked from commit 2a974e74c6b60d72c52616c7292bfbce44864546)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9176085..aa208c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -665,7 +665,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.0-M2</version>
<configuration>
<rules>
<requireMavenVersion>