You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2019/12/26 21:05:29 UTC
[netbeans] branch master updated: Upgrade jersey-core from 1.5 to
1.18.6
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 94cc467 Upgrade jersey-core from 1.5 to 1.18.6
new a4bfd00 Merge pull request #1807 from pepness/jersey-1.18
94cc467 is described below
commit 94cc46722fec2c780ac3cb40c8b85516faa94f67
Author: Jose Contreras <pe...@gmail.com>
AuthorDate: Mon Dec 23 18:18:43 2019 -0600
Upgrade jersey-core from 1.5 to 1.18.6
---
enterprise/websvc.rest/external/binaries-list | 2 +-
.../{jersey-core-1.5-license.txt => jersey-core-1.18.6-license.txt} | 4 ++--
enterprise/websvc.rest/manifest.mf | 2 +-
enterprise/websvc.rest/nbproject/project.properties | 5 +++--
enterprise/websvc.rest/nbproject/project.xml | 4 ++--
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/enterprise/websvc.rest/external/binaries-list b/enterprise/websvc.rest/external/binaries-list
index ca7d515..06e1dee 100644
--- a/enterprise/websvc.rest/external/binaries-list
+++ b/enterprise/websvc.rest/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-955FA871051ACD23841FF75087B190278228920A com.sun.jersey:jersey-core:1.5
+7AE45787634401A7E71DB35D45F742C0E7BA03B9 com.sun.jersey:jersey-core:1.18.6
diff --git a/enterprise/websvc.rest/external/jersey-core-1.5-license.txt b/enterprise/websvc.rest/external/jersey-core-1.18.6-license.txt
similarity index 99%
rename from enterprise/websvc.rest/external/jersey-core-1.5-license.txt
rename to enterprise/websvc.rest/external/jersey-core-1.18.6-license.txt
index 2c19210..48d513e 100644
--- a/enterprise/websvc.rest/external/jersey-core-1.5-license.txt
+++ b/enterprise/websvc.rest/external/jersey-core-1.18.6-license.txt
@@ -1,9 +1,9 @@
Name: Jersey-core
-Version: 1.5
+Version: 1.18.6
Description: Jersey-core
License: CDDL-1.1
Origin: Oracle
-Files: jersey-core-1.5.jar
+Files: jersey-core-1.18.6.jar
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
diff --git a/enterprise/websvc.rest/manifest.mf b/enterprise/websvc.rest/manifest.mf
index 990232c..fe1ecc8 100644
--- a/enterprise/websvc.rest/manifest.mf
+++ b/enterprise/websvc.rest/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.rest/0
OpenIDE-Module-Layer: org/netbeans/modules/websvc/rest/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/rest/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.36
+OpenIDE-Module-Specification-Version: 1.37
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.rest/nbproject/project.properties b/enterprise/websvc.rest/nbproject/project.properties
index 16a4f67..d464ad2 100644
--- a/enterprise/websvc.rest/nbproject/project.properties
+++ b/enterprise/websvc.rest/nbproject/project.properties
@@ -18,10 +18,11 @@
#
is.autoload=true
-release.external/jersey-core-1.5.jar=modules/ext/jersey2/jersey-core-1.5.jar
+release.external/jersey-core-1.18.6.jar=modules/ext/jersey2/jersey-core-1.18.6.jar
is.eager=true
-javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
requires.nb.javac=true
test-unit-sys-prop.java.awt.headless=true
diff --git a/enterprise/websvc.rest/nbproject/project.xml b/enterprise/websvc.rest/nbproject/project.xml
index b80cd72..3c48ba9 100644
--- a/enterprise/websvc.rest/nbproject/project.xml
+++ b/enterprise/websvc.rest/nbproject/project.xml
@@ -644,8 +644,8 @@
<package>org.netbeans.modules.websvc.rest.client</package>
</friend-packages>
<class-path-extension>
- <runtime-relative-path>ext/jersey2/jersey-core-1.5.jar</runtime-relative-path>
- <binary-origin>external/jersey-core-1.5.jar</binary-origin>
+ <runtime-relative-path>ext/jersey2/jersey-core-1.18.6.jar</runtime-relative-path>
+ <binary-origin>external/jersey-core-1.18.6.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists