Skip to content

Commit

Permalink
migrate: auto-migrate
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominick Leppich committed Mar 2, 2024
1 parent e0cf925 commit 9b2ccf8
Show file tree
Hide file tree
Showing 29 changed files with 149 additions and 347 deletions.
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

# Junk files
*~
.DS_Store

# Build
target/
bin/
build/
node_modules/

# Eclipse
.project
.classpath
.settings/

# IntelliJ IDEA
.idea
*.iml

48 changes: 39 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,34 +1,66 @@

pipeline {

agent {
docker {
image 'maven:3-jdk-11'
args '-v $HOME/.m2:/var/maven/.m2:z -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'
/* using a custom build image with a defined home directory for UID 1000 among other things */
image 'nexus.intranda.com:4443/maven:3.9.3-eclipse-temurin-17'
registryUrl 'https://nexus.intranda.com:4443'
registryCredentialsId 'jenkins-docker'
args '-v $HOME/.m2:/var/maven/.m2:z -v $HOME/.config:/var/maven/.config -v $HOME/.sonar:/var/maven/.sonar -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'
}
}

options {
buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '15', daysToKeepStr: '90', numToKeepStr: '')
}



stages {
stage('prepare') {
steps {
sh 'git clean -fdx'
sh 'git reset --hard HEAD && git clean -fdx'
}
}

stage('build') {
steps {
sh 'mvn -f plugin/pom.xml package'
sh 'mvn clean verify -U'
recordIssues enabledForFailure: true, aggregatingResults: true, tools: [java(), javaDoc()]
}
}

stage('sonarcloud') {
when {
anyOf {
branch 'master'
branch 'sonar_*'
}
}
steps {
withCredentials([string(credentialsId: 'jenkins-sonarcloud', variable: 'TOKEN')]) {
sh 'mvn verify sonar:sonar -Dsonar.token=$TOKEN -U'
}
}
}

}

post {
always {
junit "**/target/surefire-reports/*.xml"
step([
$class : 'JacocoPublisher',
execPattern : '**/target/jacoco.exec',
classPattern : '**/target/classes/',
sourcePattern : '**/src/main/java',
exclusionPattern : '**/*Test.class'
])
recordIssues (
enabledForFailure: true, aggregatingResults: false,
tools: [checkStyle(pattern: 'target/checkstyle-result.xml', reportEncoding: 'UTF-8')]
)
dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
}
success {
archiveArtifacts artifacts: '**/target/*.jar, */plugin_*.xml, plugin_*.xml', fingerprint: true, onlyIfSuccessful: true
}
Expand All @@ -42,5 +74,3 @@ pipeline {
}
}
}

/* vim: set ts=2 sw=2 tw=120 et :*/
File renamed without changes.
10 changes: 10 additions & 0 deletions module-base/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.goobi.workflow.plugin</groupId>
<artifactId>plugin-workflow-processInspection</artifactId>
<version>24.03-SNAPSHOT</version>
</parent>
<artifactId>plugin-workflow-processInspection-base</artifactId>
<packaging>jar</packaging>
</project>
File renamed without changes.
18 changes: 18 additions & 0 deletions module-gui/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.goobi.workflow.plugin</groupId>
<artifactId>plugin-workflow-processInspection</artifactId>
<version>24.03-SNAPSHOT</version>
</parent>
<artifactId>plugin-workflow-processInspection-gui</artifactId>
<packaging>jar</packaging>
<build>
<resources>
<resource>
<targetPath>META-INF/resources</targetPath>
<directory>src/main/webapp/resources</directory>
</resource>
</resources>
</build>
</project>
33 changes: 33 additions & 0 deletions module-gui/src/main/webapp/META-INF/faces-config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
* This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
*
* Visit the websites for more information.
* - https://goobi.io
* - https://www.intranda.com
* - https://github.com/intranda/goobi-workflow
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59
* Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->

<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"
version="2.3">

<application>
<resource-bundle>
<base-name>org.goobi.production.messages.MyRessourceBundle</base-name>
<var>msgs</var>
</resource-bundle>
</application>
</faces-config>
39 changes: 0 additions & 39 deletions plugin/.classpath

This file was deleted.

3 changes: 0 additions & 3 deletions plugin/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions plugin/.project

This file was deleted.

2 changes: 0 additions & 2 deletions plugin/.settings/org.eclipse.core.resources.prefs

This file was deleted.

15 changes: 0 additions & 15 deletions plugin/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions plugin/.settings/org.eclipse.m2e.core.prefs

This file was deleted.

2 changes: 0 additions & 2 deletions plugin/.settings/org.jboss.ide.eclipse.as.core.prefs

This file was deleted.

2 changes: 0 additions & 2 deletions plugin/module-gui/.gitignore

This file was deleted.

90 changes: 0 additions & 90 deletions plugin/module-gui/pom.xml

This file was deleted.

2 changes: 0 additions & 2 deletions plugin/module-main/.gitignore

This file was deleted.

Loading

0 comments on commit 9b2ccf8

Please sign in to comment.