progress

paultuckey · Jun 9, 2023 · d6480dc · d6480dc
1 parent 0067f45
commit d6480dc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -24,15 +24,15 @@ jobs:
       run: mvn --batch-mode --update-snapshots package
 
     - name: Locally install filter
-      run: mvn install
+      run: mvn install --batch-mode
 
     - name: Locally install example
       working-directory: container-test/example-webapp
-      run: mvn install
+      run: mvn install --batch-mode
 
     - name: Run container tests
       working-directory: container-test/test-with-testcontainers
-      run: mvn test
+      run: mvn test --batch-mode
 
 #    - uses: actions/upload-artifact@v3
 #      with:

diff --git a/container-test/example-webapp/pom.xml b/container-test/example-webapp/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.tuckey</groupId>
     <artifactId>example-webapp</artifactId>
-    <packaging>war</packaging>
-    <version>5.0.0</version>
+    <packaging>jar</packaging>
+    <version>5.0.0-SNAPSHOT</version>
     <name>Example Webapp</name>
     <url>http://www.tuckey.org/urlrewrite/</url>
     <inceptionYear>2001</inceptionYear>

diff --git a/container-test/test-with-testcontainers/pom.xml b/container-test/test-with-testcontainers/pom.xml
@@ -8,7 +8,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
     </properties>
-    <version>6.0.0</version>
+    <version>5.0.0-SNAPSHOT</version>
     <name>UrlRewriteFilter Container Tests</name>
     <url>http://www.tuckey.org/urlrewrite/</url>
     <inceptionYear>2001</inceptionYear>
@@ -31,6 +31,16 @@
         </developer>
     </developers>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <!-- run `mvn install` locally root of project -->
@@ -42,7 +52,7 @@
             <!-- run `mvn install` locally in example-webapp -->
             <groupId>org.tuckey</groupId>
             <artifactId>example-webapp</artifactId>
-            <version>5.0.0</version>
+            <version>5.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -54,7 +64,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.8.1</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -88,4 +98,5 @@
 
     </dependencies>
 
+
 </project>
diff --git a/...writeviacontainer/WebappDecodeNoneIT.java → ...eviacontainer/WebappDecodeNoneITTest.java b/...writeviacontainer/WebappDecodeNoneIT.java → ...eviacontainer/WebappDecodeNoneITTest.java
@@ -17,7 +17,7 @@
 /**
  *
  */
-public class WebappDecodeNoneIT extends ContainerTestBase {
+public class WebappDecodeNoneITTest extends ContainerTestBase {
 
     protected String getApp() {
         return "webapp";

diff --git a/...writeviacontainer/WebappDecodeUtf8IT.java → ...eviacontainer/WebappDecodeUtf8ITTest.java b/...writeviacontainer/WebappDecodeUtf8IT.java → ...eviacontainer/WebappDecodeUtf8ITTest.java
@@ -30,7 +30,7 @@
  * <p/>
  * options: browser (may fail), enc (unlikely fail)
  */
-public class WebappDecodeUtf8IT extends ContainerTestBase {
+public class WebappDecodeUtf8ITTest extends ContainerTestBase {
 
     protected String getApp() {
         return "webapp";

diff --git a/.../urlrewriteviacontainer/WebappHttpIT.java → ...rewriteviacontainer/WebappHttpITTest.java b/.../urlrewriteviacontainer/WebappHttpIT.java → ...rewriteviacontainer/WebappHttpITTest.java
@@ -56,7 +56,7 @@
  * @author Paul Tuckey
  * @version $Revision: 33 $ $Date: 2006-09-12 16:41:56 +1200 (Tue, 12 Sep 2006) $
  */
-public class WebappHttpIT extends ContainerTestBase {
+public class WebappHttpITTest extends ContainerTestBase {
 
     protected String getApp() {
         return "webapp";

diff --git a/...iteviacontainer/WebappModStyleHttpIT.java → ...iacontainer/WebappModStyleHttpITTest.java b/...iteviacontainer/WebappModStyleHttpIT.java → ...iacontainer/WebappModStyleHttpITTest.java
@@ -48,7 +48,7 @@
  * @author Paul Tuckey
  * @version $Revision: 33 $ $Date: 2006-09-12 16:41:56 +1200 (Tue, 12 Sep 2006) $
  */
-public class WebappModStyleHttpIT extends ContainerTestBase {
+public class WebappModStyleHttpITTest extends ContainerTestBase {
 
     protected String getApp() {
         return "webapp/mod";