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 c7a3408 Upgrade 'web.monitor' (tomcat:servlet-api) from 6.0.13 to
6.0.53
new 9f4dc07 Merge pull request #1788 from pepness/web.monitor
c7a3408 is described below
commit c7a3408a760a50b706e3ddb698a1a888ec49f6e2
Author: Jose Contreras <pepnes...@gmail.com>
AuthorDate: Tue Dec 17 16:13:16 2019 -0600
Upgrade 'web.monitor' (tomcat:servlet-api) from 6.0.13 to 6.0.53
---
enterprise/web.monitor/external/binaries-list | 2 +-
...{servlet-api-6.0.13-license.txt => servlet-api-6.0.53-license.txt} | 4 ++--
enterprise/web.monitor/manifest.mf | 2 +-
enterprise/web.monitor/nbproject/project.properties | 4 +++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/enterprise/web.monitor/external/binaries-list
b/enterprise/web.monitor/external/binaries-list
index 9b3620e..3d358a7 100644
--- a/enterprise/web.monitor/external/binaries-list
+++ b/enterprise/web.monitor/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-D868F438F27DA38B3CCD253BCB859F06C1A1FE2C org.apache.tomcat:servlet-api:6.0.13
+90654F3E78EEA2876014468ED777CAF51F1F3B81 org.apache.tomcat:servlet-api:6.0.53
diff --git a/enterprise/web.monitor/external/servlet-api-6.0.13-license.txt
b/enterprise/web.monitor/external/servlet-api-6.0.53-license.txt
similarity index 99%
rename from enterprise/web.monitor/external/servlet-api-6.0.13-license.txt
rename to enterprise/web.monitor/external/servlet-api-6.0.53-license.txt
index 3994c42..e2a7b1f 100644
--- a/enterprise/web.monitor/external/servlet-api-6.0.13-license.txt
+++ b/enterprise/web.monitor/external/servlet-api-6.0.53-license.txt
@@ -1,8 +1,8 @@
Name: Servlet API
License: Apache-2.0
-Version: 6.0.13
+Version: 6.0.53
Description: Java API for Servlet
-Origin: http://tomcat.apache.org
+Origin: https://tomcat.apache.org/
Type: compile-time
Apache License
diff --git a/enterprise/web.monitor/manifest.mf
b/enterprise/web.monitor/manifest.mf
index 7beea78..82b6770 100644
--- a/enterprise/web.monitor/manifest.mf
+++ b/enterprise/web.monitor/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.monitor/1
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/web/monitor/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/web/monitor/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.monitor/nbproject/project.properties
b/enterprise/web.monitor/nbproject/project.properties
index 7cfdcbb..1b53ad5 100644
--- a/enterprise/web.monitor/nbproject/project.properties
+++ b/enterprise/web.monitor/nbproject/project.properties
@@ -15,5 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-server.cp.extra=${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar:${nb_all}/enterprise/web.monitor/external/servlet-api-6.0.13.jar
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
+server.cp.extra=${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar:${nb_all}/enterprise/web.monitor/external/servlet-api-6.0.53.jar
extra.module.files=modules/ext/org-netbeans-modules-web-httpmonitor.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
