From 238d250cd05a8dd00a87dc1579113bb0d76e36da Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Sat, 7 Sep 2024 09:24:42 +0200 Subject: [PATCH 1/4] Change project version to 24.09-SNAPSHOT --- 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 2b06248..c2e9667 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-step-pdf-extraction - 24.08.1 + 24.09-SNAPSHOT plugin-step-pdf-extraction-base jar diff --git a/pom.xml b/pom.xml index 50bfe4d..3c6cc94 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.08.1 + 24.09-SNAPSHOT io.goobi.workflow.plugin From e4334b2f1467e10be3bbdc13474d34804717536a Mon Sep 17 00:00:00 2001 From: Steffen Hankiewicz Date: Mon, 23 Sep 2024 03:34:27 +0200 Subject: [PATCH 2/4] switch property container to string instead of integer --- module-base/pom.xml | 2 +- .../java/de/intranda/goobi/plugins/PDFExtractionPlugin.java | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index aaad463..c2e9667 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-step-pdf-extraction - 24.07-SNAPSHOT + 24.09-SNAPSHOT plugin-step-pdf-extraction-base jar diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/PDFExtractionPlugin.java b/module-base/src/main/java/de/intranda/goobi/plugins/PDFExtractionPlugin.java index 5b03ada..643e18d 100755 --- a/module-base/src/main/java/de/intranda/goobi/plugins/PDFExtractionPlugin.java +++ b/module-base/src/main/java/de/intranda/goobi/plugins/PDFExtractionPlugin.java @@ -290,7 +290,7 @@ private void setProperty(String propertyName, String value) { if (property == null) { property = new Processproperty(); property.setTitel(propertyName); - property.setContainer(0); + property.setContainer("0"); property.setCreationDate(Date.from(Instant.now())); property.setProzess(this.step.getProzess()); properties.add(property); diff --git a/pom.xml b/pom.xml index 393fbcb..3c6cc94 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.07-SNAPSHOT + 24.09-SNAPSHOT io.goobi.workflow.plugin From 23413908a01017a20d6c6d1e50a0f6679cff2d61 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Tue, 1 Oct 2024 10:17:32 +0200 Subject: [PATCH 3/4] ci: update to latest Jenkinsfile --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 6d1a6cb..97fbba8 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,6 +28,7 @@ pipeline { branch 'master' branch 'release_*' branch 'hotfix_release_*' + branch 'sonar_*' allOf { branch 'PR-*' expression { env.CHANGE_BRANCH.startsWith("release_") } @@ -55,6 +56,14 @@ pipeline { sh 'mvn clean verify -U -P release-build' } } + stage('build-sonar') { + when { + branch 'sonar_*' + } + steps { + sh 'mvn clean verify -U -P sonar-build' + } + } stage('sonarcloud') { when { allOf { From 78f3f90a68f94e28dfe07eee38e29bfdeee794fc Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Tue, 1 Oct 2024 13:43:39 +0200 Subject: [PATCH 4/4] Change project version to 24.09 --- 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 c2e9667..9e0daaa 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-step-pdf-extraction - 24.09-SNAPSHOT + 24.09 plugin-step-pdf-extraction-base jar diff --git a/pom.xml b/pom.xml index 3c6cc94..011b900 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.09-SNAPSHOT + 24.09 io.goobi.workflow.plugin