Merge branch 'ServletApi4' into 'master'

servlet-api 4 required See merge request exedio/copeconsole!87
exedio · Jun 10, 2024 · b11afe2 · b11afe2
2 parents 9b46854 + 20ce8dd
commit b11afe2
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 1 deletion.
diff --git a/exedio-cope-console-log.txt b/exedio-cope-console-log.txt
@@ -7,6 +7,7 @@ omit bug fixes.
 The items are sorted inversely, i.e. latest items are on top
 
 --------------------------------------------------------------------------
+* servlet-api 4.0.1 required.
 * tab "Media Types" checks medias in vault again.
 	Requires cope rev>=11520 , otherwise tests do fail with:
 		UnsupportedQueryException:

diff --git a/ivy/ivy.xml b/ivy/ivy.xml
@@ -33,7 +33,7 @@
 		<artifact name="exedio-cope-console" conf="changelog" type="log" ext="txt" />
 	</publications>
 	<dependencies>
-		<dependency org="javax.servlet" name="javax.servlet-api" rev="3.1.0" conf="runtime->default; ide->sources" />
+		<dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.1" conf="runtime->default; ide->sources" />
 		<dependency org="junit" name="junit" rev="4.10" conf="test->default">
 			<exclude org="org.hamcrest" />
 		</dependency>

diff --git a/lib/example/javax.servlet-api.jar b/lib/example/javax.servlet-api.jar
diff --git a/lib/ide/javax.servlet-api-source.jar b/lib/ide/javax.servlet-api-source.jar
diff --git a/lib/ide/javax.servlet-api.jar b/lib/ide/javax.servlet-api.jar
diff --git a/lib/runtime/javax.servlet-api.jar b/lib/runtime/javax.servlet-api.jar
diff --git a/lib/test/javax.servlet-api.jar b/lib/test/javax.servlet-api.jar