From d1f7d01c7682f3fba22f55dba93a61d61904efa6 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Wed, 16 Sep 2020 20:02:44 +0200
Subject: [PATCH 1/2] Fixed typo in faces-config.xml (old class name for
 resource handler)

---
 .../src/main/webapp/WEB-INF/faces-config.xml                    | 2 +-
 .../java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java  | 2 +-
 .../src/main/java/org/libreccm/mvc/facelets/package-info.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
index a1999da81..16605090f 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
@@ -5,6 +5,6 @@
               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
                                   http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
     <application>
-        <resource-handler>org.libreccm.ui.CcmFaceletsResourceHandler</resource-handler>
+        <resource-handler>org.libreccm.mvc.facelets.CcmViewResourceHandler</resource-handler>
     </application>
 </faces-config>
diff --git a/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java b/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java
index 88332b49e..78af38d91 100644
--- a/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java
+++ b/ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java
@@ -39,7 +39,7 @@ import javax.inject.Inject;
  * 
  * <pre>
  * &lt;application&gt;
-        &tl;resource-handler&gt;org.libreccm.ui.CcmFaceletsResourceHandler&lt;/resource-handler&gt;
+        &tl;resource-handler&gt;org.libreccm.mvc.facelets.CcmViewResourceHandler&lt;/resource-handler&gt;
     &lt;/application&gt;
 
  * </pre>
diff --git a/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java b/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java
index 04b4a3562..fec82a0e7 100644
--- a/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java
+++ b/ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java
@@ -24,7 +24,7 @@
  * {@code faces-config.xml}:
  * <pre>
  *     &lt;application&gt;
- *         &tl;resource-handler&gt;org.libreccm.ui.CcmFaceletsResourceHandler&lt;/resource-handler&gt;
+ *         &tl;resource-handler&gt;org.libreccm.mvc.facelets.CcmViewResourceHandler&lt;/resource-handler&gt;
  *     &lt;/application&gt;
  * </pre>
  *

From b5edd0cb6f0fb8659d3862f969ae69f08ed02d19 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 18 Sep 2020 14:17:29 +0200
Subject: [PATCH 2/2] Optimized Jenkinsfile

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6ee6b771e..c1ef5ff51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,14 +7,14 @@ pipeline {
         stage('Build and Test')  {
             steps {
                 dir('') {
-                    sh 'mvn clean verify -Prun-its-with-wildfly-h2mem -Dwildfly.propertiesFile=/srv/libreccm-wildfly.properties' 
+                    sh 'mvn clean package verify -Prun-its-with-wildfly-h2mem -Dwildfly.propertiesFile=/srv/libreccm-wildfly.properties' 
                 }
             }
         }
         stage("Analyse") {
             steps {
                 dir('') {
-                    sh 'mvn pmd:pmd pmd:cpd spotbugs:spotbugs'
+                    sh 'mvn package pmd:pmd pmd:cpd spotbugs:spotbugs'
                 }
             }
         }
@@ -22,7 +22,7 @@ pipeline {
             steps {
                 dir('') {
                     configFileProvider([configFile(fileId: 'libreccm-packages-deploy', variable: 'MAVEN_SETTINGS')]) {
-                        sh 'mvn -U -s "$MAVEN_SETTINGS" -e deploy'
+                        sh 'mvn -U -s "$MAVEN_SETTINGS" -e package deploy'
                     }
                 }
             }