Skip to content

Commit 4dddce0

Browse files
duncdrumduncdrum
authored
Merge pull request #2322 from dizzzz/feature/4xx_upgrade_jetty_v9.4.14
4xx: Upgrade to jetty v9.4.14
2 parents f2eb079 + 950889c commit 4dddce0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+52
-52
lines changed

‎.classpath‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
asm-commons-6.2<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="extensions/fluent/src"/>
44
<classpathentry kind="src" path="extensions/fluent/test/src"/>
@@ -81,24 +81,24 @@
8181
<classpathentry kind="lib" path="lib/optional/xqjapi-1.0-fr.jar"/>
8282
<classpathentry kind="lib" path="lib/core/bcprov-jdk15on-1.60.jar"/>
8383
<classpathentry kind="lib" path="tools/jetty/lib/existdb-favicon.jar"/>
84-
<classpathentry kind="lib" path="tools/jetty/lib/asm-6.0.jar"/>
85-
<classpathentry kind="lib" path="tools/jetty/lib/asm-commons-6.0.jar"/>
84+
<classpathentry kind="lib" path="tools/jetty/lib/asm-7.0.jar"/>
85+
<classpathentry kind="lib" path="tools/jetty/lib/asm-commons-7.0.jar"/>
8686
<classpathentry kind="lib" path="tools/jetty/lib/javax.annotation-api-1.2.jar"/>
87-
<classpathentry kind="lib" path="tools/jetty/lib/javax.transaction-api-1.2.jar"/>
88-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-annotations-9.4.10.v20180503.jar"/>
89-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-deploy-9.4.10.v20180503.jar"/>
90-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-http-9.4.10.v20180503.jar"/>
91-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-io-9.4.10.v20180503.jar"/>
92-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-jaas-9.4.10.v20180503.jar"/>
93-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-jndi-9.4.10.v20180503.jar"/>
94-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-jmx-9.4.10.v20180503.jar"/>
95-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-plus-9.4.10.v20180503.jar"/>
96-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-security-9.4.10.v20180503.jar"/>
97-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-server-9.4.10.v20180503.jar"/>
98-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-servlet-9.4.10.v20180503.jar"/>
99-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-util-9.4.10.v20180503.jar"/>
100-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-webapp-9.4.10.v20180503.jar"/>
101-
<classpathentry kind="lib" path="tools/jetty/lib/jetty-xml-9.4.10.v20180503.jar"/>
87+
<classpathentry kind="lib" path="tools/jetty/lib/javax.transaction-api-1.3.jar"/>
88+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-annotations-9.4.14.v20181114.jar"/>
89+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-deploy-9.4.14.v20181114.jar"/>
90+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-http-9.4.14.v20181114.jar"/>
91+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-io-9.4.14.v20181114.jar"/>
92+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-jaas-9.4.14.v20181114.jar"/>
93+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-jndi-9.4.14.v20181114.jar"/>
94+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-jmx-9.4.14.v20181114.jar"/>
95+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-plus-9.4.14.v20181114.jar"/>
96+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-security-9.4.14.v20181114.jar"/>
97+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-server-9.4.14.v20181114.jar"/>
98+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-servlet-9.4.14.v20181114.jar"/>
99+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-util-9.4.14.v20181114.jar"/>
100+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-webapp-9.4.14.v20181114.jar"/>
101+
<classpathentry kind="lib" path="tools/jetty/lib/jetty-xml-9.4.14.v20181114.jar"/>
102102
<classpathentry kind="lib" path="lib/optional/servlet-api-3.1.jar"/>
103103
<classpathentry kind="lib" path="extensions/webdav/lib/milton-api-1.8.1.3.jar"/>
104104
<classpathentry kind="lib" path="extensions/webdav/lib/milton-client-1.8.1.3.jar"/>

