You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/11/21 04:01:05 UTC
[aries-jax-rs-whiteboard] branch master updated (cc8c777 -> 434da88)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git.
from cc8c777 try to add diagnostic output for service property failures
new f61f7d1 cleanup warnings from vscode
new 472a366 implement missing method
new a6eb22c asure non-empty osgi.jaxrs.endpoint
new 534db48 make sure to properly handle invocation be different java versions for CI
new 9a468e1 add diagnostics output plugin
new 434da88 add Java 18-ea
The 6 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:
.github/workflows/maven.yml | 2 +-
.../json/activator/JaxbJsonBundleActivator.java | 1 -
.../jax/rs/jackson/JaxbJsonBundleActivator.java | 1 -
.../src/test/java/test/OpenApiTest.java | 2 +-
.../jax/rs/rest/management/test/FrameworkTest.java | 1 -
.../jax/rs/rest/management/test/TestUtil.java | 3 +-
.../internal/map/CaseInsensitiveMap.java | 1 -
.../rest/management/schema/BundleHeaderSchema.java | 1 -
jax-rs.itests/src/test/java/test/JaxrsTest.java | 4 --
.../test/types/TestFilterAndExceptionMapper.java | 1 -
jax-rs.whiteboard/pom.xml | 11 +++++
.../jax/rs/whiteboard/internal/Whiteboard.java | 1 -
.../internal/cxf/CxfJaxrsServiceRegistrator.java | 1 -
.../test/types/ResourceMethodInfoDTOWrapper.java | 7 ++++
pom.xml | 48 ++++++++++++++++++++++
15 files changed, 70 insertions(+), 15 deletions(-)
[aries-jax-rs-whiteboard] 05/06: add diagnostics output plugin
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 9a468e15262fd55a65f3701d10c6b7b58c7898b3
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sat Nov 20 22:56:34 2021 -0500
add diagnostics output plugin
Signed-off-by: Raymond Auge <ro...@apache.org>
---
pom.xml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/pom.xml b/pom.xml
index 901bbae..df2c101 100644
--- a/pom.xml
+++ b/pom.xml
@@ -688,6 +688,29 @@
</pluginManagement>
<plugins>
<plugin>
+ <!--
+ This is used for diagnostics by invoking it like:
+
+ mvn antrun:run@props [-N]
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>props</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echoproperties />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
[aries-jax-rs-whiteboard] 02/06: implement missing method
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 472a3660426b551782f7fe43697227289d96f0e4
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sat Nov 20 22:52:08 2021 -0500
implement missing method
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../src/test/java/test/types/ResourceMethodInfoDTOWrapper.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/jax-rs.whiteboard/src/test/java/test/types/ResourceMethodInfoDTOWrapper.java b/jax-rs.whiteboard/src/test/java/test/types/ResourceMethodInfoDTOWrapper.java
index 53eeed4..321db01 100644
--- a/jax-rs.whiteboard/src/test/java/test/types/ResourceMethodInfoDTOWrapper.java
+++ b/jax-rs.whiteboard/src/test/java/test/types/ResourceMethodInfoDTOWrapper.java
@@ -52,4 +52,11 @@ public class ResourceMethodInfoDTOWrapper
Arrays.equals(nameBindings, that.nameBindings);
}
+ @Override
+ public int hashCode() {
+ return Objects.hash(
+ path, method, Arrays.hashCode(consumingMimeType),
+ Arrays.hashCode(producingMimeType), Arrays.hashCode(nameBindings));
+ }
+
}
[aries-jax-rs-whiteboard] 01/06: cleanup warnings from vscode
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit f61f7d171e9993a1a7f63c6df36f0b00f123ad69
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sat Nov 20 10:40:20 2021 -0500
cleanup warnings from vscode
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../rs/jaxb/json/activator/JaxbJsonBundleActivator.java | 1 -
.../aries/jax/rs/jackson/JaxbJsonBundleActivator.java | 1 -
.../openapi-itest/src/test/java/test/OpenApiTest.java | 2 +-
.../aries/jax/rs/rest/management/test/FrameworkTest.java | 1 -
.../apache/aries/jax/rs/rest/management/test/TestUtil.java | 1 +
.../rest/management/internal/map/CaseInsensitiveMap.java | 1 -
.../jax/rs/rest/management/schema/BundleHeaderSchema.java | 1 -
jax-rs.itests/src/test/java/test/JaxrsTest.java | 4 ----
.../test/java/test/types/TestFilterAndExceptionMapper.java | 1 -
.../aries/jax/rs/whiteboard/internal/Whiteboard.java | 1 -
.../internal/cxf/CxfJaxrsServiceRegistrator.java | 1 -
pom.xml | 14 ++++++++++++++
12 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java b/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
index 67b6bbe..47d84cd 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/src/main/java/org/apache/aries/jax/rs/jaxb/json/activator/JaxbJsonBundleActivator.java
@@ -124,7 +124,6 @@ public class JaxbJsonBundleActivator implements BundleActivator {
private Map<String, ?> getRegistrationProperties(
Dictionary<String, ?> properties) {
- @SuppressWarnings("serial")
Hashtable<String, Object> serviceProps =
new Hashtable<String, Object>() {{
put(JaxrsWhiteboardConstants.JAX_RS_EXTENSION, true);
diff --git a/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java b/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java
index 09822aa..b992490 100644
--- a/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java
+++ b/integrations/jackson/jackson-jaxrs/src/main/java/org/apache/aries/jax/rs/jackson/JaxbJsonBundleActivator.java
@@ -78,7 +78,6 @@ public class JaxbJsonBundleActivator implements BundleActivator {
}
private OSGiResult _result;
- @SuppressWarnings("serial")
private Map<String, ?> getRegistrationProperties(
Dictionary<String, ?> properties) {
diff --git a/integrations/openapi/openapi-itest/src/test/java/test/OpenApiTest.java b/integrations/openapi/openapi-itest/src/test/java/test/OpenApiTest.java
index 83cb529..82167dc 100644
--- a/integrations/openapi/openapi-itest/src/test/java/test/OpenApiTest.java
+++ b/integrations/openapi/openapi-itest/src/test/java/test/OpenApiTest.java
@@ -163,7 +163,7 @@ public class OpenApiTest extends TestHelper {
OpenAPI openAPI = new OpenAPI();
- @SuppressWarnings({"unchecked", "rawtypes", "serial"})
+ @SuppressWarnings({"unchecked", "rawtypes"})
ServiceRegistration<OpenAPI> serviceRegistration =
bundleContext.registerService(
OpenAPI.class, openAPI, new Hashtable() {{
diff --git a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/FrameworkTest.java b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/FrameworkTest.java
index 8f48572..c9d1ffc 100644
--- a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/FrameworkTest.java
+++ b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/FrameworkTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
-import org.junit.jupiter.api.Test;
import org.osgi.framework.dto.FrameworkDTO;
import org.xmlunit.assertj3.XmlAssert;
diff --git a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
index 0d2259c..5006673 100644
--- a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
+++ b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
@@ -131,6 +131,7 @@ public class TestUtil {
return new String[]{propertyValue.toString()};
}
+ @SuppressWarnings("restriction")
public static class HttpServer implements AutoCloseable {
private final com.sun.net.httpserver.HttpServer server;
diff --git a/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/internal/map/CaseInsensitiveMap.java b/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/internal/map/CaseInsensitiveMap.java
index 691b9d6..de20117 100644
--- a/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/internal/map/CaseInsensitiveMap.java
+++ b/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/internal/map/CaseInsensitiveMap.java
@@ -47,7 +47,6 @@ public class CaseInsensitiveMap<T> extends AbstractMap<String, T> {
* @throws IllegalArgumentException If {@code dictionary} contains case
* variants of the same key name.
*/
- @SuppressWarnings("serial")
public CaseInsensitiveMap(final Dictionary<String, T> dictionary) {
this(() -> {
Set<Map.Entry<String, T>> entries = new HashSet<>(dictionary.size());
diff --git a/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/schema/BundleHeaderSchema.java b/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/schema/BundleHeaderSchema.java
index f01e249..3d3b9cb 100644
--- a/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/schema/BundleHeaderSchema.java
+++ b/integrations/rest-management/rest-management/src/main/java/org/apache/aries/jax/rs/rest/management/schema/BundleHeaderSchema.java
@@ -23,7 +23,6 @@ import java.util.Map;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-@SuppressWarnings("serial")
@XmlRootElement(name = "bundleHeader")
@XmlJavaTypeAdapter(BundleHeaderAdapter.class)
public class BundleHeaderSchema extends LinkedHashMap<String, String> {
diff --git a/jax-rs.itests/src/test/java/test/JaxrsTest.java b/jax-rs.itests/src/test/java/test/JaxrsTest.java
index 3723d41..6f269f3 100644
--- a/jax-rs.itests/src/test/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/test/java/test/JaxrsTest.java
@@ -494,7 +494,6 @@ public class JaxrsTest extends TestHelper {
testCase.run();
}
- @SuppressWarnings("serial")
@Test
public void testApplicationRebase() {
assertEquals(0, getRuntimeDTO().applicationDTOs.length);
@@ -1091,7 +1090,6 @@ public class JaxrsTest extends TestHelper {
assertEquals(
101, failedApplicationDTOs[0].failureReason);
- @SuppressWarnings("serial")
ServiceRegistration<ServletContextHelper> context =
bundleContext.registerService(
ServletContextHelper.class, new ServletContextHelper() {},
@@ -1136,7 +1134,6 @@ public class JaxrsTest extends TestHelper {
new TestApplication(), JAX_RS_APPLICATION_BASE,
"/context/test-application", "service.ranking", 10);
- @SuppressWarnings("serial")
ServiceRegistration<ServletContextHelper> context =
bundleContext.registerService(
ServletContextHelper.class, new ServletContextHelper() {},
@@ -2676,7 +2673,6 @@ public class JaxrsTest extends TestHelper {
String.format(
"(%s=%s)", JAX_RS_APPLICATION_BASE, "/test-application"));
- @SuppressWarnings("serial")
ServiceRegistration<?> extensionRegistration =
bundleContext.registerService(
new String[]{
diff --git a/jax-rs.itests/src/test/java/test/types/TestFilterAndExceptionMapper.java b/jax-rs.itests/src/test/java/test/types/TestFilterAndExceptionMapper.java
index d39f051..a732c59 100644
--- a/jax-rs.itests/src/test/java/test/types/TestFilterAndExceptionMapper.java
+++ b/jax-rs.itests/src/test/java/test/types/TestFilterAndExceptionMapper.java
@@ -45,7 +45,6 @@ public class TestFilterAndExceptionMapper implements
return Response.ok().entity("This is fine").build();
}
- @SuppressWarnings("serial")
public static class MyException extends RuntimeException {
}
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index 5722f03..0a3a83d 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -1267,7 +1267,6 @@ public class Whiteboard {
}
private static CXFNonSpringServlet createCXFServlet(Bus bus) {
- @SuppressWarnings("serial")
CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet() {
@Override
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
index 4b95e4a..0b5055c 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
@@ -369,7 +369,6 @@ public class CxfJaxrsServiceRegistrator {
private ArrayList<ServiceTuple<?>> _erroredProviders;
private ArrayList<ResourceProvider> _erroredServices;
- @SuppressWarnings("serial")
private synchronized void doRewire(
Collection<ServiceTuple<?>> providers,
Collection<ResourceProvider> services) {
diff --git a/pom.xml b/pom.xml
index e753543..9f1dd3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -636,6 +636,20 @@
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore>
+ </ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
[aries-jax-rs-whiteboard] 03/06: asure non-empty osgi.jaxrs.endpoint
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit a6eb22c627fef63976e7bc9422ad8e5e454d39e9
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sat Nov 20 19:47:08 2021 -0500
asure non-empty osgi.jaxrs.endpoint
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
index 5006673..9cefb2c 100644
--- a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
+++ b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
@@ -57,7 +57,7 @@ public class TestUtil {
public ClientBuilder clientBuilder;
@InjectService(
- filter = "(%s=*)",
+ filter = "(%s=http*)",
filterArguments = JAX_RS_SERVICE_ENDPOINT,
timeout = 2000l
)
[aries-jax-rs-whiteboard] 04/06: make sure to properly handle invocation be different java versions for CI
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 534db48ee44e266d2b32125ba9d003ac4cc307d0
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sat Nov 20 20:05:01 2021 -0500
make sure to properly handle invocation be different java versions for CI
Signed-off-by: Raymond Auge <ro...@apache.org>
---
jax-rs.whiteboard/pom.xml | 11 +++++++++++
pom.xml | 11 +++++++++++
2 files changed, 22 insertions(+)
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index be4911f..baa80d9 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -137,4 +137,15 @@
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
diff --git a/pom.xml b/pom.xml
index 9f1dd3f..901bbae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -714,6 +714,17 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>${java.specification.version}</maven.compiler.release>
+ </properties>
+ </profile>
+ </profiles>
+
<reporting>
<plugins>
<plugin>
[aries-jax-rs-whiteboard] 06/06: add Java 18-ea
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 434da8876de8c0e0181e8e7b6f7d52dc630a90db
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sat Nov 20 22:57:08 2021 -0500
add Java 18-ea
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.github/workflows/maven.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f045e9f..99aeb81 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,7 +27,7 @@ jobs:
JDKxx_Matrix:
strategy:
matrix:
- java: [ 8, 11, 17 ]
+ java: [ 8, 11, 17, 18-ea ]
os: [ ubuntu-latest ]
include:
- os: windows-latest