This is an automated email from the ASF dual-hosted git repository.
jhorvath pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e763a0fdf7 OCI library upgrade (#5869)
e763a0fdf7 is described below
commit e763a0fdf7e5a4b831e642e5ff1db0a247f70c04
Author: Tomas Hurka <tomas.hu...@gmail.com>
AuthorDate: Tue May 9 12:58:20 2023 +0200
OCI library upgrade (#5869)
* upgrade websvc.restlib
* upgrade OCI libraries to 3.9.0
---
enterprise/cloud.oracle/external/binaries-list | 31 +-
...2-license.txt => httpclient-4.5.13-license.txt} | 14 +-
...1.1-license.txt => httpcore-4.4.13-license.txt} | 13 +-
.../jakarta.activation-api-1.2.1-license.txt | 36 --
...license.txt => javassist-3.25.0-GA-license.txt} | 14 +-
...-license.txt => oci-java-sdk-3.9.0-license.txt} | 4 +-
...-license.txt => resilience4j-1.7.1-license.txt} | 4 +-
.../cloud.oracle/nbproject/project.properties | 31 +-
enterprise/cloud.oracle/nbproject/project.xml | 149 +++-----
.../netbeans/modules/cloud/oracle/OCIProfile.java | 6 +
enterprise/websvc.restlib/external/binaries-list | 22 +-
.../jakarta.activation-api-1.2.1-license.txt} | 11 +-
...xt => jakarta.annotation-api-2.1.1-license.txt} | 4 +-
.../javax.annotation-api-1.3.2-license.txt | 405 +++++++++++++++++++++
...ey-2.34-license.txt => jersey-2.35-license.txt} | 4 +-
.../websvc.restlib/nbproject/project.properties | 44 ++-
enterprise/websvc.restlib/nbproject/project.xml | 96 +++--
.../netbeans/modules/websvc/swdp/Bundle.properties | 2 +-
.../src/org/netbeans/modules/websvc/swdp/swdp.xml | 24 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 +-
20 files changed, 631 insertions(+), 287 deletions(-)
diff --git a/enterprise/cloud.oracle/external/binaries-list
b/enterprise/cloud.oracle/external/binaries-list
index 5f3db9ee97..622fd1395e 100644
--- a/enterprise/cloud.oracle/external/binaries-list
+++ b/enterprise/cloud.oracle/external/binaries-list
@@ -15,20 +15,23 @@
# specific language governing permissions and limitations
# under the License.
-DB39E0A216BDCF38156BBE0179641D462BB62647
com.oracle.oci.sdk:oci-java-sdk-common:2.27.0
-C51EF1AA99B091AE01ADD0FFE16E04226A46A87F
com.oracle.oci.sdk:oci-java-sdk-database:2.27.0
-F15AAE27A41CC0771DC77FE242EAAE9C652A91AB
com.oracle.oci.sdk:oci-java-sdk-identity:2.27.0
-07468545ED99239202283D08CC3B81C7F75795F3
com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:2.27.0
-0CFEAB32956965D25DFAB4C3EC2F14B9064B4D99
com.oracle.oci.sdk:oci-java-sdk-workrequests:2.27.0
-0FF864DC94B63D4248B2DBFA595C68ABEDF1D360
com.oracle.oci.sdk:oci-java-sdk-devops:2.27.0
-36746680FE0C804CE33B947B4DBB092E1E9D2322
com.oracle.oci.sdk:oci-java-sdk-adm:2.27.0
-CACECE66244150F252B5C58E0A38FEA0D5015665 com.nimbusds:nimbus-jose-jwt:9.11.1
-25EA2E8B0C338A877313BD4672D3FE056EA78F0D com.google.code.findbugs:jsr305:3.0.2
-52C3DCE0E910EB8F7CE649F44EFADA7E26D8996A
org.glassfish.jersey.media:jersey-media-json-jackson:2.34
-FEC563E0FC3650846BA8D2A2B815569FFE0AB519
org.glassfish.jersey.connectors:jersey-apache-connector:2.34
-562A587FACE36EC7EFF2DB7F2FC95425C6602BC1
jakarta.activation:jakarta.activation-api:1.2.1
+F89364D98A616CBA66CA535759EA092C54B4BF75
com.oracle.oci.sdk:oci-java-sdk-common:3.9.0
+7BB77013E6B91FCC7CD72D3338EB9F4019E20EA9
com.oracle.oci.sdk:oci-java-sdk-database:3.9.0
+8AB9B9CA57124F30B6D25CBAC944A7CEE0373068
com.oracle.oci.sdk:oci-java-sdk-identity:3.9.0
+F2071C1D75795350EB4D6807C4327AA333C5930C
com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:3.9.0
+10D73A80C8F66F959C84189272A7FC1C0CB1C435
com.oracle.oci.sdk:oci-java-sdk-workrequests:3.9.0
+031597E1BEEED3E48203BE6ECEBBA442E6FE177E
com.oracle.oci.sdk:oci-java-sdk-devops:3.9.0
+5E52AF447D216717453E91782FCB965DF5669D5C
com.oracle.oci.sdk:oci-java-sdk-adm:3.9.0
+C81CF0C79C300BF0526DF80D7890F688C1E32803
com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.9.0
+19C42576CC31E6028F29639F442EBA0CD895ADB3
com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.9.0
+9499C6360FFDBEBC6F0F1285A20DD91485FEDD46
com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.9.0
-EBEC09ED06111475434BC41D7B47BF51457E5D41
io.github.resilience4j:resilience4j-circuitbreaker:1.2.0
-82DCE5BA9F0CCA3BBB694581ABAE0124ECCEB828
io.github.resilience4j:resilience4j-core:1.2.0
+E5F6CAE5CA7ECAAC1EC2827A9E2D65AE2869CADA
org.apache.httpcomponents:httpclient:4.5.13
+853B96D3AFBB7BF8CC303FE27EE96836A10C1834
org.apache.httpcomponents:httpcore:4.4.13
+
+442DC1F9FD520130BD18DA938622F4F9B2E5FBA3 org.javassist:javassist:3.25.0-GA
+
+AC1819C47CA19AD686EE015626E77C6DAFE8E862
io.github.resilience4j:resilience4j-circuitbreaker:1.7.1
+0A047BB3AA97387172C88404919313DD8ABACDF9
io.github.resilience4j:resilience4j-core:1.7.1
DFD5101B17DA36C32AE024B984E0B72712F01A35 io.vavr:vavr:0.10.2
68F1AF10052713FDA01BFB1E5B831DCF6D826AB2 io.vavr:vavr-match:0.10.2
\ No newline at end of file
diff --git a/enterprise/cloud.oracle/external/jsr305-3.0.2-license.txt
b/enterprise/cloud.oracle/external/httpclient-4.5.13-license.txt
similarity index 98%
copy from enterprise/cloud.oracle/external/jsr305-3.0.2-license.txt
copy to enterprise/cloud.oracle/external/httpclient-4.5.13-license.txt
index 1b9ec6357d..119e65bb82 100644
--- a/enterprise/cloud.oracle/external/jsr305-3.0.2-license.txt
+++ b/enterprise/cloud.oracle/external/httpclient-4.5.13-license.txt
@@ -1,9 +1,9 @@
-Name: JSR 305
-Description: Annotations for Software Defect Detection in Java
-Origin: https://code.google.com/archive/p/jsr-305
-Version: 3.0.2
+Name: Apache HttpClient
+Description: Apache HttpComponents Client
+Origin: http://hc.apache.org/httpcomponents-client-ga
+Version: 4.5.13
License: Apache-2.0
-
+Files: httpclient-4.5.13.jar
Apache License
Version 2.0, January 2004
@@ -206,7 +206,3 @@ License: Apache-2.0
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-
-
-
diff --git
a/enterprise/cloud.oracle/external/nimbus-jose-jwt-9.11.1-license.txt
b/enterprise/cloud.oracle/external/httpcore-4.4.13-license.txt
similarity index 97%
rename from enterprise/cloud.oracle/external/nimbus-jose-jwt-9.11.1-license.txt
rename to enterprise/cloud.oracle/external/httpcore-4.4.13-license.txt
index 76ba978142..c0fe8c7094 100644
--- a/enterprise/cloud.oracle/external/nimbus-jose-jwt-9.11.1-license.txt
+++ b/enterprise/cloud.oracle/external/httpcore-4.4.13-license.txt
@@ -1,9 +1,9 @@
-Name: Nimbus JOSE + JWT
-Description: Nimbus JOSE+JWT is an open source (Apache 2.0) Java library that
implements the Javascript Object Signing and Encryption (JOSE) spec suite and
the closely related JSON Web Token (JWT) spec.
-Origin: https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/
-Version: 9.11.1
+Name: Apache HttpCore
+Description: Apache HttpComponents Core (blocking I/O)
+Origin: http://hc.apache.org/httpcomponents-core-ga
+Version: 4.4.13
License: Apache-2.0
-
+Files: httpcore-4.4.13.jar
Apache License
Version 2.0, January 2004
@@ -206,6 +206,3 @@ License: Apache-2.0
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-
-
diff --git
a/enterprise/cloud.oracle/external/jakarta.activation-api-1.2.1-license.txt
b/enterprise/cloud.oracle/external/jakarta.activation-api-1.2.1-license.txt
deleted file mode 100644
index 877e43c89e..0000000000
--- a/enterprise/cloud.oracle/external/jakarta.activation-api-1.2.1-license.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Name: Jakarta Activation
-Description: Jakarta Activation™ is a standard extension to the Java platform
that lets you take advantage of standard services to: determine the type of an
arbitrary piece of data; encapsulate access to it; discover the operations
available on it; and instantiate the appropriate bean to perform the
operation(s).
-Origin: https://github.com/eclipse-ee4j/jaf
-Version: 1.2.1
-License: EDL-1.0-jaf
-
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Eclipse Foundation, Inc. nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/enterprise/cloud.oracle/external/jsr305-3.0.2-license.txt
b/enterprise/cloud.oracle/external/javassist-3.25.0-GA-license.txt
similarity index 97%
rename from enterprise/cloud.oracle/external/jsr305-3.0.2-license.txt
rename to enterprise/cloud.oracle/external/javassist-3.25.0-GA-license.txt
index 1b9ec6357d..9fc6bb6080 100644
--- a/enterprise/cloud.oracle/external/jsr305-3.0.2-license.txt
+++ b/enterprise/cloud.oracle/external/javassist-3.25.0-GA-license.txt
@@ -1,9 +1,9 @@
-Name: JSR 305
-Description: Annotations for Software Defect Detection in Java
-Origin: https://code.google.com/archive/p/jsr-305
-Version: 3.0.2
+Name: javassist
+Description: Javassist (JAVA programming ASSISTant) makes Java bytecode
manipulation simple. It is a class library for editing bytecodes in Java.
+Origin: http://www.javassist.org
+Version: 3.25.0-GA
License: Apache-2.0
-
+Files: javassist-3.25.0-GA.jar
Apache License
Version 2.0, January 2004
@@ -206,7 +206,3 @@ License: Apache-2.0
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-
-
-
diff --git a/enterprise/cloud.oracle/external/oci-java-sdk-2.27.0-license.txt
b/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt
similarity index 97%
rename from enterprise/cloud.oracle/external/oci-java-sdk-2.27.0-license.txt
rename to enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt
index daecc68d29..c7fcf3f3b4 100644
--- a/enterprise/cloud.oracle/external/oci-java-sdk-2.27.0-license.txt
+++ b/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt
@@ -1,9 +1,9 @@
Name: OCI Java SDK
Description: Oracle Cloud Infrastructure SDK for Java
Origin: https://github.com/oracle/oci-java-sdk
-Version: 2.27.0
+Version: 3.9.0
License: UPL-Apache-2.0
-Files: oci-java-sdk-circuitbreaker-2.27.0.jar, oci-java-sdk-common-2.27.0.jar,
oci-java-sdk-database-2.27.0.jar, oci-java-sdk-identity-2.27.0.jar,
oci-java-sdk-workrequests-2.27.0.jar, oci-java-sdk-adm-2.27.0.jar,
oci-java-sdk-devops-2.27.0.jar
+Files: oci-java-sdk-circuitbreaker-3.9.0.jar, oci-java-sdk-common-3.9.0.jar,
oci-java-sdk-database-3.9.0.jar, oci-java-sdk-identity-3.9.0.jar,
oci-java-sdk-workrequests-3.9.0.jar, oci-java-sdk-adm-3.9.0.jar,
oci-java-sdk-devops-3.9.0.jar,
oci-java-sdk-addons-apache-configurator-jersey-3.9.0.jar,
oci-java-sdk-common-httpclient-3.9.0.jar,
oci-java-sdk-common-httpclient-jersey-3.9.0.jar
Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
diff --git a/enterprise/cloud.oracle/external/resilience4j-1.2.0-license.txt
b/enterprise/cloud.oracle/external/resilience4j-1.7.1-license.txt
similarity index 99%
rename from enterprise/cloud.oracle/external/resilience4j-1.2.0-license.txt
rename to enterprise/cloud.oracle/external/resilience4j-1.7.1-license.txt
index 9ad1343e02..b73662bafb 100644
--- a/enterprise/cloud.oracle/external/resilience4j-1.2.0-license.txt
+++ b/enterprise/cloud.oracle/external/resilience4j-1.7.1-license.txt
@@ -1,9 +1,9 @@
Name: Resilience4j
Description: Resilience4j is a fault tolerance library designed for Java8 and
functional programming
Origin: https://github.com/resilience4j/resilience4j
-Version: 1.2.0
+Version: 1.7.1
License: Apache-2.0
-Files: resilience4j-circuitbreaker-1.2.0.jar, resilience4j-core-1.2.0.jar
+Files: resilience4j-circuitbreaker-1.7.1.jar, resilience4j-core-1.7.1.jar
Apache License
diff --git a/enterprise/cloud.oracle/nbproject/project.properties
b/enterprise/cloud.oracle/nbproject/project.properties
index 330af5530e..f69596ddea 100644
--- a/enterprise/cloud.oracle/nbproject/project.properties
+++ b/enterprise/cloud.oracle/nbproject/project.properties
@@ -15,21 +15,22 @@
# specific language governing permissions and limitations
# under the License.
-release.external/jakarta.activation-api-1.2.1.jar=modules/ext/jakarta.activation-api-1.2.1.jar
-release.external/jersey-apache-connector-2.34.jar=modules/ext/jersey-apache-connector-2.34.jar
-release.external/jersey-media-json-jackson-2.34.jar=modules/ext/jersey-media-json-jackson-2.34.jar
-release.external/jsr305-3.0.2.jar=modules/ext/jsr305-3.0.2.jar
-release.external/nimbus-jose-jwt-9.11.1.jar=modules/ext/nimbus-jose-jwt-9.11.1.jar
-release.external/oci-java-sdk-circuitbreaker-2.27.0.jar=modules/ext/oci-java-sdk-circuitbreaker-2.27.0.jar
-release.external/oci-java-sdk-common-2.27.0.jar=modules/ext/oci-java-sdk-common-2.27.0.jar
-release.external/oci-java-sdk-devops-2.27.0.jar=modules/ext/oci-java-sdk-devops-2.27.0.jar
-release.external/oci-java-sdk-database-2.27.0.jar=modules/ext/oci-java-sdk-database-2.27.0.jar
-release.external/oci-java-sdk-identity-2.27.0.jar=modules/ext/oci-java-sdk-identity-2.27.0.jar
-release.external/oci-java-sdk-workrequests-2.27.0.jar=modules/ext/oci-java-sdk-workrequests-2.27.0.jar
-release.external/oci-java-sdk-devops-2.27.0.jar=modules/ext/oci-java-sdk-devops-2.27.0.jar
-release.external/oci-java-sdk-adm-2.27.0.jar=modules/ext/oci-java-sdk-adm-2.27.0.jar
-release.external/resilience4j-circuitbreaker-1.2.0.jar=modules/ext/resilience4j-circuitbreaker-1.2.0.jar
-release.external/resilience4j-core-1.2.0.jar=modules/ext/resilience4j-core-1.2.0.jar
+release.external/oci-java-sdk-circuitbreaker-3.9.0.jar=modules/ext/oci-java-sdk-circuitbreaker-3.9.0.jar
+release.external/oci-java-sdk-common-3.9.0.jar=modules/ext/oci-java-sdk-common-3.9.0.jar
+release.external/oci-java-sdk-devops-3.9.0.jar=modules/ext/oci-java-sdk-devops-3.9.0.jar
+release.external/oci-java-sdk-database-3.9.0.jar=modules/ext/oci-java-sdk-database-3.9.0.jar
+release.external/oci-java-sdk-identity-3.9.0.jar=modules/ext/oci-java-sdk-identity-3.9.0.jar
+release.external/oci-java-sdk-workrequests-3.9.0.jar=modules/ext/oci-java-sdk-workrequests-3.9.0.jar
+release.external/oci-java-sdk-devops-3.9.0.jar=modules/ext/oci-java-sdk-devops-3.9.0.jar
+release.external/oci-java-sdk-adm-3.9.0.jar=modules/ext/oci-java-sdk-adm-3.9.0.jar
+release.external/oci-java-sdk-common-httpclient-3.9.0.jar=modules/ext/oci-java-sdk-common-httpclient-3.9.0.jar
+release.external/oci-java-sdk-common-httpclient-jersey-3.9.0.jar=modules/ext/oci-java-sdk-common-httpclient-jersey-3.9.0.jar
+release.external/oci-java-sdk-addons-apache-configurator-jersey-3.9.0.jar=modules/ext/oci-java-sdk-addons-apache-configurator-jersey-3.9.0.jar
+release.external/httpclient-4.5.13.jar=modules/ext/httpclient-4.5.13.jar
+release.external/httpcore-4.4.13.jar=modules/ext/httpcore-4.4.13.jar
+release.external/javassist-3.25.0-GA.jar=modules/ext/javassist-3.25.0-GA.jar
+release.external/resilience4j-circuitbreaker-1.7.1.jar=modules/ext/resilience4j-circuitbreaker-1.7.1.jar
+release.external/resilience4j-core-1.7.1.jar=modules/ext/resilience4j-core-1.7.1.jar
release.external/vavr-0.10.2.jar=modules/ext/vavr-0.10.2.jar
release.external/vavr-match-0.10.2.jar=modules/ext/vavr-match-0.10.2.jar
javac.source=1.8
diff --git a/enterprise/cloud.oracle/nbproject/project.xml
b/enterprise/cloud.oracle/nbproject/project.xml
index 94c624039e..afa68de21c 100644
--- a/enterprise/cloud.oracle/nbproject/project.xml
+++ b/enterprise/cloud.oracle/nbproject/project.xml
@@ -34,21 +34,7 @@
<run-dependency/>
</dependency>
<dependency>
- <code-name-base>com.google.guava</code-name-base>
- <run-dependency>
- <specification-version>27.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>net.java.html</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency/>
- </dependency>
- <dependency>
- <code-name-base>net.java.html.json</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
+ <code-name-base>bcutil</code-name-base>
<run-dependency/>
</dependency>
<dependency>
@@ -58,17 +44,15 @@
</run-dependency>
</dependency>
<dependency>
-
<code-name-base>org.apache.commons.httpclient</code-name-base>
+ <code-name-base>org.apache.commons.io</code-name-base>
<run-dependency>
- <specification-version>3.1.0</specification-version>
+ <specification-version>2.6.0</specification-version>
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.apache.commons.lang3</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
+ <code-name-base>org.apache.commons.logging</code-name-base>
<run-dependency>
- <specification-version>1.10</specification-version>
+ <specification-version>1.2</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -89,37 +73,13 @@
<specification-version>1.65</specification-version>
</run-dependency>
</dependency>
- <dependency>
- <code-name-base>org.netbeans.libs.asm</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>5.18</specification-version>
- </run-dependency>
- </dependency>
<dependency>
<code-name-base>org.netbeans.libs.jackson</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
- <specification-version>2.12.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.libs.javacapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.36</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
-
<code-name-base>org.netbeans.modules.cloud.common</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.29</specification-version>
+ <specification-version>2.18</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -172,7 +132,7 @@
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
- <specification-version>2.23</specification-version>
+ <specification-version>2.29</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -223,33 +183,6 @@
<specification-version>7.60</specification-version>
</run-dependency>
</dependency>
- <dependency>
- <code-name-base>org.netbeans.libs.git</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.51</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
-
<code-name-base>org.netbeans.modules.versioning</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.64</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
-
<code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
-
<specification-version>1.103.0.9</specification-version>
- </run-dependency>
- </dependency>
<dependency>
<code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
@@ -303,68 +236,72 @@
</test-dependencies>
<public-packages/>
<class-path-extension>
-
<runtime-relative-path>ext/jersey-apache-connector-2.34.jar</runtime-relative-path>
-
<binary-origin>external/jersey-apache-connector-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-identity-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-identity-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/oci-java-sdk-identity-2.27.0.jar</runtime-relative-path>
-
<binary-origin>external/oci-java-sdk-identity-2.27.0.jar</binary-origin>
+
<runtime-relative-path>ext/resilience4j-circuitbreaker-1.7.1.jar</runtime-relative-path>
+
<binary-origin>external/resilience4j-circuitbreaker-1.7.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/resilience4j-circuitbreaker-1.2.0.jar</runtime-relative-path>
-
<binary-origin>external/resilience4j-circuitbreaker-1.2.0.jar</binary-origin>
+
<runtime-relative-path>ext/resilience4j-core-1.7.1.jar</runtime-relative-path>
+
<binary-origin>external/resilience4j-core-1.7.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/oci-java-sdk-common-2.27.0.jar</runtime-relative-path>
-
<binary-origin>external/oci-java-sdk-common-2.27.0.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-common-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-common-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/oci-java-sdk-devops-2.27.0.jar</runtime-relative-path>
-
<binary-origin>external/oci-java-sdk-devops-2.27.0.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-devops-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-devops-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/oci-java-sdk-adm-2.27.0.jar</runtime-relative-path>
-
<binary-origin>external/oci-java-sdk-adm-2.27.0.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-adm-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-adm-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jakarta.activation-api-1.2.1.jar</runtime-relative-path>
-
<binary-origin>external/jakarta.activation-api-1.2.1.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-common-httpclient-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-common-httpclient-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
- <binary-origin>external/jsr305-3.0.2.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-common-httpclient-jersey-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-common-httpclient-jersey-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/vavr-0.10.2.jar</runtime-relative-path>
- <binary-origin>external/vavr-0.10.2.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-addons-apache-configurator-jersey-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-addons-apache-configurator-jersey-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/oci-java-sdk-database-2.27.0.jar</runtime-relative-path>
-
<binary-origin>external/oci-java-sdk-database-2.27.0.jar</binary-origin>
+
<runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
+ <binary-origin>external/httpclient-4.5.13.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jersey-media-json-jackson-2.34.jar</runtime-relative-path>
-
<binary-origin>external/jersey-media-json-jackson-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/httpcore-4.4.13.jar</runtime-relative-path>
+ <binary-origin>external/httpcore-4.4.13.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/oci-java-sdk-circuitbreaker-2.27.0.jar</runtime-relative-path>
-
<binary-origin>external/oci-java-sdk-circuitbreaker-2.27.0.jar</binary-origin>
+
<runtime-relative-path>ext/javassist-3.25.0-GA.jar</runtime-relative-path>
+ <binary-origin>external/javassist-3.25.0-GA.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/vavr-match-0.10.2.jar</runtime-relative-path>
- <binary-origin>external/vavr-match-0.10.2.jar</binary-origin>
+
<runtime-relative-path>ext/vavr-0.10.2.jar</runtime-relative-path>
+ <binary-origin>external/vavr-0.10.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/nimbus-jose-jwt-9.11.1.jar</runtime-relative-path>
-
<binary-origin>external/nimbus-jose-jwt-9.11.1.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-database-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-database-3.9.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/oci-java-sdk-workrequests-2.27.0.jar</runtime-relative-path>
-
<binary-origin>external/oci-java-sdk-workrequests-2.27.0.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-circuitbreaker-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-circuitbreaker-3.9.0.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/vavr-match-0.10.2.jar</runtime-relative-path>
+ <binary-origin>external/vavr-match-0.10.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/resilience4j-core-1.2.0.jar</runtime-relative-path>
-
<binary-origin>external/resilience4j-core-1.2.0.jar</binary-origin>
+
<runtime-relative-path>ext/oci-java-sdk-workrequests-3.9.0.jar</runtime-relative-path>
+
<binary-origin>external/oci-java-sdk-workrequests-3.9.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIProfile.java
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIProfile.java
index e672c95644..4abbbf8bff 100644
---
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIProfile.java
+++
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIProfile.java
@@ -44,6 +44,8 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Objects;
import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.netbeans.modules.cloud.oracle.items.OCID;
@@ -78,6 +80,7 @@ public final class OCIProfile implements OCISessionInitiator {
private ConfigFileAuthenticationDetailsProvider configProvider;
private IOException initError;
private Tenancy tenancyOpt;
+ private static final Logger LOG =
Logger.getLogger(OCIProfile.class.getName());
OCIProfile(Path configPath, String id) {
this(configPath, id, true);
@@ -114,8 +117,10 @@ public final class OCIProfile implements
OCISessionInitiator {
configProvider = new
ConfigFileAuthenticationDetailsProvider(configFile);
fileStamp = stamp;
} catch (IOException ex) {
+ LOG.log(Level.INFO, "init()", ex);
initError = ex;
} catch (Throwable ex) {
+ LOG.log(Level.INFO, "init()", ex);
initError = new IOException(ex);
}
}
@@ -165,6 +170,7 @@ public final class OCIProfile implements
OCISessionInitiator {
return tenancyOpt = tenancy;
}
} catch (Throwable t) {
+ LOG.log(Level.INFO, "getTenancyData()", t);
initError = new IOException(t);
}
return null;
diff --git a/enterprise/websvc.restlib/external/binaries-list
b/enterprise/websvc.restlib/external/binaries-list
index 729da5a5ea..670b2d714e 100644
--- a/enterprise/websvc.restlib/external/binaries-list
+++ b/enterprise/websvc.restlib/external/binaries-list
@@ -15,7 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-59EB84EE0D616332FF44ABA065F3888CF002CD2D
jakarta.annotation:jakarta.annotation-api:1.3.5
+934C04D3CFEF185A8008E7BF34331B79730A9D43
javax.annotation:javax.annotation-api:1.3.2
+562A587FACE36EC7EFF2DB7F2FC95425C6602BC1
jakarta.activation:jakarta.activation-api:1.2.1
+48B9BDA22B091B1F48B13AF03FE36DB3BE6E1AE3
jakarta.annotation:jakarta.annotation-api:2.1.1
8F6EA5DAEDC614F07A3654A455660145286F024E
jakarta.persistence:jakarta.persistence-api:2.2.3
B8A1142E04838FE54194049C6E7A18DAE8F9B960
jakarta.servlet:jakarta.servlet-api:4.0.4
5EACC6522521F7EACB081F95CEE1E231648461E7
jakarta.validation:jakarta.validation-api:2.0.2
@@ -27,12 +29,14 @@ B8A1142E04838FE54194049C6E7A18DAE8F9B960
jakarta.servlet:jakarta.servlet-api:4.0
8096EBF722902E75FBD4F532A751E514F02E1EB7
org.glassfish.hk2.external:jakarta.inject:2.6.1
B2EB0A83BCBB44CC5D25F8B18F23BE116313A638
org.glassfish.hk2.external:aopalliance-repackaged:2.6.1
DE3B21279DF7E755E38275137539BE5E2C80DD58
org.glassfish.hk2:osgi-resource-locator:1.0.3
-F9C6C7C6429A1EDE8E73CF077BDCA28EBFF67681
org.glassfish.jersey.core:jersey-client:2.34
-CEA85E85B1C19657EC3EA41B26351A53A40CAA3C
org.glassfish.jersey.core:jersey-common:2.34
-3F3AD63CE2B51FF565D3BA85EEB8202983E9BE13
org.glassfish.jersey.core:jersey-server:2.34
-6848A8321CFA554DE4456A8230E141CF410FEADB
org.glassfish.jersey.containers:jersey-container-servlet:2.34
-E71FB899349874CB2877656680508A257947601C
org.glassfish.jersey.containers:jersey-container-servlet-core:2.34
-B3112E9EDC3B1A138B31862ED4AAA48F60CF1F73
org.glassfish.jersey.ext:jersey-entity-filtering:2.34
-15BB093C57C0CAC880AD7B474F7FD653CAC840A1
org.glassfish.jersey.inject:jersey-hk2:2.34
-18D8BF2AC05E7D1EB9DDDE21BF21304E211F9DC2
org.glassfish.jersey.media:jersey-media-moxy:2.34
+EA92BE0DD34D0B298930A7514E715783F4EABA97
org.glassfish.jersey.core:jersey-client:2.35
+2F15EC1B3A3598D6B12D4B0C6FF6F0905F5E5B4C
org.glassfish.jersey.core:jersey-common:2.35
+C6EFC2EE82D2550E6385A7F7B1C08651F71AFB7A
org.glassfish.jersey.core:jersey-server:2.35
+B09CFD6D2E645F1D8DB538BA93201B2D69B8403D
org.glassfish.jersey.connectors:jersey-apache-connector:2.35
+898EF84B72E75788811DD709FE7C7051F61A943E
org.glassfish.jersey.containers:jersey-container-servlet:2.35
+7CC48F2529B921F25A020C821DDE23753F6E60BB
org.glassfish.jersey.containers:jersey-container-servlet-core:2.35
+2FBE9E89F6597E10976D1431DDE64B282A761AEB
org.glassfish.jersey.ext:jersey-entity-filtering:2.35
+2BE6D2227081028566E8E2B0FC6A1ABBAECF56F7
org.glassfish.jersey.inject:jersey-hk2:2.35
+6383927E15ECB4BAEEF2CF0D3373B1FF1795C062
org.glassfish.jersey.media:jersey-media-json-jackson:2.35
+9B27FC01599CAB6AF757F0F0799D451A09F57E14
org.glassfish.jersey.media:jersey-media-moxy:2.35
DAA42A0E96C3B881E8C330A413813983E92D2426 org.osgi:osgi.core:8.0.0
diff --git
a/enterprise/cloud.oracle/external/jersey-apache-connector-2.34-license.txt
b/enterprise/websvc.restlib/external/jakarta.activation-api-1.2.1-license.txt
similarity index 98%
rename from
enterprise/cloud.oracle/external/jersey-apache-connector-2.34-license.txt
rename to
enterprise/websvc.restlib/external/jakarta.activation-api-1.2.1-license.txt
index 0eb9d4ae2e..cc9ac5254e 100644
--- a/enterprise/cloud.oracle/external/jersey-apache-connector-2.34-license.txt
+++
b/enterprise/websvc.restlib/external/jakarta.activation-api-1.2.1-license.txt
@@ -1,9 +1,9 @@
-Name: Jersey
-Description: Jersey is a REST framework that provides JAX-RS Reference
Implementation and more.
-Origin: https://github.com/eclipse-ee4j/jersey
-Version: 2.34
+Name: Jakarta Activation API
+Version: 1.2.1
+Description: Jakarta Activation API
License: EPL-v20
-Files: jersey-apache-connector-2.34.jar, jersey-media-json-jackson-2.34.jar
+Origin: https://projects.eclipse.org/projects/ee4j.jaf
+Files: jakarta.activation-api-1.2.1.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
@@ -91,3 +91,4 @@ Simply including a copy of this Agreement, including this
Exhibit A is not suffi
If it is not possible or desirable to put the notice in a particular file,
then You may include the notice in a location (such as a LICENSE file in a
relevant directory) where a recipient would be likely to look for such a notice.
You may add additional accurate notices of copyright ownership.
+
diff --git
a/enterprise/websvc.restlib/external/jakarta.annotation-api-1.3.5-license.txt
b/enterprise/websvc.restlib/external/jakarta.annotation-api-2.1.1-license.txt
similarity index 99%
rename from
enterprise/websvc.restlib/external/jakarta.annotation-api-1.3.5-license.txt
rename to
enterprise/websvc.restlib/external/jakarta.annotation-api-2.1.1-license.txt
index 94cc7cc3de..4e79f9e0bb 100644
---
a/enterprise/websvc.restlib/external/jakarta.annotation-api-1.3.5-license.txt
+++
b/enterprise/websvc.restlib/external/jakarta.annotation-api-2.1.1-license.txt
@@ -1,9 +1,9 @@
Name: Jakarta Annotations API
-Version: 1.3.5
+Version: 2.1.1
Description: Jakarta Annotations API
License: EPL-v20
Origin: https://projects.eclipse.org/projects/ee4j.ca
-Files: jakarta.annotation-api-1.3.5.jar
+Files: jakarta.annotation-api-2.1.1.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git
a/enterprise/websvc.restlib/external/javax.annotation-api-1.3.2-license.txt
b/enterprise/websvc.restlib/external/javax.annotation-api-1.3.2-license.txt
new file mode 100644
index 0000000000..6bde984963
--- /dev/null
+++ b/enterprise/websvc.restlib/external/javax.annotation-api-1.3.2-license.txt
@@ -0,0 +1,405 @@
+Name: Javax Annotation API
+Version: 1.3.2
+License: CDDL-1.1
+Description: Javax Annotation API 1.3.2
+Origin: GlassFish Community
(https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api/1.3.2)
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
+
+1. Definitions.
+
+1.1. "Contributor" means each individual or entity that
+creates or contributes to the creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the
+Original Software, prior Modifications used by a
+Contributor (if any), and the Modifications made by that
+particular Contributor.
+
+1.3. "Covered Software" means (a) the Original Software, or
+(b) Modifications, or (c) the combination of files
+containing Original Software with files containing
+Modifications, in each case including portions thereof.
+
+1.4. "Executable" means the Covered Software in any form
+other than Source Code.
+
+1.5. "Initial Developer" means the individual or entity
+that first makes Original Software available under this
+License.
+
+1.6. "Larger Work" means a work which combines Covered
+Software or portions thereof with code not governed by the
+terms of this License.
+
+1.7. "License" means this document.
+
+1.8. "Licensable" means having the right to grant, to the
+maximum extent possible, whether at the time of the initial
+grant or subsequently acquired, any and all of the rights
+conveyed herein.
+
+1.9. "Modifications" means the Source Code and Executable
+form of any of the following:
+
+A. Any file that results from an addition to,
+deletion from or modification of the contents of a
+file containing Original Software or previous
+Modifications;
+
+B. Any new file that contains any part of the
+Original Software or previous Modification; or
+
+C. Any new file that is contributed or otherwise made
+available under the terms of this License.
+
+1.10. "Original Software" means the Source Code and
+Executable form of computer software code that is
+originally released under this License.
+
+1.11. "Patent Claims" means any patent claim(s), now owned
+or hereafter acquired, including without limitation,
+method, process, and apparatus claims, in any patent
+Licensable by grantor.
+
+1.12. "Source Code" means (a) the common form of computer
+software code in which modifications are made and (b)
+associated documentation included in or with such code.
+
+1.13. "You" (or "Your") means an individual or a legal
+entity exercising rights under, and complying with all of
+the terms of, this License. For legal entities, "You"
+includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this
+definition, "control" means (a) the power, direct or
+indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (b) ownership
+of more than fifty percent (50%) of the outstanding shares
+or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, the
+Initial Developer hereby grants You a world-wide,
+royalty-free, non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Initial Developer,
+to use, reproduce, modify, display, perform,
+sublicense and distribute the Original Software (or
+portions thereof), with or without Modifications,
+and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using or selling of Original Software, to make, have
+made, use, practice, sell, and offer for sale, and/or
+otherwise dispose of the Original Software (or
+portions thereof).
+
+(c) The licenses granted in Sections 2.1(a) and (b)
+are effective on the date Initial Developer first
+distributes or otherwise makes the Original Software
+available to a third party under the terms of this
+License.
+
+(d) Notwithstanding Section 2.1(b) above, no patent
+license is granted: (1) for code that You delete from
+the Original Software, or (2) for infringements
+caused by: (i) the modification of the Original
+Software, or (ii) the combination of the Original
+Software with other software or devices.
+
+2.2. Contributor Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, each
+Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Contributor to
+use, reproduce, modify, display, perform, sublicense
+and distribute the Modifications created by such
+Contributor (or portions thereof), either on an
+unmodified basis, with other Modifications, as
+Covered Software and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using, or selling of Modifications made by that
+Contributor either alone and/or in combination with
+its Contributor Version (or portions of such
+combination), to make, use, sell, offer for sale,
+have made, and/or otherwise dispose of: (1)
+Modifications made by that Contributor (or portions
+thereof); and (2) the combination of Modifications
+made by that Contributor with its Contributor Version
+(or portions of such combination).
+
+(c) The licenses granted in Sections 2.2(a) and
+2.2(b) are effective on the date Contributor first
+distributes or otherwise makes the Modifications
+available to a third party.
+
+(d) Notwithstanding Section 2.2(b) above, no patent
+license is granted: (1) for any code that Contributor
+has deleted from the Contributor Version; (2) for
+infringements caused by: (i) third party
+modifications of Contributor Version, or (ii) the
+combination of Modifications made by that Contributor
+with other software (except as part of the
+Contributor Version) or other devices; or (3) under
+Patent Claims infringed by Covered Software in the
+absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make
+available in Executable form must also be made available in
+Source Code form and that Source Code form must be
+distributed only under the terms of this License. You must
+include a copy of this License with every copy of the
+Source Code form of the Covered Software You distribute or
+otherwise make available. You must inform recipients of any
+such Covered Software in Executable form as to how they can
+obtain such Covered Software in Source Code form in a
+reasonable manner on or through a medium customarily used
+for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You
+contribute are governed by the terms of this License. You
+represent that You believe Your Modifications are Your
+original creation(s) and/or You have sufficient rights to
+grant the rights conveyed by this License.
+
+3.3. Required Notices.
+
+You must include a notice in each of Your Modifications
+that identifies You as the Contributor of the Modification.
+You may not remove or alter any copyright, patent or
+trademark notices contained within the Covered Software, or
+any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+
+You may not offer or impose any terms on any Covered
+Software in Source Code form that alters or restricts the
+applicable version of this License or the recipients'
+rights hereunder. You may choose to offer, and to charge a
+fee for, warranty, support, indemnity or liability
+obligations to one or more recipients of Covered Software.
+However, you may do so only on Your own behalf, and not on
+behalf of the Initial Developer or any Contributor. You
+must make it absolutely clear that any such warranty,
+support, indemnity or liability obligation is offered by
+You alone, and You hereby agree to indemnify the Initial
+Developer and every Contributor for any liability incurred
+by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+
+You may distribute the Executable form of the Covered
+Software under the terms of this License or under the terms
+of a license of Your choice, which may contain terms
+different from this License, provided that You are in
+compliance with the terms of this License and that the
+license for the Executable form does not attempt to limit
+or alter the recipient's rights in the Source Code form
+from the rights set forth in this License. If You
+distribute the Covered Software in Executable form under a
+different license, You must make it absolutely clear that
+any terms which differ from this License are offered by You
+alone, not by the Initial Developer or Contributor. You
+hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial
+Developer or such Contributor as a result of any such terms
+You offer.
+
+3.6. Larger Works.
+
+You may create a Larger Work by combining Covered Software
+with other code not governed by the terms of this License
+and distribute the Larger Work as a single product. In such
+a case, You must make sure the requirements of this License
+are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+
+Oracle is the initial license steward and
+may publish revised and/or new versions of this License
+from time to time. Each version will be given a
+distinguishing version number. Except as provided in
+Section 4.3, no one other than the license steward has the
+right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. If the Initial Developer includes a
+notice in the Original Software prohibiting it from being
+distributed or otherwise made available under any
+subsequent version of the License, You must distribute and
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. Otherwise, You may also choose to
+use, distribute or otherwise make the Covered Software
+available under the terms of any subsequent version of the
+License published by the license steward.
+
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a
+new license for Your Original Software, You may create and
+use a modified version of this License if You: (a) rename
+the license and remove any references to the name of the
+license steward (except to note that the license differs
+from this License); and (b) otherwise make it clear that
+the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will
+terminate automatically if You fail to comply with terms
+herein and fail to cure such breach within 30 days of
+becoming aware of the breach. Provisions which, by their
+nature, must remain in effect beyond the termination of
+this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding
+declaratory judgment actions) against Initial Developer or
+a Contributor (the Initial Developer or Contributor against
+whom You assert such claim is referred to as "Participant")
+alleging that the Participant Software (meaning the
+Contributor Version where the Participant is a Contributor
+or the Original Software where the Participant is the
+Initial Developer) directly or indirectly infringes any
+patent, then any and all rights granted directly or
+indirectly to You by such Participant, the Initial
+Developer (if the Initial Developer is not the Participant)
+and all Contributors under Sections 2.1 and/or 2.2 of this
+License shall, upon 60 days notice from Participant
+terminate prospectively and automatically at the expiration
+of such 60 day notice period, unless if within such 60 day
+period You withdraw Your claim with respect to the
+Participant Software against such Participant either
+unilaterally or pursuant to a written agreement with
+Participant.
+
+6.3. If You assert a patent infringement claim against
+Participant alleging that the Participant Software directly
+or indirectly infringes any patent where such claim is
+resolved (such as by license or settlement) prior to the
+initiation of patent infringement litigation, then the
+reasonable value of the licenses granted by such Participant
+under Sections 2.1 or 2.2 shall be taken into account in
+determining the amount or value of any payment or license.
+
+6.4. In the event of termination under Sections 6.1 or 6.2
+above, all end user licenses that have been validly granted
+by You or any distributor hereunder prior to termination
+(excluding licenses granted to You by any distributor)
+shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a "commercial item," as that term is
+defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" (as that term is defined at 48 C.F.R.
+§ 252.227-7014(a)(1)) and "commercial computer software
+documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users
+acquire Covered Software with only those rights set forth herein.
+This U.S. Government Rights clause is in lieu of, and supersedes,
+any other FAR, DFAR, or other clause or provision that addresses
+Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the
+extent necessary to make it enforceable. This License shall be
+governed by the law of the jurisdiction specified in a notice
+contained within the Original Software (except to the extent
+applicable law, if any, provides otherwise), excluding such
+jurisdiction's conflict-of-law provisions. Any litigation
+relating to this License shall be subject to the jurisdiction of
+the courts located in the jurisdiction and venue specified in a
+notice contained within the Original Software, with the losing
+party responsible for costs, including, without limitation, court
+costs and reasonable attorneys' fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or
+regulation which provides that the language of a contract shall
+be construed against the drafter shall not apply to this License.
+You agree that You alone are responsible for compliance with the
+United States export administration regulations (and the export
+control laws and regulation of any other countries) when You use,
+distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is
+responsible for claims and damages arising, directly or
+indirectly, out of its utilization of rights under this License
+and You agree to work with Initial Developer and Contributors to
+distribute such responsibility on an equitable basis. Nothing
+herein is intended or shall be deemed to constitute any admission
+of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
+DISTRIBUTION LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws
+of the State of California (excluding conflict-of-law provisions).
+Any litigation relating to this License shall be subject to the
+jurisdiction of the Federal Courts of the Northern District of
+California and the state courts of the State of California, with
+venue lying in Santa Clara County, California.
diff --git a/enterprise/websvc.restlib/external/jersey-2.34-license.txt
b/enterprise/websvc.restlib/external/jersey-2.35-license.txt
similarity index 97%
rename from enterprise/websvc.restlib/external/jersey-2.34-license.txt
rename to enterprise/websvc.restlib/external/jersey-2.35-license.txt
index a45b7767e2..6c2def76f3 100644
--- a/enterprise/websvc.restlib/external/jersey-2.34-license.txt
+++ b/enterprise/websvc.restlib/external/jersey-2.35-license.txt
@@ -1,9 +1,9 @@
Name: jersey
-Version: 2.34
+Version: 2.35
Description: REST framework that provides a JAX-RS (JSR-370) implementation
and more
License: EPL-v20
Origin: Eclipse Foundation (https://eclipse-ee4j.github.io/jersey/)
-Files: jersey-client-2.34.jar, jersey-common-2.34.jar,
jersey-container-servlet-2.34.jar, jersey-container-servlet-core-2.34.jar,
jersey-entity-filtering-2.34.jar, jersey-hk2-2.34.jar,
jersey-media-moxy-2.34.jar, jersey-server-2.34.jar
+Files: jersey-apache-connector-2.35.jar, jersey-client-2.35.jar,
jersey-common-2.35.jar, jersey-container-servlet-2.35.jar,
jersey-container-servlet-core-2.35.jar, jersey-entity-filtering-2.35.jar,
jersey-hk2-2.35.jar, jersey-media-json-jackson-2.35.jar,
jersey-media-moxy-2.35.jar, jersey-server-2.35.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/enterprise/websvc.restlib/nbproject/project.properties
b/enterprise/websvc.restlib/nbproject/project.properties
index ce63081ac8..bc8df9e612 100644
--- a/enterprise/websvc.restlib/nbproject/project.properties
+++ b/enterprise/websvc.restlib/nbproject/project.properties
@@ -21,20 +21,24 @@ javac.compilerargs=-Xlint:all -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
jnlp.indirect.jars=\
- modules/ext/jersey2/jakarta.annotation-api-1.3.5.jar,\
+ modules/ext/jersey2/javax.annotation-api-1.3.2.jar,\
+ modules/ext/jersey2/jakarta.activation-api-1.2.1.jar,\
+ modules/ext/jersey2/jakarta.annotation-api-2.1.1.jar,\
modules/ext/jersey2/jakarta.persistence-api-2.2.3.jar,\
modules/ext/jersey2/jakarta.servlet-api-4.0.4.jar,\
modules/ext/jersey2/jakarta.validation-api-2.0.2.jar,\
modules/ext/jaxrs-2.1/jakarta.ws.rs-api-2.1.6.jar,\
modules/ext/jersey2/jakarta.xml.bind-api-2.3.3.jar,\
- modules/ext/jersey2/jersey-client.jar,\
- modules/ext/jersey2/jersey-common.jar,\
- modules/ext/jersey2/jersey-server.jar,\
- modules/ext/jersey2/jersey-entity-filtering-2.34.jar,\
- modules/ext/jersey2/jersey-hk2-2.34.jar,\
- modules/ext/jersey2/jersey-media-moxy-2.34.jar,\
- modules/ext/jersey2/jersey-container-servlet-2.34.jar,\
- modules/ext/jersey2/jersey-container-servlet-core-2.34.jar,\
+ modules/ext/jersey2/jersey-apache-connector-2.35.jar,\
+ modules/ext/jersey2/jersey-client-2.35.jar,\
+ modules/ext/jersey2/jersey-common-2.35.jar,\
+ modules/ext/jersey2/jersey-container-servlet-2.35.jar,\
+ modules/ext/jersey2/jersey-container-servlet-core-2.35.jar,\
+ modules/ext/jersey2/jersey-entity-filtering-2.35.jar,\
+ modules/ext/jersey2/jersey-hk2-2.35.jar,\
+ modules/ext/jersey2/jersey-media-json-jackson-2.35.jar,\
+ modules/ext/jersey2/jersey-media-moxy-2.35.jar,\
+ modules/ext/jersey2/jersey-server-2.35.jar,\
modules/ext/jersey2/aopalliance-repackaged-2.6.1.jar,\
modules/ext/jersey2/hk2-api-2.6.1.jar,\
modules/ext/jersey2/hk2-locator-2.6.1.jar,\
@@ -43,21 +47,25 @@ jnlp.indirect.jars=\
modules/ext/jersey2/osgi.core-8.0.0.jar,\
modules/ext/jersey2/osgi-resource-locator-1.0.3.jar
-release.external/jakarta.annotation-api-1.3.5.jar=modules/ext/jersey2/jakarta.annotation-api-1.3.5.jar
+release.external/javax.annotation-api-1.3.2.jar=modules/ext/javax.annotation-api-1.3.2.jar
+release.external/jakarta.activation-api-1.2.1.jar=modules/ext/jersey2/jakarta.activation-api-1.2.1.jar
+release.external/jakarta.annotation-api-2.1.1.jar=modules/ext/jersey2/jakarta.annotation-api-2.1.1.jar
release.external/jakarta.persistence-api-2.2.3.jar=modules/ext/jersey2/jakarta.persistence-api-2.2.3.jar
release.external/jakarta.servlet-api-4.0.4.jar=modules/ext/jersey2/jakarta.servlet-api-4.0.4.jar
release.external/jakarta.validation-api-2.0.2.jar=modules/ext/jersey2/jakarta.validation-api-2.0.2.jar
release.external/jakarta.ws.rs-api-2.1.6.jar=modules/ext/jaxrs-2.1/jakarta.ws.rs-api-2.1.6.jar
release.external/jakarta.xml.bind-api-2.3.3.jar=modules/ext/jersey2/jakarta.xml.bind-api-2.3.3.jar
-release.external/jersey-client-2.34.jar=modules/ext/jersey2/jersey-client-2.34.jar
-release.external/jersey-common-2.34.jar=modules/ext/jersey2/jersey-common-2.34.jar
-release.external/jersey-server-2.34.jar=modules/ext/jersey2/jersey-server-2.34.jar
-release.external/jersey-entity-filtering-2.34.jar=modules/ext/jersey2/jersey-entity-filtering-2.34.jar
-release.external/jersey-hk2-2.34.jar=modules/ext/jersey2/jersey-hk2-2.34.jar
-release.external/jersey-media-moxy-2.34.jar=modules/ext/jersey2/jersey-media-moxy-2.34.jar
-release.external/jersey-container-servlet-2.34.jar=modules/ext/jersey2/jersey-container-servlet-2.34.jar
-release.external/jersey-container-servlet-core-2.34.jar=modules/ext/jersey2/jersey-container-servlet-core-2.34.jar
+release.external/jersey-apache-connector-2.35.jar=modules/ext/jersey2/jersey-apache-connector-2.35.jar
+release.external/jersey-client-2.35.jar=modules/ext/jersey2/jersey-client-2.35.jar
+release.external/jersey-common-2.35.jar=modules/ext/jersey2/jersey-common-2.35.jar
+release.external/jersey-container-servlet-2.35.jar=modules/ext/jersey2/jersey-container-servlet-2.35.jar
+release.external/jersey-container-servlet-core-2.35.jar=modules/ext/jersey2/jersey-container-servlet-core-2.35.jar
+release.external/jersey-entity-filtering-2.35.jar=modules/ext/jersey2/jersey-entity-filtering-2.35.jar
+release.external/jersey-hk2-2.35.jar=modules/ext/jersey2/jersey-hk2-2.35.jar
+release.external/jersey-media-json-jackson-2.35.jar=modules/ext/jersey2/jersey-media-json-jackson-2.35.jar
+release.external/jersey-media-moxy-2.35.jar=modules/ext/jersey2/jersey-media-moxy-2.35.jar
+release.external/jersey-server-2.35.jar=modules/ext/jersey2/jersey-server-2.35.jar
release.external/aopalliance-repackaged-2.6.1.jar=modules/ext/jersey2/aopalliance-repackaged-2.6.1.jar
release.external/hk2-api-2.6.1.jar=modules/ext/jersey2/hk2-api-2.6.1.jar
diff --git a/enterprise/websvc.restlib/nbproject/project.xml
b/enterprise/websvc.restlib/nbproject/project.xml
index fb0034c387..3f63b042d2 100644
--- a/enterprise/websvc.restlib/nbproject/project.xml
+++ b/enterprise/websvc.restlib/nbproject/project.xml
@@ -25,6 +25,13 @@
<data xmlns="http://www.netbeans.org/ns/nb-module-project/2";>
<code-name-base>org.netbeans.modules.websvc.restlib</code-name-base>
<module-dependencies>
+ <dependency>
+ <code-name-base>org.netbeans.libs.jackson</code-name-base>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>2.18</specification-version>
+ </run-dependency>
+ </dependency>
<dependency>
<code-name-base>org.netbeans.modules.j2ee.eclipselink</code-name-base>
<build-prerequisite/>
@@ -43,30 +50,11 @@
<specification-version>1.3</specification-version>
</run-dependency>
</dependency>
- <dependency>
- <code-name-base>org.netbeans.libs.jackson</code-name-base>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.12.0</specification-version>
- </run-dependency>
- </dependency>
</module-dependencies>
<public-packages>
- <package>javax.ws.rs</package>
- <package>javax.ws.rs.client</package>
- <package>javax.ws.rs.container</package>
- <package>javax.ws.rs.core</package>
- <package>javax.ws.rs.ext</package>
- <package>javax.ws.rs.sse</package>
- <package>org.glassfish.jersey.client</package>
- <package>org.glassfish.jersey.client.authentication</package>
- <package>org.glassfish.jersey.client.filter</package>
- <package>org.glassfish.jersey.client.http</package>
- <package>org.glassfish.jersey.client.inject</package>
- <package>org.glassfish.jersey.client.spi</package>
- <package>javax.annotation</package>
- <package>javax.annotation.security</package>
- <package>javax.annotation.sql</package>
+ <package>jakarta.annotation</package>
+ <package>jakarta.annotation.security</package>
+ <package>jakarta.annotation.sql</package>
<package>javax.inject</package>
<package>javax.persistence</package>
<package>javax.persistence.criteria</package>
@@ -81,6 +69,12 @@
<package>javax.validation.metadata</package>
<package>javax.validation.spi</package>
<package>javax.validation.valueextraction</package>
+ <package>javax.ws.rs</package>
+ <package>javax.ws.rs.client</package>
+ <package>javax.ws.rs.container</package>
+ <package>javax.ws.rs.core</package>
+ <package>javax.ws.rs.ext</package>
+ <package>javax.ws.rs.sse</package>
<package>org.glassfish.hk2.api</package>
<package>org.glassfish.hk2.api.messaging</package>
<package>org.glassfish.hk2.extension</package>
@@ -95,10 +89,16 @@
<package>org.glassfish.hk2.utilities.reflection</package>
<package>org.glassfish.hk2.utilities.reflection.internal</package>
<package>org.glassfish.jersey</package>
+ <package>org.glassfish.jersey.client</package>
+ <package>org.glassfish.jersey.client.authentication</package>
+ <package>org.glassfish.jersey.client.filter</package>
+ <package>org.glassfish.jersey.client.http</package>
+ <package>org.glassfish.jersey.client.inject</package>
<package>org.glassfish.jersey.client.internal</package>
<package>org.glassfish.jersey.client.internal.inject</package>
<package>org.glassfish.jersey.client.internal.jdkconnector</package>
<package>org.glassfish.jersey.client.internal.routing</package>
+ <package>org.glassfish.jersey.client.spi</package>
<package>org.glassfish.jersey.inject.hk2</package>
<package>org.glassfish.jersey.internal</package>
<package>org.glassfish.jersey.internal.config</package>
@@ -111,6 +111,14 @@
<package>org.glassfish.jersey.internal.spi</package>
<package>org.glassfish.jersey.internal.util</package>
<package>org.glassfish.jersey.internal.util.collection</package>
+ <package>org.glassfish.jersey.jackson</package>
+ <package>org.glassfish.jersey.jackson.internal</package>
+
<package>org.glassfish.jersey.jackson.internal.jackson.jaxrs.annotation</package>
+
<package>org.glassfish.jersey.jackson.internal.jackson.jaxrs.base</package>
+
<package>org.glassfish.jersey.jackson.internal.jackson.jaxrs.cfg</package>
+
<package>org.glassfish.jersey.jackson.internal.jackson.jaxrs.json</package>
+
<package>org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.annotation</package>
+
<package>org.glassfish.jersey.jackson.internal.jackson.jaxrs.util</package>
<package>org.glassfish.jersey.logging</package>
<package>org.glassfish.jersey.message</package>
<package>org.glassfish.jersey.message.internal</package>
@@ -163,8 +171,16 @@
<package>org.osgi.util.tracker</package>
</public-packages>
<class-path-extension>
-
<runtime-relative-path>ext/jersey2/jakarta.annotation-api-1.3.5.jar</runtime-relative-path>
-
<binary-origin>external/jakarta.annotation-api-1.3.5.jar</binary-origin>
+
<runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
+
<binary-origin>external/javax.annotation-api-1.3.2.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/jersey2/jakarta.activation-api-1.2.1.jar</runtime-relative-path>
+
<binary-origin>external/jakarta.activation-api-1.2.1.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/jersey2/jakarta.annotation-api-2.1.1.jar</runtime-relative-path>
+
<binary-origin>external/jakarta.annotation-api-2.1.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jersey2/hk2-locator-2.6.1.jar</runtime-relative-path>
@@ -187,12 +203,20 @@
<binary-origin>external/hk2-api-2.6.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jersey2/jersey-media-moxy-2.34.jar</runtime-relative-path>
-
<binary-origin>external/jersey-media-moxy-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/jersey2/jersey-apache-connector-2.35.jar</runtime-relative-path>
+
<binary-origin>external/jersey-apache-connector-2.35.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/jersey2/jersey-media-moxy-2.35.jar</runtime-relative-path>
+
<binary-origin>external/jersey-media-moxy-2.35.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/jersey2/jersey-media-json-jackson-2.35.jar</runtime-relative-path>
+
<binary-origin>external/jersey-media-json-jackson-2.35.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jersey2/jersey-container-servlet-core-2.34.jar</runtime-relative-path>
-
<binary-origin>external/jersey-container-servlet-core-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/jersey2/jersey-container-servlet-core-2.35.jar</runtime-relative-path>
+
<binary-origin>external/jersey-container-servlet-core-2.35.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jersey2/jakarta.validation-api-2.0.2.jar</runtime-relative-path>
@@ -207,20 +231,20 @@
<binary-origin>external/hk2-utils-2.6.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jersey2/jersey-hk2-2.34.jar</runtime-relative-path>
- <binary-origin>external/jersey-hk2-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/jersey2/jersey-hk2-2.35.jar</runtime-relative-path>
+ <binary-origin>external/jersey-hk2-2.35.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jersey2/jersey-client-2.34.jar</runtime-relative-path>
- <binary-origin>external/jersey-client-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/jersey2/jersey-client-2.35.jar</runtime-relative-path>
+ <binary-origin>external/jersey-client-2.35.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jersey2/jersey-common-2.34.jar</runtime-relative-path>
- <binary-origin>external/jersey-common-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/jersey2/jersey-common-2.35.jar</runtime-relative-path>
+ <binary-origin>external/jersey-common-2.35.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/jersey2/jersey-entity-filtering-2.34.jar</runtime-relative-path>
-
<binary-origin>external/jersey-entity-filtering-2.34.jar</binary-origin>
+
<runtime-relative-path>ext/jersey2/jersey-entity-filtering-2.35.jar</runtime-relative-path>
+
<binary-origin>external/jersey-entity-filtering-2.35.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jaxrs-2.1/jakarta.ws.rs-api-2.1.6.jar</runtime-relative-path>
diff --git
a/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/Bundle.properties
b/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/Bundle.properties
index bdbd67233b..9f2333bbf3 100644
---
a/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/Bundle.properties
+++
b/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/Bundle.properties
@@ -21,5 +21,5 @@ OpenIDE-Module-Display-Category=Web Services
OpenIDE-Module-Short-Description=Installs JAR files for JAX-RS API and
reference implementation.
OpenIDE-Module-Long-Description=Installs JAR files for JAX-RS API and
reference implementation.
# library display name
-restlib=Jersey 2.34 (JAX-RS RI)
+restlib=Jersey 2.35 (JAX-RS RI)
restapi=JAX-RS 2.1.6
diff --git
a/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml
b/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml
index 125baeeaae..8ea08f4dc2 100644
--- a/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml
+++ b/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml
@@ -27,19 +27,19 @@
<localizing-bundle>org/netbeans/modules/websvc/swdp/Bundle</localizing-bundle>
<volume>
<type>classpath</type>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jakarta.annotation-api-1.3.5.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jakarta.annotation-api-2.1.1.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jakarta.persistence-api-2.2.3.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jakarta.servlet-api-4.0.4.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jakarta.validation-api-2.0.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jakarta.xml.bind-api-2.3.3.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-client-2.34.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-common-2.34.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-server-2.34.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-entity-filtering-2.34.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-hk2-2.34.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-media-moxy-2.34.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet-2.34.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet-core-2.34.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-client-2.35.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-common-2.35.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-server-2.35.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-entity-filtering-2.35.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-hk2-2.35.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-media-moxy-2.35.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet-2.35.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet-core-2.35.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/hk2-api-2.6.1.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/hk2-locator-2.6.1.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/hk2-utils-2.6.1.jar!/</resource>
@@ -59,9 +59,9 @@
<property>
<name>maven-dependencies</name>
<value>
-
org.glassfish.jersey.containers:jersey-container-servlet:2.34:jar
- org.glassfish.jersey.core:jersey-client:2.34:jar
- org.glassfish.jersey.media:jersey-media-moxy:2.34:jar
+
org.glassfish.jersey.containers:jersey-container-servlet:2.35:jar
+ org.glassfish.jersey.core:jersey-client:2.35:jar
+ org.glassfish.jersey.media:jersey-media-moxy:2.35:jar
</value>
</property>
</properties>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 05eb6cf229..7870db642f 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -35,6 +35,8 @@ webcommon/javascript2.jade/external/jflex-1.4.3.jar
webcommon/javascript2.lexer/
# javax.annotation-api is used by multiple modules.
enterprise/javaee.api/external/javax.annotation-api-1.2.jar
java/maven.indexer/external/javax.annotation-api-1.2.jar
enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar
java/maven.embedder/external/apache-maven-3.9.1-bin.zip
+enterprise/javaee8.api/external/javax.annotation-api-1.3.2.jar
enterprise/websvc.restlib/external/javax.annotation-api-1.3.2.jar
+enterprise/websvc.restlib/external/javax.annotation-api-1.3.2.jar
java/maven.embedder/external/apache-maven-3.9.1-bin.zip
# jaxb-api-osgi is used by multiple modules.
enterprise/javaee.api/external/jaxb-api-osgi-2.2.7.jar
enterprise/javaee7.api/external/jaxb-api-osgi-2.2.7.jar
@@ -63,7 +65,7 @@ extide/gradle/external/gradle-7.4-bin.zip
platform/libs.junit4/external/hamcrest
extide/gradle/external/gradle-7.4-bin.zip
platform/libs.junit4/external/junit-4.13.2.jar
extide/gradle/external/gradle-7.4-bin.zip
platform/libs.testng/external/jcommander-1.78.jar
extide/gradle/external/gradle-7.4-bin.zip
platform/o.apache.commons.io/external/commons-io-2.6.jar
-extide/gradle/external/gradle-7.4-bin.zip
enterprise/cloud.oracle/external/jsr305-3.0.2.jar
+extide/gradle/external/gradle-7.4-bin.zip
enterprise/cloud.oracle/external/httpclient-4.5.13.jar
extide/gradle/external/gradle-7.4-bin.zip
platform/o.apache.commons.codec/external/commons-codec-1.15.jar
extide/gradle/external/gradle-7.4-bin.zip
platform/libs.batik.read/external/xml-apis-1.4.01.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
