[myfaces] branch master updated: CI Java v2 and Adopt OpenJDK

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bommel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new c6e7924  CI Java v2 and Adopt OpenJDK
c6e7924 is described below

commit c6e792468c09b38de1f6e598f016c7e62b58b4a5
Author: melloware <me...@gmail.com>
AuthorDate: Tue Apr 6 08:51:08 2021 -0400

    CI Java v2 and Adopt OpenJDK
---
 .github/workflows/myfaces-ci.yml                   |   7 +-
 .../core/TestStartupServletContextListener.java    | 102 ++++++++++-----------
 2 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/myfaces-ci.yml b/.github/workflows/myfaces-ci.yml
index bdcb00e..494020e 100644
--- a/.github/workflows/myfaces-ci.yml
+++ b/.github/workflows/myfaces-ci.yml
@@ -52,10 +52,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           persist-credentials: false
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: 8
       - name: Cache Maven packages
         uses: actions/cache@v2.1.4
         with:
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/TestStartupServletContextListener.java b/impl/src/test/java/org/apache/myfaces/test/core/TestStartupServletContextListener.java
index e2d83fa..5626265 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/TestStartupServletContextListener.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/TestStartupServletContextListener.java
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.test.core;
-
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-import org.apache.myfaces.webapp.FacesInitializer;
-
-public class TestStartupServletContextListener implements ServletContextListener
-{
-    private FacesInitializer facesInitializer;
-
-    public TestStartupServletContextListener(FacesInitializer facesInitializer)
-    {
-        this.facesInitializer = facesInitializer;
-    }
-    
-    @Override
-    public void contextInitialized(ServletContextEvent event)
-    {
-        if (facesInitializer != null)
-        {
-            facesInitializer.initFaces(event.getServletContext());
-        }
-    }
-
-    @Override
-    public void contextDestroyed(ServletContextEvent event)
-    {
-        if (facesInitializer != null)
-        {
-            facesInitializer.destroyFaces(event.getServletContext());
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.test.core;
+
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import org.apache.myfaces.webapp.FacesInitializer;
+
+public class TestStartupServletContextListener implements ServletContextListener
+{
+    private FacesInitializer facesInitializer;
+
+    public TestStartupServletContextListener(FacesInitializer facesInitializer)
+    {
+        this.facesInitializer = facesInitializer;
+    }
+    
+    @Override
+    public void contextInitialized(ServletContextEvent event)
+    {
+        if (facesInitializer != null)
+        {
+            facesInitializer.initFaces(event.getServletContext());
+        }
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent event)
+    {
+        if (facesInitializer != null)
+        {
+            facesInitializer.destroyFaces(event.getServletContext());
+        }
+    }
+}