Skip to content

Commit 690efab

Browse files
author
Dominick Leppich
committed
Merge pull request 'Release v25.02' (#15) from release_25.02 into master
2 parents 32e1ea4 + f82d303 commit 690efab

File tree

10 files changed

+31
-97
lines changed

10 files changed

+31
-97
lines changed

‎.github/workflows/develop-build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ jobs:
1414
steps:
1515
- name: Check out source code
1616
uses: actions/checkout@v4
17-
- name: Set up JDK 17
18-
uses: actions/setup-java@v1
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
1919
with:
20-
java-version: 17
20+
distribution: 'temurin'
21+
java-version: 21
2122
- name: Set up Maven cache
22-
uses: actions/cache@v1
23+
uses: actions/cache@v4
2324
with:
2425
path: ~/.m2/repository
2526
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/release-build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ jobs:
1414
steps:
1515
- name: Check out source code
1616
uses: actions/checkout@v4
17-
- name: Set up JDK 17
18-
uses: actions/setup-java@v1
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
1919
with:
20-
java-version: 17
20+
distribution: 'temurin'
21+
java-version: 21
2122
- name: Set up Maven cache
22-
uses: actions/cache@v1
23+
uses: actions/cache@v4
2324
with:
2425
path: ~/.m2/repository
2526
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎Jenkinsfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ pipeline {
33

44
agent {
55
docker {
6-
/* using a custom build image with a defined home directory for UID 1000 among other things */
7-
image 'nexus.intranda.com:4443/maven:3.9.3-eclipse-temurin-17'
8-
registryUrl 'https://nexus.intranda.com:4443'
9-
registryCredentialsId 'jenkins-docker'
6+
image 'maven:3-eclipse-temurin-21'
107
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'
118
}
129
}

‎build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<exec executable="mvn">
44
<arg value="package"/>
55
</exec>
6-
<copy file="module-main/target/plugin_intranda_workflow_barcode_generator.jar" todir="/opt/digiverso/goobi/plugins/workflow/"/>
7-
<copy file="module-gui/target/plugin_intranda_workflow_barcode_generator-GUI.jar" todir="/opt/digiverso/goobi/plugins/GUI/"/>
6+
<copy file="module-base/target/plugin-workflow-barcode-generator-base.jar" todir="/opt/digiverso/goobi/plugins/workflow/" overwrite="true"/>
7+
<copy file="module-gui/target/plugin-workflow-barcode-generator-gui.jar" todir="/opt/digiverso/goobi/plugins/GUI/" overwrite="true"/>
88
</target>
99
</project>

‎module-base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.goobi.workflow.plugin</groupId>
55
<artifactId>plugin-workflow-barcode-generator</artifactId>
6-
<version>24.12</version>
6+
<version>25.02</version>
77
</parent>
88
<artifactId>plugin-workflow-barcode-generator-base</artifactId>
99
<packaging>jar</packaging>

‎module-base/src/main/java/de/intranda/goobi/PluginInfo.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎module-base/src/main/java/de/intranda/goobi/plugins/BarcodeGeneratorPlugin.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
import java.util.Arrays;
3131
import java.util.List;
3232

33-
import javax.faces.context.FacesContext;
34-
import javax.faces.model.SelectItem;
35-
import javax.servlet.ServletContext;
36-
import javax.servlet.ServletOutputStream;
37-
import javax.servlet.http.HttpServletResponse;
3833
import javax.xml.transform.Result;
3934
import javax.xml.transform.Transformer;
4035
import javax.xml.transform.TransformerException;
@@ -64,22 +59,27 @@
6459
import de.sub.goobi.helper.FacesContextHelper;
6560
import de.sub.goobi.helper.Helper;
6661
import de.sub.goobi.helper.StorageProvider;
62+
import jakarta.faces.context.FacesContext;
63+
import jakarta.faces.model.SelectItem;
64+
import jakarta.servlet.ServletContext;
65+
import jakarta.servlet.ServletOutputStream;
66+
import jakarta.servlet.http.HttpServletResponse;
6767
import lombok.Data;
6868
import lombok.extern.log4j.Log4j;
6969
import net.xeoh.plugins.base.annotations.PluginImplementation;
7070

7171
/**
72-
* This plugin is used to generate barcodes. It is implemented as Goobi workflow
73-
* plugin so that it is accessible to all users with access to the menu
74-
* 'workflow'. It does not create any kind of processes and it does not change
75-
* any information inside of the Goobi workflow database.
72+
* This plugin is used to generate barcodes. It is implemented as Goobi workflow plugin so that it is accessible to all users with access to the menu
73+
* 'workflow'. It does not create any kind of processes and it does not change any information inside of the Goobi workflow database.
7674
*
7775
* @author Steffen Hankiewicz
7876
*/
7977
@PluginImplementation
8078
@Log4j
8179
@Data
8280
public class BarcodeGeneratorPlugin implements IWorkflowPlugin, IPlugin {
81+
private static final long serialVersionUID = 2253037160388668479L;
82+
8383
private static final String PLUGIN_NAME = "intranda_workflow_barcode_generator";
8484

8585
private String xsltFile;
@@ -101,8 +101,9 @@ public BarcodeGeneratorPlugin() {
101101
* general initialisation
102102
*/
103103
private void initialize() {
104-
xsltFile = ConfigurationHelper.getInstance().getXsltFolder() + ConfigPlugins.getPluginConfig(PLUGIN_NAME).getString("xslt-file",
105-
"barcode.xslt");
104+
xsltFile = ConfigurationHelper.getInstance().getXsltFolder() + ConfigPlugins.getPluginConfig(PLUGIN_NAME)
105+
.getString("xslt-file",
106+
"barcode.xslt");
106107
prefix = ConfigPlugins.getPluginConfig(PLUGIN_NAME).getString("prefix", "");
107108
separator = ConfigPlugins.getPluginConfig(PLUGIN_NAME).getString("separator", "_");
108109
startNumber = ConfigPlugins.getPluginConfig(PLUGIN_NAME).getInt("start", 1);

‎module-gui/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.goobi.workflow.plugin</groupId>
55
<artifactId>plugin-workflow-barcode-generator</artifactId>
6-
<version>24.12</version>
6+
<version>25.02</version>
77
</parent>
88
<artifactId>plugin-workflow-barcode-generator-gui</artifactId>
99
<packaging>jar</packaging>

‎module-gui/src/main/webapp/resources/uii/plugin_workflow_barcodeGenerator.xhtml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:h="http://xmlns.jcp.org/jsf/html"
55
xmlns:f="http://xmlns.jcp.org/jsf/core"
66
template="/uii/templatePG/templatePG.html"
7-
xmlns:x="http://myfaces.apache.org/tomahawk"
87
xmlns:composite="http://xmlns.jcp.org/jsf/composite"
98
xmlns:c="http://java.sun.com/jsp/jstl/core"
109
xmlns:intranda="http://xmlns.jcp.org/jsf/composite/compositesPG"
@@ -86,13 +85,13 @@
8685

8786
<!-- Buttons -->
8887
<div class="form-actions">
89-
<a
88+
<button
9089
jsf:id="link_blank"
9190
class="btn btn-blank me-2"
9291
jsf:immediate="true"
9392
jsf:action="#{NavigationForm.workflowPlugin.cancel}">
9493
<h:outputText value="#{msgs.abbrechen}" />
95-
</a>
94+
</button>
9695

9796
<button
9897
class="btn btn-success"

‎pom.xml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.goobi.workflow</groupId>
55
<artifactId>workflow-base</artifactId>
6-
<version>24.12</version>
6+
<version>25.02</version>
77
<relativePath />
88
</parent>
99
<groupId>io.goobi.workflow.plugin</groupId>
@@ -26,30 +26,6 @@
2626
<version>${project.version}</version>
2727
<classifier>classes</classifier>
2828
</dependency>
29-
<dependency>
30-
<groupId>org.apache.xmlgraphics</groupId>
31-
<artifactId>fop</artifactId>
32-
<version>2.4</version>
33-
<exclusions>
34-
<exclusion>
35-
<groupId>javax.media</groupId>
36-
<artifactId>jai-core</artifactId>
37-
</exclusion>
38-
<exclusion>
39-
<groupId>com.sun.media</groupId>
40-
<artifactId>jai-codec</artifactId>
41-
</exclusion>
42-
</exclusions>
43-
</dependency>
44-
<dependency>
45-
<groupId>net.sf.barcode4j</groupId>
46-
<artifactId>barcode4j</artifactId>
47-
<version>2.1</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>net.sf.barcode4j</groupId>
51-
<artifactId>barcode4j-fop-ext</artifactId>
52-
<version>2.1</version>
53-
</dependency>
29+
5430
</dependencies>
5531
</project>

0 commit comments

Comments
 (0)