LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Merge branch 'master' into ccm-admin

Jens Pelzetter 2020-12-19 16:53:56 +01:00
parent ce299163ab 4bc5ab2fb9
commit 24923b06e3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -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'
}
}
}

2
ccm-core/src/main/java/org/libreccm/mvc/facelets/CcmViewResourceHandler.java
View File

@ -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>

2
ccm-core/src/main/java/org/libreccm/mvc/facelets/package-info.java
View File

@ -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>
*