From 0d4fa9c061272edd075e66b5ce6ab378179a0662 Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Fri, 19 Feb 2021 23:52:10 +0100 Subject: [PATCH 1/3] Integrate latest dependencies, update build plugins Signed-off-by: Lukas Jungmann --- api/pom.xml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index ea5572d..3eaf503 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -1,6 +1,6 @@ ${copyright.ignoreyear} + false @@ -270,6 +271,18 @@ org.codehaus.mojo build-helper-maven-plugin + + currentyear-property + + timestamp-property + + validate + + current.year + en,US + yyyy + + add-legal-resource generate-resources @@ -295,8 +308,7 @@ org.apache.maven.plugins maven-compiler-plugin - 9 - 9 + 9 -Xlint:all @@ -420,7 +432,7 @@
v${spec.version}]]>
${release.spec.feedback}.
-Copyright © 2019, 2020 Eclipse Foundation. All rights reserved.
+Copyright © 2019, ${current.year} Eclipse Foundation. All rights reserved.
Use is subject to license terms.]]>
From a37443bc0f2616dc0c4bc9e26b3e713e667e3535 Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Sat, 20 Feb 2021 00:27:49 +0100 Subject: [PATCH 2/3] #161: NullPointerException in javax.xml.ws.Service. Signed-off-by: Lukas Jungmann --- api/src/main/java/jakarta/xml/ws/spi/FactoryFinder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/jakarta/xml/ws/spi/FactoryFinder.java b/api/src/main/java/jakarta/xml/ws/spi/FactoryFinder.java index 4e259d5..f01a9f9 100644 --- a/api/src/main/java/jakarta/xml/ws/spi/FactoryFinder.java +++ b/api/src/main/java/jakarta/xml/ws/spi/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -71,7 +71,10 @@ static T find(Class factoryClass, String fallbackClassName) { // handling Glassfish (platform specific default) if (isOsgi()) { - return (T) lookupUsingOSGiServiceLoader(factoryId); + provider = (T) lookupUsingOSGiServiceLoader(factoryId); + if (provider != null) { + return provider; + } } if (fallbackClassName == null) { From fae3279d61af967c18df67ba0a96c5a8801b6255 Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Sat, 20 Feb 2021 00:28:42 +0100 Subject: [PATCH 3/3] #90: Java 11: DEFAULT_JAXWSPROVIDER seems wrong Signed-off-by: Lukas Jungmann --- api/src/main/java/jakarta/xml/ws/spi/Provider.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/jakarta/xml/ws/spi/Provider.java b/api/src/main/java/jakarta/xml/ws/spi/Provider.java index 644f428..1804a6f 100644 --- a/api/src/main/java/jakarta/xml/ws/spi/Provider.java +++ b/api/src/main/java/jakarta/xml/ws/spi/Provider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -30,9 +30,7 @@ public abstract class Provider { * A constant representing the name of the default * {@code Provider} implementation class. **/ - // Using two strings so that package renaming doesn't change it - private static final String DEFAULT_JAXWSPROVIDER = - "com.sun"+".xml.internal.ws.spi.ProviderImpl"; + private static final String DEFAULT_JAXWSPROVIDER = "com.sun.xml.ws.spi.ProviderImpl"; /** * Creates a new instance of Provider