From 1c87b0b2bacea501530aa8d99a8cb0aa278fca3e Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Mon, 11 Mar 2024 08:28:19 +0100 Subject: [PATCH 1/9] migrate: auto-migrate --- .gitignore | 20 ++++ Jenkinsfile | 48 ++++++++-- plugin/build.xml => build.xml | 0 module-base/pom.xml | 10 ++ .../goobi/plugins/ConfigurationEntry.java | 0 .../intranda/goobi/plugins/XmlOpacPlugin.java | 0 plugin/.classpath | 27 ------ plugin/.gitignore | 1 - plugin/.project | 23 ----- .../org.eclipse.core.resources.prefs | 4 - plugin/.settings/org.eclipse.jdt.core.prefs | 16 ---- plugin/.settings/org.eclipse.m2e.core.prefs | 4 - .../org.jboss.ide.eclipse.as.core.prefs | 2 - plugin/module-main/.gitignore | 1 - plugin/module-main/pom.xml | 94 ------------------- plugin/pom.xml | 55 ----------- ...ac_xml.xml => plugin_intranda_opac_xml.xml | 0 pom.xml | 29 ++++++ 18 files changed, 98 insertions(+), 236 deletions(-) create mode 100644 .gitignore rename plugin/build.xml => build.xml (100%) create mode 100644 module-base/pom.xml rename {plugin => module-base}/src/main/java/de/intranda/goobi/plugins/ConfigurationEntry.java (100%) rename {plugin => module-base}/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java (100%) delete mode 100644 plugin/.classpath delete mode 100644 plugin/.gitignore delete mode 100644 plugin/.project delete mode 100644 plugin/.settings/org.eclipse.core.resources.prefs delete mode 100644 plugin/.settings/org.eclipse.jdt.core.prefs delete mode 100644 plugin/.settings/org.eclipse.m2e.core.prefs delete mode 100644 plugin/.settings/org.jboss.ide.eclipse.as.core.prefs delete mode 100644 plugin/module-main/.gitignore delete mode 100644 plugin/module-main/pom.xml delete mode 100644 plugin/pom.xml rename plugin/plugin_intranda_opac_xml.xml => plugin_intranda_opac_xml.xml (100%) create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f88813 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ + +# Junk files +*~ +.DS_Store + +# Build +target/ +bin/ +build/ +node_modules/ + +# Eclipse +.project +.classpath +.settings/ + +# IntelliJ IDEA +.idea +*.iml + diff --git a/Jenkinsfile b/Jenkinsfile index 44df4ed..1d5c15f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,13 @@ + 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' } } @@ -11,24 +15,52 @@ pipeline { 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 } @@ -42,5 +74,3 @@ pipeline { } } } - -/* vim: set ts=2 sw=2 tw=120 et :*/ \ No newline at end of file diff --git a/plugin/build.xml b/build.xml similarity index 100% rename from plugin/build.xml rename to build.xml diff --git a/module-base/pom.xml b/module-base/pom.xml new file mode 100644 index 0000000..b675b32 --- /dev/null +++ b/module-base/pom.xml @@ -0,0 +1,10 @@ + + 4.0.0 + + io.goobi.workflow.plugin + plugin-opac-generic-xml + 24.03-SNAPSHOT + + plugin-opac-generic-xml-base + jar + \ No newline at end of file diff --git a/plugin/src/main/java/de/intranda/goobi/plugins/ConfigurationEntry.java b/module-base/src/main/java/de/intranda/goobi/plugins/ConfigurationEntry.java similarity index 100% rename from plugin/src/main/java/de/intranda/goobi/plugins/ConfigurationEntry.java rename to module-base/src/main/java/de/intranda/goobi/plugins/ConfigurationEntry.java diff --git a/plugin/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java b/module-base/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java similarity index 100% rename from plugin/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java rename to module-base/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java diff --git a/plugin/.classpath b/plugin/.classpath deleted file mode 100644 index 88d9894..0000000 --- a/plugin/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugin/.gitignore b/plugin/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/plugin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/plugin/.project b/plugin/.project deleted file mode 100644 index e40df3a..0000000 --- a/plugin/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - goobi-plugin-opac-generic-xml - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/plugin/.settings/org.eclipse.core.resources.prefs b/plugin/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index f9fe345..0000000 --- a/plugin/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/plugin/.settings/org.eclipse.jdt.core.prefs b/plugin/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2bd4e77..0000000 --- a/plugin/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,16 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/plugin/.settings/org.eclipse.m2e.core.prefs b/plugin/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/plugin/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/plugin/.settings/org.jboss.ide.eclipse.as.core.prefs b/plugin/.settings/org.jboss.ide.eclipse.as.core.prefs deleted file mode 100644 index cf3aa3a..0000000 --- a/plugin/.settings/org.jboss.ide.eclipse.as.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.jboss.ide.eclipse.as.core.singledeployable.deployableList= diff --git a/plugin/module-main/.gitignore b/plugin/module-main/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/plugin/module-main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/plugin/module-main/pom.xml b/plugin/module-main/pom.xml deleted file mode 100644 index a55c242..0000000 --- a/plugin/module-main/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - 4.0.0 - de.intranda.goobi.plugins.opac - generic-xml-main - 24.02.1 - - plugin_intranda_opac_generic_xml - /opt/digiverso/goobi/plugins/opac/ - 1.8 - 1.8 - - - de.intranda.goobi.plugins.opac - generic-xml - 24.02.1 - - - - intranda - https://nexus.intranda.com/repository/intranda - - - - ${jar.name} - ${project.basedir}/../src - ${project.basedir}/../test/src - - - ../src - - **/*.java - - - - - - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - true - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.4 - - - validate - - create - - - - - 10 - false - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - - ${maven.build.timestamp} - - - - Versions - - ${project.version} - ${buildNumber} - ${scmBranch} - ${goobi.version} - - - - - - - - - diff --git a/plugin/pom.xml b/plugin/pom.xml deleted file mode 100644 index 0ce16c7..0000000 --- a/plugin/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - 4.0.0 - de.intranda.goobi.plugins.opac - generic-xml - 24.02.1 - pom - ead - http://maven.apache.org - - UTF-8 - 1.8 - 1.8 - 24.02.1 - - - module-main - - - - intranda-releases - https://nexus.intranda.com/repository/maven-releases - - - - - intranda-public - https://nexus.intranda.com/repository/maven-public - - - - - de.intranda.goobi.workflow - goobi-core-jar - ${goobi.version} - - - - junit - junit - [4.13.1,) - test - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - scm:git:ssh://git@gitea.intranda.com:goobi-workflow/goobi-plugin-opac-generic-xml.git - scm:git:ssh://git@gitea.intranda.com:goobi-workflow/goobi-plugin-opac-generic-xml.git - - diff --git a/plugin/plugin_intranda_opac_xml.xml b/plugin_intranda_opac_xml.xml similarity index 100% rename from plugin/plugin_intranda_opac_xml.xml rename to plugin_intranda_opac_xml.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..c392f33 --- /dev/null +++ b/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + + io.goobi.workflow + workflow-base + 24.03-SNAPSHOT + + + io.goobi.workflow.plugin + plugin-opac-generic-xml + pom + + module-base + + + + intranda-public + https://nexus.intranda.com/repository/maven-public + + + + + io.goobi.workflow + workflow-core + ${project.version} + classes + + + \ No newline at end of file From a4ceec487a18f329f4e43796aaaa12c917007f5a Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Thu, 21 Mar 2024 14:40:02 +0100 Subject: [PATCH 2/9] Jenkinsfile: deploy lib module to nexus if present --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1d5c15f..7a92667 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,6 +43,21 @@ pipeline { } } + stage('deploy-libs') { + when { + anyOf { + branch 'master' + branch 'develop' + } + } + steps { + script { + if (fileExists('module-lib/pom.xml')) { + sh 'mvn -f module-lib/pom.xml deploy' + } + } + } + } } post { From 0ad2ea30055519cbe4d1c1e49e744ecf345275cf Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Thu, 21 Mar 2024 15:13:57 +0100 Subject: [PATCH 3/9] Jenkinsfile: also deploy missing plugin parent pom and adapt to new artifacts path --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a92667..37bbe3a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,6 +53,7 @@ pipeline { steps { script { if (fileExists('module-lib/pom.xml')) { + sh 'mvn -N deploy' sh 'mvn -f module-lib/pom.xml deploy' } } @@ -77,7 +78,7 @@ pipeline { dependencyCheckPublisher pattern: 'target/dependency-check-report.xml' } success { - archiveArtifacts artifacts: '**/target/*.jar, */plugin_*.xml, plugin_*.xml', fingerprint: true, onlyIfSuccessful: true + archiveArtifacts artifacts: '**/target/*.jar, install/*', fingerprint: true, onlyIfSuccessful: true } changed { emailext( From 56edde582eb17a9d9bceee05e4262c74c18563eb Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Mon, 15 Apr 2024 14:44:25 +0200 Subject: [PATCH 4/9] release: fix Jenkinsfile and GitHub actions, move install artifacts --- .github/workflows/develop-build.yml | 48 ++++++++++++++ .github/workflows/release-build.yml | 48 ++++++++++++++ .github/workflows/release.yml | 62 ------------------- Jenkinsfile | 23 ++++++- .../plugin_intranda_opac_xml.xml | 0 5 files changed, 116 insertions(+), 65 deletions(-) create mode 100644 .github/workflows/develop-build.yml create mode 100644 .github/workflows/release-build.yml delete mode 100644 .github/workflows/release.yml rename plugin_intranda_opac_xml.xml => install/plugin_intranda_opac_xml.xml (100%) diff --git a/.github/workflows/develop-build.yml b/.github/workflows/develop-build.yml new file mode 100644 index 0000000..43a0c52 --- /dev/null +++ b/.github/workflows/develop-build.yml @@ -0,0 +1,48 @@ +name: Publish Development Build + +permissions: + contents: write + +on: + push: + branches: + - 'develop' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Check out source code + uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Set up Maven cache + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build with Maven + run: mvn clean verify -U + - name: Get current date + id: date + run: echo "::set-output name=date::$(date +'%Y-%m-%d %H:%M:%S %Z')" + - name: Create tag name from date + id: tagdate + run: echo "::set-output name=tagdate::$(date +'%Y-%m-%d_%H-%M-%S_%Z')" + - name: Release + id: create_release + uses: softprops/action-gh-release@v2 + with: + name: ${{ steps.date.outputs.date }} + tag_name: ${{ steps.tagdate.outputs.tagdate }} + generate_release_notes: true + draft: false + prerelease: true + files: | + **/target/*.jar + install/* + \ No newline at end of file diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml new file mode 100644 index 0000000..9e8a022 --- /dev/null +++ b/.github/workflows/release-build.yml @@ -0,0 +1,48 @@ +name: Publish Release Build + +permissions: + contents: write + +on: + push: + branches: + - 'master' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Check out source code + uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Set up Maven cache + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build with Maven + run: mvn clean verify -U + - name: Get current date + id: date + run: echo "::set-output name=date::$(date +'%Y-%m-%d %H:%M:%S %Z')" + - name: Create tag name from date + id: tagdate + run: echo "::set-output name=tagdate::$(date +'%Y-%m-%d_%H-%M-%S_%Z')" + - name: Release + id: create_release + uses: softprops/action-gh-release@v2 + with: + name: ${{ steps.date.outputs.date }} + tag_name: ${{ steps.tagdate.outputs.tagdate }} + generate_release_notes: true + draft: false + prerelease: false + files: | + **/target/*.jar + install/* + \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 00a4436..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Build and upload to release - -on: - push: - branch: - - 'master' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Check out source code - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Set up Maven cache - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Build with Maven - run: mvn package --file plugin/pom.xml -DskipTests - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d %H:%M:%S %Z')" - - name: Create tag name from date - id: tagdate - run: echo "::set-output name=tagdate::$(date +'%Y-%m-%d_%H-%M-%S_%Z')" - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.tagdate.outputs.tagdate }} - release_name: ${{ steps.date.outputs.date }} - draft: false - prerelease: false - - name: Upload main asset - id: upload-main-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: plugin/module-main/target/plugin_intranda_opac_generic_xml.jar - asset_name: plugin_intranda_opac_generic_xml.jar - asset_content_type: application/jar - - name: Upload Config asset - id: upload-config-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: plugin/plugin_intranda_opac_xml.xml - asset_name: plugin_intranda_opac_xml.xml - asset_content_type: text/xml \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 37bbe3a..4d103f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,16 +43,33 @@ pipeline { } } - stage('deploy-libs') { + stage('deploy-snapshot-libs') { when { anyOf { - branch 'master' branch 'develop' } } steps { script { if (fileExists('module-lib/pom.xml')) { + sh 'cat pom.xml | grep "SNAPSHOT"' + sh 'mvn -N deploy' + sh 'mvn -f module-lib/pom.xml deploy' + } + } + } + } + + stage('deploy-release-libs') { + when { + anyOf { + branch 'master' + } + } + steps { + script { + if (fileExists('module-lib/pom.xml')) { + sh 'cat pom.xml | grep "SNAPSHOT" || true' sh 'mvn -N deploy' sh 'mvn -f module-lib/pom.xml deploy' } @@ -63,7 +80,7 @@ pipeline { post { always { - junit "**/target/surefire-reports/*.xml" + junit allowEmptyResults: true, testResults: "**/target/surefire-reports/*.xml" step([ $class : 'JacocoPublisher', execPattern : '**/target/jacoco.exec', diff --git a/plugin_intranda_opac_xml.xml b/install/plugin_intranda_opac_xml.xml similarity index 100% rename from plugin_intranda_opac_xml.xml rename to install/plugin_intranda_opac_xml.xml From a27104f4eebce358cbb1fd157c6033a31b875e40 Mon Sep 17 00:00:00 2001 From: Steffen Hankiewicz Date: Sun, 21 Apr 2024 10:10:20 +0200 Subject: [PATCH 5/9] added ats generation to plugin --- .../intranda/goobi/plugins/XmlOpacPlugin.java | 74 +++++++++++++++++-- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java b/module-base/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java index 41b43d9..230bfe6 100644 --- a/module-base/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java +++ b/module-base/src/main/java/de/intranda/goobi/plugins/XmlOpacPlugin.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; @@ -32,6 +33,7 @@ import de.sub.goobi.helper.Helper; import de.sub.goobi.helper.StorageProvider; import de.sub.goobi.helper.StorageProviderInterface; +import de.sub.goobi.helper.UghHelper; import de.unigoettingen.sub.search.opac.ConfigOpac; import de.unigoettingen.sub.search.opac.ConfigOpacCatalogue; import de.unigoettingen.sub.search.opac.ConfigOpacDoctype; @@ -61,6 +63,7 @@ public class XmlOpacPlugin implements IOpacPlugin { private String documentType = null; private String anchorType = null; + protected String atstsl; private XPathFactory xFactory = XPathFactory.instance(); @@ -76,7 +79,8 @@ public class XmlOpacPlugin implements IOpacPlugin { @Override public Fileformat search(String inSuchfeld, String inSuchbegriff, ConfigOpacCatalogue coc, Prefs prefs) throws Exception { - + String myTitle = ""; + StringBuilder authors = new StringBuilder(); if (namespaces == null) { loadConfiguration(); } @@ -170,6 +174,7 @@ public Fileformat search(String inSuchfeld, String inSuchbegriff, ConfigOpacCata for (String value : metadataValues) { try { if (mdt.getIsPerson()) { + authors.append(value).append("; "); Person p = new Person(mdt); if (value.contains(",")) { p.setLastname(value.substring(0, value.indexOf(",")).trim()); @@ -188,7 +193,9 @@ public Fileformat search(String inSuchfeld, String inSuchbegriff, ConfigOpacCata anchor.addPerson(p); } } else { - + if ("TitleDocMain".equals(sp.getMetadataName())) { + myTitle = value.toLowerCase(); + } Metadata md = new Metadata(mdt); md.setValue(value); if ("physical".equals(sp.getLevel())) { @@ -210,6 +217,7 @@ public Fileformat search(String inSuchfeld, String inSuchbegriff, ConfigOpacCata } } } + this.atstsl = createAtstsl(myTitle, authors.toString()); return mm; } @@ -312,9 +320,12 @@ public int getHitcount() { return hit; } + /* (non-Javadoc) + * @see de.sub.goobi.Import.IOpac#getAtstsl() + */ @Override public String getAtstsl() { - return null; + return this.atstsl; } @Override @@ -323,13 +334,64 @@ public ConfigOpacDoctype getOpacDocType() { } @Override - public String createAtstsl(String value, String value2) { - return null; + public String createAtstsl(String myTitle, String autor) { + String myAtsTsl = ""; + if (autor != null && !"".equals(autor)) { + /* autor */ + if (autor.length() > 4) { + myAtsTsl = autor.substring(0, 4); + } else { + myAtsTsl = autor; + /* titel */ + } + + if (myTitle.length() > 4) { + myAtsTsl += myTitle.substring(0, 4); + } else { + myAtsTsl += myTitle; + } + } + + // if no author { + if (autor == null || "".equals(autor)) { + myAtsTsl = ""; + StringTokenizer tokenizer = new StringTokenizer(myTitle); + int counter = 1; + while (tokenizer.hasMoreTokens()) { + String tok = tokenizer.nextToken(); + if (counter == 1) { + if (tok.length() > 4) { + myAtsTsl += tok.substring(0, 4); + } else { + myAtsTsl += tok; + } + } + if (counter == 2 || counter == 3) { + if (tok.length() > 2) { + myAtsTsl += tok.substring(0, 2); + } else { + myAtsTsl += tok; + } + } + if (counter == 4) { + if (tok.length() > 1) { + myAtsTsl += tok.substring(0, 1); + } else { + myAtsTsl += tok; + } + } + counter++; + } + } + // replace umlauts + myAtsTsl = UghHelper.convertUmlaut(myAtsTsl); + myAtsTsl = myAtsTsl.replaceAll("[\\W]", ""); + return myAtsTsl; } @Override public void setAtstsl(String createAtstsl) { - + atstsl = createAtstsl; } @Override From e9b0776a47bc729f0ba6151c78711930f4179898 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Fri, 3 May 2024 10:14:10 +0200 Subject: [PATCH 6/9] ci: update to latest CI scripts --- .github/workflows/develop-build.yml | 67 ++++++++++++++------------- .github/workflows/release-build.yml | 71 ++++++++++++++--------------- Jenkinsfile | 53 +++++++++++++-------- 3 files changed, 100 insertions(+), 91 deletions(-) diff --git a/.github/workflows/develop-build.yml b/.github/workflows/develop-build.yml index 43a0c52..d9c62d8 100644 --- a/.github/workflows/develop-build.yml +++ b/.github/workflows/develop-build.yml @@ -12,37 +12,36 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Check out source code - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Set up Maven cache - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Build with Maven - run: mvn clean verify -U - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d %H:%M:%S %Z')" - - name: Create tag name from date - id: tagdate - run: echo "::set-output name=tagdate::$(date +'%Y-%m-%d_%H-%M-%S_%Z')" - - name: Release - id: create_release - uses: softprops/action-gh-release@v2 - with: - name: ${{ steps.date.outputs.date }} - tag_name: ${{ steps.tagdate.outputs.tagdate }} - generate_release_notes: true - draft: false - prerelease: true - files: | - **/target/*.jar - install/* - \ No newline at end of file + - name: Check out source code + uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Set up Maven cache + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build with Maven + run: mvn clean verify -U -P snapshot-build + - name: Get current date + id: date + run: echo "::set-output name=date::$(date +'%Y-%m-%d %H:%M:%S %Z')" + - name: Create tag name from date + id: tagdate + run: echo "::set-output name=tagdate::$(date +'%Y-%m-%d_%H-%M-%S_%Z')" + - name: Release + id: create_release + uses: softprops/action-gh-release@v2 + with: + name: ${{ steps.date.outputs.date }} + tag_name: ${{ steps.tagdate.outputs.tagdate }} + generate_release_notes: true + draft: false + prerelease: true + files: | + **/target/*.war + install/* diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 9e8a022..2ff7685 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -1,48 +1,45 @@ -name: Publish Release Build +name: Publish Development Build + +permissions: + contents: write + +name: Publish Development Build permissions: contents: write on: push: - branches: - - 'master' + tags: + - 'v*' jobs: build: runs-on: ubuntu-latest steps: - - name: Check out source code - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Set up Maven cache - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Build with Maven - run: mvn clean verify -U - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d %H:%M:%S %Z')" - - name: Create tag name from date - id: tagdate - run: echo "::set-output name=tagdate::$(date +'%Y-%m-%d_%H-%M-%S_%Z')" - - name: Release - id: create_release - uses: softprops/action-gh-release@v2 - with: - name: ${{ steps.date.outputs.date }} - tag_name: ${{ steps.tagdate.outputs.tagdate }} - generate_release_notes: true - draft: false - prerelease: false - files: | - **/target/*.jar - install/* - \ No newline at end of file + - name: Check out source code + uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Set up Maven cache + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build with Maven + run: mvn clean verify -U -P release-build + - name: Release + id: create_release + uses: softprops/action-gh-release@v2 + with: + name: Release ${{ github.ref_name }} + generate_release_notes: true + draft: false + prerelease: false + files: | + **/target/*.war + install/* diff --git a/Jenkinsfile b/Jenkinsfile index 4d103f4..d2f4b4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,54 +22,67 @@ pipeline { } } - stage('build') { + stage('build-snapshot') { + when { + not { + anyOf { + branch 'master' + branch 'release_*' + allOf { + branch 'PR-*' + expression { env.CHANGE_BRANCH.startsWith("release_") } + } + } + } + } steps { - sh 'mvn clean verify -U' - recordIssues enabledForFailure: true, aggregatingResults: true, tools: [java(), javaDoc()] + sh 'mvn clean verify -U -P snapshot-build' } } - - stage('sonarcloud') { + stage('build-release') { when { anyOf { branch 'master' - branch 'sonar_*' + branch 'release_*' + allOf { + branch 'PR-*' + expression { env.CHANGE_BRANCH.startsWith("release_") } + } } } steps { - withCredentials([string(credentialsId: 'jenkins-sonarcloud', variable: 'TOKEN')]) { - sh 'mvn verify sonar:sonar -Dsonar.token=$TOKEN -U' - } + sh 'mvn clean verify -U -P release-build' } } - - stage('deploy-snapshot-libs') { + stage('sonarcloud') { when { anyOf { - branch 'develop' + branch 'master' + branch 'release_*' + branch 'sonar_*' + allOf { + branch 'PR-*' + expression { env.CHANGE_BRANCH.startsWith("release_") } + } } } steps { - script { - if (fileExists('module-lib/pom.xml')) { - sh 'cat pom.xml | grep "SNAPSHOT"' - sh 'mvn -N deploy' - sh 'mvn -f module-lib/pom.xml deploy' - } + withCredentials([string(credentialsId: 'jenkins-sonarcloud', variable: 'TOKEN')]) { + sh 'mvn verify sonar:sonar -Dsonar.token=$TOKEN -U' } } } - stage('deploy-release-libs') { + stage('deploy-libs') { when { anyOf { branch 'master' + branch 'develop' } } steps { script { if (fileExists('module-lib/pom.xml')) { - sh 'cat pom.xml | grep "SNAPSHOT" || true' sh 'mvn -N deploy' sh 'mvn -f module-lib/pom.xml deploy' } From fa060f2621c4983323afb4a2143ea084800c3b3d Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Fri, 3 May 2024 13:08:23 +0200 Subject: [PATCH 7/9] ci: update to latest CI scripts --- .github/workflows/develop-build.yml | 2 +- .github/workflows/release-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-build.yml b/.github/workflows/develop-build.yml index d9c62d8..78664d9 100644 --- a/.github/workflows/develop-build.yml +++ b/.github/workflows/develop-build.yml @@ -43,5 +43,5 @@ jobs: draft: false prerelease: true files: | - **/target/*.war + **/target/*.jar install/* diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 2ff7685..5c13aea 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -41,5 +41,5 @@ jobs: draft: false prerelease: false files: | - **/target/*.war + **/target/*.jar install/* From b70d026c8f88939e93fd3a0daa6f4baf45a70164 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Fri, 3 May 2024 13:13:41 +0200 Subject: [PATCH 8/9] ci: update to latest CI scripts --- .github/workflows/release-build.yml | 7 +------ Jenkinsfile | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 5c13aea..e3a9552 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -1,9 +1,4 @@ -name: Publish Development Build - -permissions: - contents: write - -name: Publish Development Build +name: Publish Release Build permissions: contents: write diff --git a/Jenkinsfile b/Jenkinsfile index d2f4b4b..13cb478 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,6 @@ pipeline { sh 'git reset --hard HEAD && git clean -fdx' } } - stage('build-snapshot') { when { not { @@ -72,7 +71,6 @@ pipeline { } } } - stage('deploy-libs') { when { anyOf { @@ -89,6 +87,27 @@ pipeline { } } } + stage('tag release') { + when { branch 'master' } + steps { + withCredentials([gitUsernamePassword(credentialsId: '93f7e7d3-8f74-4744-a785-518fc4d55314', + gitToolName: 'git-tool')]) { + sh '''#!/bin/bash -xe + projectversion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=project.version -q -DforceStdout) + if [ $? != 0 ] + then + exit 1 + elif [[ "${projectversion}" =~ "SNAPSHOT" ]] + then + echo "This is a SNAPSHOT version" + exit 1 + fi + echo "${projectversion}" + git tag -a "v${projectversion}" -m "releasing v${projectversion}" && git push origin v"${projectversion}" + ''' + } + } + } } post { From 0f085810adbe3ff0fc7cfde135e5724e9e58cb6b Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Fri, 3 May 2024 15:09:50 +0200 Subject: [PATCH 9/9] Release v24.04.2 --- module-base/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index b675b32..02be287 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-opac-generic-xml - 24.03-SNAPSHOT + 24.04.2 plugin-opac-generic-xml-base jar diff --git a/pom.xml b/pom.xml index c392f33..5d6f2fb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.03-SNAPSHOT + 24.04.2 io.goobi.workflow.plugin