‎nbproject/project.properties‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ file.reference.jaxb-api-2.3.0.jar=lib/optional/jaxb-api-2.3.0.jar
2020
file.reference.jctools-core-2.1.2.jar=lib/core/jctools-core-2.1.2.jar
2121
file.reference.jsr305-3.0.2.jar=lib/core/jsr305-3.0.2.jar
2222
file.reference.jargo-0.4.14.jar=lib/core/jargo-0.4.14.jar
23-
file.reference.javax.transaction-api-1.2.jar=tools/jetty/lib/javax.transaction-api-1.2.jar
23+
file.reference.javax.transaction-api-1.3.jar=tools/jetty/lib/javax.transaction-api-1.3.jar
2424
file.reference.jcip-annotations-1.0.jar=lib/core/jcip-annotations-1.0.jar
2525
file.reference.cglib-nodep-3.2.6.jar=lib/core/cglib-nodep-3.2.6.jar
2626
file.reference.easymock-3.6.jar=lib/test/easymock-3.6.jar
2727
file.reference.bcprov-jdk15on-1.60.jar=lib/core/bcprov-jdk15on-1.60.jar
28-
file.reference.jetty-jndi-9.4.10.v20180503.jar=tools/jetty/lib/jetty-jndi-9.4.10.v20180503.jar
28+
file.reference.jetty-jndi-9.4.14.v20181114.jar=tools/jetty/lib/jetty-jndi-9.4.14.v20181114.jar
2929
file.reference.jna-4.5.0.jar=tools/yajsw/lib/core/jna/jna-4.5.0.jar
3030
file.reference.jna-platform-4.5.0.jar=tools/yajsw/lib/core/jna/jna-platform-4.5.0.jar
3131
file.reference.lucene-analyzers-common-4.10.4.jar=extensions/indexes/lucene/lib/lucene-analyzers-common-4.10.4.jar
@@ -83,7 +83,7 @@ manifest.custom.codebase=
8383
test.src3.dir=extensions/indexes/range/test/src
8484
file.reference.milton-servlet-1.8.1.3.jar=extensions/webdav/lib/milton-servlet-1.8.1.3.jar
8585
application.vendor=The eXist-db project
86-
file.reference.jetty-http-9.4.10.v20180503.jar=tools/jetty/lib/jetty-http-9.4.10.v20180503.jar
86+
file.reference.jetty-http-9.4.14.v20181114.jar=tools/jetty/lib/jetty-http-9.4.14.v20181114.jar
8787
src.src14.dir=extensions/exiftool/src
8888
file.reference.httpclient-4.5.5.jar=lib/optional/httpclient-4.5.5.jar
8989
file.reference.servlet-api-3.1.jar=lib/optional/servlet-api-3.1.jar
@@ -98,26 +98,26 @@ file.reference.test-src-1=extensions/fluent/test/src
9898
jmx.config.file=
9999
file.reference.ant-1.10.2.jar=tools/ant/lib/ant-1.10.2.jar
100100
build.test.results.dir=${build.dir}/test/results
101-
file.reference.jetty-security-9.4.10.v20180503.jar=tools/jetty/lib/jetty-security-9.4.10.v20180503.jar
101+
file.reference.jetty-security-9.4.14.v20181114.jar=tools/jetty/lib/jetty-security-9.4.14.v20181114.jar
102102
file.reference.exquery-annotations-common-1.0-SNAPSHOT.jar=extensions/exquery/lib/exquery-annotations-common-1.0-SNAPSHOT.jar
103103
javac.compilerargs=
104104
file.reference.exquery-serialization-annotations-api-1.0-SNAPSHOT.jar=extensions/exquery/lib/exquery-serialization-annotations-api-1.0-SNAPSHOT.jar
105105
src.src10.dir=extensions/security/activedirectory/src
106106
file.reference.exquery-restxq-api-1.0-SNAPSHOT.jar=extensions/exquery/restxq/lib/exquery-restxq-api-1.0-SNAPSHOT.jar
107107
jar.compress=false
108108
file.reference.httpclient-cache-4.5.5.jar=lib/optional/httpclient-cache-4.5.5.jar
109-
file.reference.jetty-util-9.4.10.v20180503.jar=tools/jetty/lib/jetty-util-9.4.10.v20180503.jar
109+
file.reference.jetty-util-9.4.14.v20181114.jar=tools/jetty/lib/jetty-util-9.4.14.v20181114.jar
110110
src.src17.dir=extensions/exquery/restxq/src/main/java
111111
file.reference.saaj-1.2.jar=lib/optional/saaj-1.2.jar
112112
jnlp.codebase.url=file\:/Users/wessels/Development/existdb/1.5/trunk/nbproject/dist/
113113
javadoc.private=false
114114
annotation.processing.processors.list=
115115
build.test.classes.dir=${build.dir}/test/classes
116-
file.reference.jetty-xml-9.4.10.v20180503.jar=tools/jetty/lib/jetty-xml-9.4.10.v20180503.jar
116+
file.reference.jetty-xml-9.4.14.v20181114.jar=tools/jetty/lib/jetty-xml-9.4.14.v20181114.jar
117117
src.src4.dir=extensions/indexes/lucene/src
118118
platform.active=default_platform
119119
src.src.dir=extensions/modules/src
120-
file.reference.jetty-server-9.4.10.v20180503.jar=tools/jetty/lib/jetty-server-9.4.10.v20180503.jar
120+
file.reference.jetty-server-9.4.14.v20181114.jar=tools/jetty/lib/jetty-server-9.4.14.v20181114.jar
121121
endorsed.classpath=
122122
file.reference.milton-client-1.8.1.3.jar=extensions/webdav/lib/milton-client-1.8.1.3.jar
123123
javadoc.encoding=${source.encoding}
@@ -127,21 +127,21 @@ dist.jar=${dist.dir}/eXist-db-full.jar
127127
jmx.jconsole.use.classpath=true
128128
meta.inf.dir=${src.dir}/META-INF
129129
javadoc.nonavbar=false
130-
file.reference.jetty-plus-9.4.10.v20180503.jar=tools/jetty/lib/jetty-plus-9.4.10.v20180503.jar
130+
file.reference.jetty-plus-9.4.14.v20181114.jar=tools/jetty/lib/jetty-plus-9.4.14.v20181114.jar
131131
src.src13.dir=extensions/debuggee/src
132132
build.generated.dir=${build.dir}/generated
133-
file.reference.asm-6.0.jar=tools/jetty/lib/asm-6.0.jar
134-
file.reference.asm-commons-6.0.jar=tools/jetty/lib/asm-commons-6.0.jar
133+
file.reference.asm-7.0.jar=tools/jetty/lib/asm-7.0.jar
134+
file.reference.asm-commons-7.0.jar=tools/jetty/lib/asm-commons-7.0.jar
135135
file.reference.hamcrest-library-1.3.jar=extensions/fluent/lib/hamcrest-library-1.3.jar
136-
file.reference.jetty-webapp-9.4.10.v20180503.jar=tools/jetty/lib/jetty-webapp-9.4.10.v20180503.jar
136+
file.reference.jetty-webapp-9.4.14.v20181114.jar=tools/jetty/lib/jetty-webapp-9.4.14.v20181114.jar
137137
run.test.classpath=\
138138
${javac.test.classpath}:\
139139
${build.test.classes.dir}:\
140140
${file.reference.httpcore-4.4.8.jar}:\
141141
${file.reference.httpclient-4.5.5.jar}
142142
file.reference.log4j-api-2.11.0.jar=lib/core/log4j-api-2.11.0.jar
143143
file.reference.mail-1.4.7.jar=lib/user/mail-1.4.7.jar
144-
file.reference.jetty-servlet-9.4.10.v20180503.jar=tools/jetty/lib/jetty-servlet-9.4.10.v20180503.jar
144+
file.reference.jetty-servlet-9.4.14.v20181114.jar=tools/jetty/lib/jetty-servlet-9.4.14.v20181114.jar
145145
jmx.rmi.port=1099
146146
jmx.rmi.enabled=false
147147
file.reference.exquery-common-1.0-SNAPSHOT.jar=extensions/exquery/lib/exquery-common-1.0-SNAPSHOT.jar
@@ -174,8 +174,8 @@ build.dir=nbproject/build
174174
file.reference.aspectjtools-1.9.2.jar=tools/aspectj/lib/aspectjtools-1.9.2.jar
175175
application.title=eXist-db
176176
jmx.rmi.use.port=true
177-
file.reference.jetty-io-9.4.10.v20180503.jar=tools/jetty/lib/jetty-io-9.4.10.v20180503.jar
178-
file.reference.jetty-jaas-9.4.10.v20180503.jar=tools/jetty/lib/jetty-jaas-9.4.10.v20180503.jar
177+
file.reference.jetty-io-9.4.14.v20181114.jar=tools/jetty/lib/jetty-io-9.4.14.v20181114.jar
178+
file.reference.jetty-jaas-9.4.14.v20181114.jar=tools/jetty/lib/jetty-jaas-9.4.14.v20181114.jar
179179
file.reference.mina-core-2.0.5.jar=extensions/debuggee/lib/mina-core-2.0.5.jar
180180
src.src16.dir=extensions/contentextraction/src
181181
file.reference.eXist-trunk-src=src
@@ -205,7 +205,7 @@ file.reference.aspectjrt-1.9.2.jar=tools/aspectj/lib/aspectjrt-1.9.2.jar
205205
excludes=**/spatial/*,**/modules/svn/*,**/modules/xmpp/**, **/xmlcalabash/**, **/xslfo/**,**/cssparser/**,**/oracle/**,**/memcached/**,**/cqlparser/**,**/contentextraction/**
206206
jnlp.descriptor=application
207207
file.reference.exquery-annotations-common-api-1.0-SNAPSHOT.jar=extensions/exquery/lib/exquery-annotations-common-api-1.0-SNAPSHOT.jar
208-
file.reference.jetty-jmx-9.4.10.v20180503.jar=tools/jetty/lib/jetty-jmx-9.4.10.v20180503.jar
208+
file.reference.jetty-jmx-9.4.14.v20181114.jar=tools/jetty/lib/jetty-jmx-9.4.14.v20181114.jar
209209
test.java.dir=extensions/exquery/restxq/src/test/java
210210
file.reference.test-src=test/src
211211
file.reference.clj-ds-0.0.4.jar=lib/core/clj-ds-0.0.4.jar
@@ -244,9 +244,9 @@ file.reference.xml-apis-1.4.01.jar=lib/endorsed/xml-apis-1.4.01.jar
244244
file.reference.jline-0.9.94.jar=lib/core/jline-0.9.94.jar
245245
src.src15.dir=extensions/expath/src
246246
file.reference.log4j-core-2.11.0.jar=lib/core/log4j-core-2.11.0.jar
247-
file.reference.jetty-annotations-9.4.10.v20180503.jar=tools/jetty/lib/jetty-annotations-9.4.10.v20180503.jar
247+
file.reference.jetty-annotations-9.4.14.v20181114.jar=tools/jetty/lib/jetty-annotations-9.4.14.v20181114.jar
248248
javadoc.notree=false
249-
file.reference.jetty-deploy-9.4.10.v20180503.jar=tools/jetty/lib/jetty-deploy-9.4.10.v20180503.jar
249+
file.reference.jetty-deploy-9.4.14.v20181114.jar=tools/jetty/lib/jetty-deploy-9.4.14.v20181114.jar
250250
application.homepage=http\://www.exist-db.org
251251
file.reference.jmock-2.4.0.jar=extensions/fluent/lib/jmock-2.4.0.jar
252252
file.reference.junit-4.12.jar=lib/test/junit-4.12.jar
@@ -337,23 +337,23 @@ javac.classpath=\
337337
${file.reference.aspectjweaver-1.9.2.jar}:\
338338
${file.reference.existdb-favicon.jar}:\
339339
${file.reference.javax.annotation-api-1.2.jar}:\
340-
${file.reference.jetty-annotations-9.4.10.v20180503.jar}:\
341-
${file.reference.jetty-deploy-9.4.10.v20180503.jar}:\
342-
${file.reference.jetty-http-9.4.10.v20180503.jar}:\
343-
${file.reference.jetty-io-9.4.10.v20180503.jar}:\
344-
${file.reference.jetty-jaas-9.4.10.v20180503.jar}:\
345-
${file.reference.jetty-jmx-9.4.10.v20180503.jar}:\
346-
${file.reference.jetty-plus-9.4.10.v20180503.jar}:\
347-
${file.reference.javax.transaction-api-1.2.jar}:\
348-
${file.reference.jetty-jndi-9.4.10.v20180503.jar}:\
349-
${file.reference.jetty-security-9.4.10.v20180503.jar}:\
350-
${file.reference.jetty-server-9.4.10.v20180503.jar}:\
351-
${file.reference.jetty-servlet-9.4.10.v20180503.jar}:\
352-
${file.reference.jetty-util-9.4.10.v20180503.jar}:\
353-
${file.reference.jetty-webapp-9.4.10.v20180503.jar}:\
354-
${file.reference.jetty-xml-9.4.10.v20180503.jar}:\
355-
${file.reference.asm-6.0.jar}:\
356-
${file.reference.asm-commons-6.0.jar}:\
340+
${file.reference.jetty-annotations-9.4.14.v20181114.jar}:\
341+
${file.reference.jetty-deploy-9.4.14.v20181114.jar}:\
342+
${file.reference.jetty-http-9.4.14.v20181114.jar}:\
343+
${file.reference.jetty-io-9.4.14.v20181114.jar}:\
344+
${file.reference.jetty-jaas-9.4.14.v20181114.jar}:\
345+
${file.reference.jetty-jmx-9.4.14.v20181114.jar}:\
346+
${file.reference.jetty-plus-9.4.14.v20181114.jar}:\
347+
${file.reference.javax.transaction-api-1.3.jar}:\
348+
${file.reference.jetty-jndi-9.4.14.v20181114.jar}:\
349+
${file.reference.jetty-security-9.4.14.v20181114.jar}:\
350+
${file.reference.jetty-server-9.4.14.v20181114.jar}:\
351+
${file.reference.jetty-servlet-9.4.14.v20181114.jar}:\
352+
${file.reference.jetty-util-9.4.14.v20181114.jar}:\
353+
${file.reference.jetty-webapp-9.4.14.v20181114.jar}:\
354+
${file.reference.jetty-xml-9.4.14.v20181114.jar}:\
355+
${file.reference.asm-7.0.jar}:\
356+
${file.reference.asm-commons-7.0.jar}:\
357357
${file.reference.hamcrest-library-1.3.jar}:\
358358
${file.reference.jmock-2.4.0.jar}:\
359359
${file.reference.jmock-junit4-2.4.0.jar}:\

‎tools/jetty/lib/asm-6.0.jar‎

-93 KB
Binary file not shown.

‎tools/jetty/lib/asm-7.0.jar‎

111 KB
Binary file not shown.

‎tools/jetty/lib/asm-commons-6.0.jar‎

-75.6 KB
Binary file not shown.

‎tools/jetty/lib/asm-commons-7.0.jar‎

78 KB
Binary file not shown.

‎tools/jetty/lib/javax.transaction-api-1.2.jar‎

-30 KB
Binary file not shown.

‎tools/jetty/lib/javax.transaction-api-1.3.jar‎

27.4 KB
Binary file not shown.

‎tools/jetty/lib/jetty-annotations-9.4.10.v20180503.jar‎

-76.7 KB
Binary file not shown.

‎tools/jetty/lib/jetty-annotations-9.4.14.v20181114.jar‎

85.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)