Skip to content

Commit d5a2acd

Browse files
authored
Merge pull request #9689 from mbien/tomcat11026
Update embedded tomcat from 11.0.25 to 11.0.26
2 parents 62cce3b + 94cd2e7 commit d5a2acd

7 files changed

Lines changed: 8 additions & 8 deletions

‎ide/httpserver/external/binaries-list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
6FF6CAC3EE4DAF6B7C76ADBEED0F2F7A37F7CB9B org.apache.tomcat:tomcat-annotations-api:11.0.25
19-
D4F3C448998C6CF8267FB5077B7EEEB0980CD37D org.apache.tomcat.embed:tomcat-embed-core:11.0.25
18+
CE8DA13A495827629D9E8A7C1B11A45F4E8826EC org.apache.tomcat:tomcat-annotations-api:11.0.26
19+
69A9D83A248BEAD83141F0E4215B896EF6639C12 org.apache.tomcat.embed:tomcat-embed-core:11.0.26

ide/httpserver/external/tomcat-annotations-api-11.0.25-license.txt renamed to ide/httpserver/external/tomcat-annotations-api-11.0.26-license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: Apache Tomcat (Annotations Package)
2-
Version: 11.0.25
2+
Version: 11.0.26
33
License: Apache-2.0
44
Description: Annotations used in Apache Tomcat
55
Origin: http://tomcat.apache.org

ide/httpserver/external/tomcat-annotations-api-11.0.25-notice.txt renamed to ide/httpserver/external/tomcat-annotations-api-11.0.26-notice.txt

File renamed without changes.

ide/httpserver/external/tomcat-embed-core-11.0.25-license.txt renamed to ide/httpserver/external/tomcat-embed-core-11.0.26-license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: Apache Tomcat (embedded)
2-
Version: 11.0.25
2+
Version: 11.0.26
33
License: Apache-2.0-tomcat
44
Description: Apache Tomcat (embedded) is a library version of the Apache Tomcat servlet container, which can be used to create embedded servlet containers in other applications.
55
Origin: http://tomcat.apache.org

ide/httpserver/external/tomcat-embed-core-11.0.25-notice.txt renamed to ide/httpserver/external/tomcat-embed-core-11.0.26-notice.txt

File renamed without changes.

‎ide/httpserver/nbproject/project.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
javac.compilerargs=-Xlint
1919
javac.release=17
2020
spec.version.base=2.70.0
21-
release.external/tomcat-embed-core-11.0.25.jar=modules/ext/webserver.jar
22-
release.external/tomcat-annotations-api-11.0.25.jar=modules/ext/webserver-annotations.jar
21+
release.external/tomcat-embed-core-11.0.26.jar=modules/ext/webserver.jar
22+
release.external/tomcat-annotations-api-11.0.26.jar=modules/ext/webserver-annotations.jar
2323
test-unit-sys-prop.xtest.data=${nb_all}/ide/httpserver/test/unit/testfs
2424
test.unit.data.dir=${nb_all}/ide/httpserver/test/unit/testfs
2525

‎ide/httpserver/nbproject/project.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@
163163
<public-packages/>
164164
<class-path-extension>
165165
<runtime-relative-path>ext/webserver.jar</runtime-relative-path>
166-
<binary-origin>external/tomcat-embed-core-11.0.25.jar</binary-origin>
166+
<binary-origin>external/tomcat-embed-core-11.0.26.jar</binary-origin>
167167
</class-path-extension>
168168
<class-path-extension>
169169
<runtime-relative-path>ext/webserver-annotations.jar</runtime-relative-path>
170-
<binary-origin>external/tomcat-annotations-api-11.0.25.jar</binary-origin>
170+
<binary-origin>external/tomcat-annotations-api-11.0.26.jar</binary-origin>
171171
</class-path-extension>
172172
</data>
173173
</configuration>

0 commit comments

Comments
 (0)