upgrade zats 4.0.0, jetty 11, zk 9.6.0-jakarta, remove obsolete modules

zkoss · Aug 10, 2021 · 6ec3127 · 6ec3127
1 parent faece00
commit 6ec3127
Show file tree

Hide file tree

Showing 93 changed files with 260 additions and 4,168 deletions.
diff --git a/prepare-upload.sh b/prepare-upload.sh
@@ -17,6 +17,3 @@ cp zats/target/zats-mimic-$VERSION.zip $BIN_FOLDER
 
 cp zats-common/target/zats-common-$VERSION-bundle.jar $MVN_FOLDER
 cp zats-mimic/target/zats-mimic-$VERSION-bundle.jar $MVN_FOLDER
-cp zats-mimic-ext6/target/zats-mimic-ext6-$VERSION-bundle.jar $MVN_FOLDER
-cp zats-mimic-ext7/target/zats-mimic-ext7-$VERSION-bundle.jar $MVN_FOLDER
-cp zats-mimic-ext96/target/zats-mimic-ext96-$VERSION-bundle.jar $MVN_FOLDER
diff --git a/upVer b/upVer
@@ -35,15 +35,9 @@ if [ "$Zats" = "" ] ; then
 	if [ ! -d "./zats-mimic" ] ; then
 		echo "zats-mimic path is not found!!"
 	fi
-	if [ ! -d "./zats-mimic-ext6" ] ; then
-		echo "zats-mimic-ext6 path is not found!!"
-	fi
 	if [ ! -d "./zats-mimic-ext7" ] ; then
 		echo "zats-mimic-ext7 path is not found!!"
 	fi
-	if [ ! -d "./zats-mimic-ext96" ] ; then
-		echo "zats-mimic-ext96 path is not found!!"
-	fi
 	Zats=$maindir
 fi
 
@@ -102,7 +96,4 @@ upVer zats
 upVer zats-common
 upVer zats-example
 upVer zats-mimic
-upVer zats-mimic-ext6
 upVer zats-mimic-ext7
-upVer zats-mimic-ext96
-upVer zats-example
diff --git a/version b/version
@@ -1 +1 @@
-3.0.0
+4.0.0
diff --git a/zats-common/pom.xml b/zats-common/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.zkoss.zats</groupId>
 	<artifactId>zats-common</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>ZK Application Test Suite - Common</name>
 	<description>ZK Application Test Suite - Common</description>
 	<url>https://www.zkoss.org/zats</url>
@@ -44,6 +44,16 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+	<repositories>
+		<repository>
+			<id>ZK CE</id>
+			<url>https://mavensync.zkoss.org/maven2</url>
+		</repository>
+		<repository>
+			<id>ZK EE Eval</id>
+			<url>https://mavensync.zkoss.org/eval/</url>
+		</repository>
+	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -54,7 +64,7 @@
 		<dependency>
 			<groupId>org.zkoss.zk</groupId>
 			<artifactId>zul</artifactId>
-			<version>6.0.0</version>
+			<version>9.6.0-jakarta-Eval</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -106,4 +116,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
diff --git a/zats-example/pom.xml b/zats-example/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.zkoss.zats</groupId>
 	<artifactId>zats-example</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>ZK Application Test Suite - Example</name>
 	<url>https://www.zkoss.org/zats</url>
 	<licenses>
@@ -45,7 +45,7 @@
 		<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
 		<maven.compiler.source>1.6</maven.compiler.source>
 		<maven.compiler.target>1.6</maven.compiler.target>
-		<zk.version>8.5.0</zk.version>
+		<zk.version>9.6.0-jakarta-Eval</zk.version>
 	</properties>
 	<repositories>
 		<repository>
@@ -63,9 +63,14 @@
 			<artifactId>zhtml</artifactId>
 			<version>${zk.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.zkoss.zk</groupId>
+			<artifactId>zkex</artifactId>
+			<version>${zk.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.zkoss.zats</groupId>
-			<artifactId>zats-mimic-ext7</artifactId>
+			<artifactId>zats-mimic</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -82,11 +87,17 @@
 			<!--<scope>test</scope>-->
 		<!--</dependency>-->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>5.0.0</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.31</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<description>Examples code for ZATS Essentials and other examples.</description>
 </project>
diff --git a/zats-example/src/main/java/org/zkoss/zats/essentials/CookieComposer.java b/zats-example/src/main/java/org/zkoss/zats/essentials/CookieComposer.java
@@ -11,8 +11,8 @@
 */
 package org.zkoss.zats.essentials;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;

diff --git a/zats-example/src/main/webapp/WEB-INF/web.xml b/zats-example/src/main/webapp/WEB-INF/web.xml
@@ -137,7 +137,6 @@ Copyright (C) 2004 Potix Corporation. All Rights Reserved.
 	<!-- DSP (optional) -->
 	<!-- Uncomment it if you want to use DSP
 	However, it is turned on since zksandbox uses DSP to generate CSS.
-	-->
 	<servlet>
 		<servlet-name>dspLoader</servlet-name>
 		<servlet-class>org.zkoss.web.servlet.dsp.InterpreterServlet</servlet-class>
@@ -150,6 +149,7 @@ Copyright (C) 2004 Potix Corporation. All Rights Reserved.
 		<servlet-name>dspLoader</servlet-name>
 		<url-pattern>*.dsp</url-pattern>
 	</servlet-mapping>
+	-->
 
 	<!-- /////////// -->
 	<!-- Miscellaneous -->

diff --git a/zats-example/src/test/java/org/zkoss/zats/example/testcase/EnvironmentTest.java b/zats-example/src/test/java/org/zkoss/zats/example/testcase/EnvironmentTest.java
@@ -3,7 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.junit.*;
 import org.zkoss.zats.junit.AutoClient;

diff --git a/zats-example/src/test/java/org/zkoss/zats/example/testcase/EnvironmentTest2.java b/zats-example/src/test/java/org/zkoss/zats/example/testcase/EnvironmentTest2.java
@@ -3,7 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.junit.*;
 import org.zkoss.zats.junit.AutoClient;

diff --git a/zats-example/src/test/java/org/zkoss/zats/example/testcase/LoginLogoutTest.java b/zats-example/src/test/java/org/zkoss/zats/example/testcase/LoginLogoutTest.java
@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.junit.*;
 import org.zkoss.zats.example.testcase.util.LoginOperation;

diff --git a/zats-example/src/test/java/org/zkoss/zats/example/testcase/util/LoginOperation.java b/zats-example/src/test/java/org/zkoss/zats/example/testcase/util/LoginOperation.java
@@ -1,7 +1,7 @@
 package org.zkoss.zats.example.testcase.util;
 
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.zkoss.zats.mimic.ComponentAgent;
 import org.zkoss.zats.mimic.Zats;

diff --git a/zats-mimic-ext6/README.txt b/zats-mimic-ext6/README.txt
@@ -0,0 +1 @@
+obsolete since ZATS 4.0.0
diff --git a/zats-mimic-ext6/pom.xml b/zats-mimic-ext6/pom.xml