commit 518435e4de0d022a8bf0ef7e55b1741261647147
author Maxim Nesen <maxim.nesen@oracle.com> Mon Nov 18 13:29:00 2024 +0100
committer Maxim Nesen <maxim.nesen@oracle.com> Tue Nov 19 11:34:13 2024 +0100
tree f7ad949da6e29056badfcad2371ce436d136c781
parent b4fb8252a352aae02a738f8f7a3bd6856acbf4c2

Clean of the 4.0 branch

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>

examples/servlet3-webapp/pom.xml

diff --git a/examples/servlet3-webapp/pom.xml b/examples/servlet3-webapp/pom.xml
index 1d34288..2e523a2 100644
--- a/examples/servlet3-webapp/pom.xml
+++ b/examples/servlet3-webapp/pom.xml
@@ -112,15 +112,6 @@
 
     <profiles>
         <profile>
-            <id>jdk8_tests</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <properties>
-                <junit5.version>${junit5.jdk8.version}</junit5.version>
-            </properties>
-        </profile>
-        <profile>
             <id>pre-release</id>
             <build>
                 <plugins>

pom.xml

diff --git a/pom.xml b/pom.xml
index 6d76606..e4fc357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1647,24 +1647,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.simpleframework</groupId>
-                <artifactId>simple-http</artifactId>
-                <version>${simple.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.simpleframework</groupId>
-                <artifactId>simple-transport</artifactId>
-                <version>${simple.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.simpleframework</groupId>
-                <artifactId>simple-common</artifactId>
-                <version>${simple.version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
                 <version>${jettison.version}</version>
@@ -2192,7 +2174,6 @@
         <servlet4.version>4.0.4</servlet4.version>
         <servlet6.version>6.1.0</servlet6.version>
 
-        <simple.version>6.0.1</simple.version>
         <slf4j.version>2.0.13</slf4j.version>
         <spring6.version>6.0.23</spring6.version>
         <testng.version>7.10.2</testng.version>
@@ -2260,4 +2241,4 @@
         <javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->
         <mimepull.version>1.9.15</mimepull.version>
     </properties>
-</project>
\ No newline at end of file
+</project>