fix NPE and setup mvn build with correct version using mvnw

Signed-off-by: Olivier Lamy <olamy@apache.org>
jakartaee · Oct 19, 2023 · a3eeed6 · a3eeed6
1 parent 026941c
commit a3eeed6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -13,5 +13,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
+    - name: Set up Maven
+      run:
+        mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper "-Dmaven=3.9.4"
     - name: Build with Maven
-      run: mvn -B package --file pom.xml -Dvalidate-format
+      run: ./mvnw -B verify -Dvalidate-format
diff --git a/tck/tck-runtime/src/main/java/servlet/tck/common/request/SecformClient.java b/tck/tck-runtime/src/main/java/servlet/tck/common/request/SecformClient.java
@@ -163,7 +163,7 @@ public class SecformClient extends BaseTckTest {
 
   private Response errorPageRequestResponse = null;
 
-  private Map<String,String> cookies = null;
+  private Map<String,String> cookies = new HashMap<>();
 
   /*
    * @class.setup_props: webServerHost; webServerPort; user; password; authuser;
@@ -2196,7 +2196,6 @@ public Response followRedirect(Response response, int testNum)
    */
   public void addNewCookies(final Map<String, String> oldCookies, Map<String, String> newCookies) {
     newCookies.forEach((key, value) -> oldCookies.put(key.trim(), value.trim()));
-
   }
 
   /**