Skip to content

Comply with 4.0 API #5550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 6, 2024
Merged

Comply with 4.0 API #5550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c7acbe
Comply with 4.0 API
jansupol Mar 5, 2024
74b08dd
Update NOTICE files
jansupol Mar 5, 2024
3ffcc19
updated shaded plugin version
jansupol Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ aopalliance Version 1
* Project: http://aopalliance.sourceforge.net
* Copyright: Material in the public domain is not protected by copyright

Bean Validation API 3.0.2
Bean Validation API 3.1.0-M1
* License: Apache License, 2.0
* Project: https://projects.eclipse.org/projects/ee4j.bean-validation
* Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Expand Down
9 changes: 4 additions & 5 deletions bundles/jaxrs-ri/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -277,9 +277,9 @@
jersey.repackaged.org.objectweb.asm.*;version=${project.version}
</Export-Package>
<Import-Package><![CDATA[
jakarta.servlet.annotation.*;resolution:=optional;version="[5.0,7.0)",
jakarta.servlet.descriptor.*;resolution:=optional;version="[5.0,7.0)",
jakarta.servlet.*;version="[5.0,7.0)",
jakarta.servlet.annotation.*;resolution:=optional;version="[6.0,7.0)",
jakarta.servlet.descriptor.*;resolution:=optional;version="[6.0,7.0)",
jakarta.servlet.*;version="[6.0,7.0)",
${jakarta.annotation.osgi.version},
jakarta.persistence.*;resolution:=optional,
jakarta.validation.*;resolution:=optional;version="[3,4)",
Expand Down Expand Up @@ -314,7 +314,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
4 changes: 2 additions & 2 deletions ...s/helidon-connector/src/test/java/org/glassfish/jersey/helidon/connector/sse/SseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -53,7 +53,7 @@ public class SseTest extends JerseyTest {
public static class SimpleSseResource {
@GET
@Produces(MediaType.SERVER_SENT_EVENTS)
public void send(@Context SseEventSink sink, @Context Sse sse) {
public void send(@Context SseEventSink sink, @Context Sse sse) throws Exception {
try (SseEventSink s = sink) {
for (int i = 0; i != 10; i++) {
s.send(sse.newEvent("A"));
Expand Down
3 changes: 2 additions & 1 deletion containers/grizzly2-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -111,6 +111,7 @@
<instructions>
<Import-Package>
org.glassfish.grizzly.*;version="[3.0,5.0)",
${jakarta.rest.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
5 changes: 3 additions & 2 deletions containers/grizzly2-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -70,8 +70,9 @@
<configuration>
<instructions>
<Import-Package>
jakarta.servlet.*;version="[5.0,7.0)",
jakarta.servlet.*;version="[6.0,7.0)",
org.glassfish.grizzly.*;version="[3.0,5.0)",
${jakarta.rest.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
3 changes: 2 additions & 1 deletion containers/jersey-servlet-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
<Import-Package>
jakarta.persistence.*;resolution:=optional,
jakarta.servlet.*;version="[5.0,7.0)",
jakarta.servlet.*;version="[6.0,7.0)",
${jakarta.annotation.osgi.version},
${jakarta.rest.osgi.version},
*
</Import-Package>
<Export-Package>org.glassfish.jersey.servlet.*</Export-Package>
Expand Down
5 changes: 3 additions & 2 deletions containers/jersey-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -74,8 +74,9 @@
<instructions>
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
<Import-Package>
jakarta.servlet.*;version="[5.0,7.0)",
jakarta.servlet.*;version="[6.0,7.0)",
${jakarta.annotation.osgi.version},
${jakarta.rest.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion containers/jetty-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<configuration>
<instructions>
<Import-Package>
jakarta.servlet.*;version="[5.0,7.0)",
jakarta.servlet.*;version="[6.0,7.0)",
${jetty.osgi.version},
*
</Import-Package>
Expand Down
3 changes: 2 additions & 1 deletion core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -92,6 +92,7 @@
<instructions>
<Import-Package>
${jakarta.annotation.osgi.version},
${jakarta.rest.osgi.version},
*
</Import-Package>
<unpackBundle>true</unpackBundle>
Expand Down
28 changes: 27 additions & 1 deletion core-client/src/main/java/org/glassfish/jersey/client/InvocationInterceptorStages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -53,6 +53,7 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -280,6 +281,11 @@ public Collection<String> getPropertyNames() {
return clientRequest.getPropertyNames();
}

// @Override
public boolean hasProperty(String name) {
return clientRequest.hasProperty(name);
}

@Override
public void setProperty(String name, Object object) {
clientRequest.setProperty(name, object);
Expand Down Expand Up @@ -325,6 +331,16 @@ public String getHeaderString(String name) {
return clientRequest.getHeaderString(name);
}

// @Override
public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate<String> valuePredicate) {
return clientRequest.containsHeaderString(name, valueSeparatorRegex, valuePredicate);
}

// @Override
public boolean containsHeaderString(String name, Predicate<String> valuePredicate) {
return clientRequest.containsHeaderString(name, valuePredicate);
}

@Override
public Date getDate() {
return clientRequest.getDate();
Expand Down Expand Up @@ -500,6 +516,16 @@ public String getHeaderString(String name) {
return clientResponse.getHeaderString(name);
}

// @Override
public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate<String> valuePredicate) {
return clientResponse.containsHeaderString(name, valueSeparatorRegex, valuePredicate);
}

// @Override
public boolean containsHeaderString(String name, Predicate<String> valuePredicate) {
return clientResponse.containsHeaderString(name, valuePredicate);
}

@Override
public Set<String> getAllowedMethods() {
return clientResponse.getAllowedMethods();
Expand Down
3 changes: 2 additions & 1 deletion core-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2010, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -143,6 +143,7 @@
org.w3c.dom;resolution:=optional,
org.xml.sax;resolution:=optional,
${jakarta.annotation.osgi.version},
${jakarta.rest.osgi.version},
*
</Import-Package>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
Expand Down
3 changes: 2 additions & 1 deletion core-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2010, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -104,6 +104,7 @@
javax.xml.transform.sax;resolution:=optional,
javax.xml.transform.stream;resolution:=optional,
jakarta.validation.*;resolution:=optional;version="[3,4)",
${jakarta.rest.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
17 changes: 14 additions & 3 deletions core-server/src/main/java/org/glassfish/jersey/server/ContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -28,6 +28,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;

import jakarta.ws.rs.container.ContainerResponseContext;
import jakarta.ws.rs.core.Configuration;
Expand Down Expand Up @@ -159,6 +160,16 @@ public String getHeaderString(final String name) {
return messageContext.getHeaderString(name);
}

// @Override
public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate<String> valuePredicate) {
return messageContext.containsHeaderString(name, valueSeparatorRegex, valuePredicate);
}

// @Override
public boolean containsHeaderString(String name, Predicate<String> valuePredicate) {
return messageContext.containsHeaderString(name, valuePredicate);
}

@Override
public MultivaluedMap<String, Object> getHeaders() {
return messageContext.getHeaders();
Expand Down Expand Up @@ -240,7 +251,7 @@ public Object getEntity() {
}

/**
* Set a new message message entity.
* Set a new message entity.
*
* @param entity entity object.
* @see jakarta.ws.rs.ext.MessageBodyWriter
Expand All @@ -250,7 +261,7 @@ public void setEntity(final Object entity) {
}

/**
* Set a new message message entity.
* Set a new message entity.
*
* @param entity entity object.
* @param annotations annotations attached to the entity.
Expand Down
4 changes: 2 additions & 2 deletions ...erver/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -60,7 +60,7 @@ public void setUp() throws Exception {

@Test
public void testRecursiveResourceEnumerationOfAllPackages() throws IOException {
final int actualEntries = countJarEntriesByPattern(Pattern.compile(".*\\.(class|properties|xml|md)"));
final int actualEntries = countJarEntriesByPattern(Pattern.compile(".*\\.(class|properties|xml|md|xsd)"));
final int scannedEntries = countJarEntriesUsingScanner("", true);
assertThat("Failed to enumerate all contents of jakarta.ws.rs-api", scannedEntries, equalTo(actualEntries));
}
Expand Down
4 changes: 2 additions & 2 deletions examples/NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ aopalliance Version 1
* Project: http://aopalliance.sourceforge.net
* Copyright: Material in the public domain is not protected by copyright

Bean Validation API 3.0.2
Bean Validation API 3.1.0-M1
* License: Apache License, 2.0
* Project: http://beanvalidation.org/1.1/
* Project: https://beanvalidation.org/3.0/
* Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
* by the @authors tag.

Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/glassfish/jersey/examples/sse/jaxrs/JaxRsServerSentEventsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024 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
Expand Down Expand Up @@ -77,7 +77,7 @@ public void startDomain(@PathParam("id") final String id, @Context SseEventSink
domainSink.send(sse.newEventBuilder().name("domain-progress").data(String.class, "done").build());
domainSink.close();

} catch (final InterruptedException e) {
} catch (final /*InterruptedException | IO*/Exception e) {
e.printStackTrace();
}
}).start();
Expand Down
9 changes: 7 additions & 2 deletions ext/bean-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Payara Foundation and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -58,8 +58,13 @@
<Import-Package>
${jakarta.annotation.osgi.version},
${cdi.osgi.version},
<!--
Not working with xxx-M1
jakarta.validation.*;resolution:=optional;version="${range;[==,4);${jakarta.validation.api.version}}",
jakarta.decorator.*;version="[3.0,5)",
-->
jakarta.validation.*;resolution:=optional;version="!",
${jakarta.decorator.osgi.version},
${jakarta.rest.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
4 changes: 3 additions & 1 deletion ext/cdi/jersey-cdi-rs-inject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -73,7 +73,9 @@
<instructions>
<Import-Package>
${cdi.osgi.version},
${jakarta.decorator.osgi.version},
jakarta.servlet.*;version="[6.0, 7.0)";resolution:=optional,
${jakarta.rest.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
4 changes: 2 additions & 2 deletions ext/cdi/jersey-cdi1x-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2014, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2014, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -88,7 +88,7 @@
<Export-Package>org.glassfish.jersey.ext.cdi1x.servlet.internal</Export-Package>
<Import-Package>
${cdi.osgi.version},
jakarta.decorator.*;version="[3.0,5)",
${jakarta.decorator.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
Loading