tomcat

Author: edewata

.github/workflows/server-basic-test.yml

@@ -107,8 +107,8 @@ jobs:
           lrwxrwxrwx root root httpclient.jar -> httpclient-x.y.z.jar
           -rw-r--r-- root root httpcore-x.y.z.jar
           lrwxrwxrwx root root httpcore.jar -> httpcore-x.y.z.jar
-          -rw-r--r-- root root jackson-annotations-x.y.z.jar
-          lrwxrwxrwx root root jackson-annotations.jar -> jackson-annotations-x.y.z.jar
+          -rw-r--r-- root root jackson-annotations-x.y.jar
+          lrwxrwxrwx root root jackson-annotations.jar -> jackson-annotations-x.y.jar
           -rw-r--r-- root root jackson-core-x.y.z.jar
           lrwxrwxrwx root root jackson-core.jar -> jackson-core-x.y.z.jar
           -rw-r--r-- root root jackson-databind-x.y.z.jar
@@ -147,9 +147,10 @@ jobs:
           EOF
 
           # normalize actual result:
-          # - replace version number with x.y.z
+          # - replace version number with x.y or x.y.z
           # - replace servlet.jar with tomcat-servlet-api.jar
-          sed -e 's/-[0-9]*\.[0-9]*\.[0-9]*\.jar$/-x.y.z.jar/' \
+          sed -e 's/-[0-9]*\.[0-9]*\.jar$/-x.y.jar/' \
+              -e 's/-[0-9]*\.[0-9]*\.[0-9]*\.jar$/-x.y.z.jar/' \
               -e 's/-[0-9]*\.[0-9]*\.[0-9]*\.Final\.jar$/-x.y.z.Final.jar/' \
               -e 's/\/servlet.jar$/\/tomcat-servlet-api.jar/' \
               output > actual
@@ -709,8 +710,6 @@ jobs:
 
           cat > expected_new << EOF
           drwxr-x--- tomcat tomcat backup
-          -rw-r--r-- tomcat tomcat catalina.$DATE.log
-          -rw-r----- tomcat tomcat localhost_access_log.$DATE.txt
           EOF
 
           diff expected_$TOMCAT_FLAVOR output
@@ -849,8 +848,6 @@ jobs:
 
           cat > expected_new << EOF
           drwxr-x--- tomcat tomcat backup
-          -rw-r--r-- tomcat tomcat catalina.$DATE.log
-          -rw-r----- tomcat tomcat localhost_access_log.$DATE.txt
           EOF
 
           diff expected_$TOMCAT_FLAVOR output