Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from kitodo:master #300

Merged
merged 20 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
64df25a
Fix some compiler warnings
stweil Jul 22, 2024
5c996c1
Update messages_es.properties
danilopenagos Aug 6, 2024
1d86c7c
Relocate from javax.xml.bind to jakarta.xml.bind
henning-gerhardt Apr 2, 2024
59b37b1
Relocate from javax.json to jakarta.json
henning-gerhardt Apr 2, 2024
cf5e5b0
Update glassfish runtime to 2.3.9
henning-gerhardt Apr 2, 2024
62d7afa
Relocate from org.jvnet.jaxb2.maven2 to org.jvnet.jaxb
henning-gerhardt Apr 2, 2024
710e89b
Remove old jaxb-api dependency from org.hibernate
henning-gerhardt Jun 5, 2024
cb46862
Make user project list sortable by client
solth May 16, 2024
195a7f4
Update errors_es.properties
danilopenagos Aug 8, 2024
20e7c96
Update messages_es.properties
danilopenagos Aug 8, 2024
795f3bf
Merge pull request #6148 from stweil/non-varargs
solth Aug 9, 2024
e0fa766
Merge pull request #6020 from slub/relocate_dependencies
solth Aug 9, 2024
37bf53d
Merge pull request #6082 from effective-webwork/user-project-list-sor…
solth Aug 9, 2024
0e6e0ee
Merge pull request #6171 from danilopenagos/danilopenagos-06-08-2024
solth Aug 9, 2024
d9763f6
Extracts the renaming of processes into the process service
matthias-ronge Jun 18, 2024
850037c
Fix checkstyle
matthias-ronge Jun 18, 2024
59595db
Fix checkstyle
matthias-ronge Jul 2, 2024
c10159a
Slightly modify javadoc (to rerun tests)
matthias-ronge Jul 3, 2024
402984d
Remove unused import
matthias-ronge Aug 13, 2024
335afc0
Merge pull request #6106 from matthias-ronge/extract-rename-processes
solth Aug 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Relocate from javax.xml.bind to jakarta.xml.bind
  • Loading branch information
henning-gerhardt committed Aug 7, 2024
commit 1d86c7ccde059a05e679ac1d040a860a397039f3
4 changes: 2 additions & 2 deletions Kitodo-API/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down
4 changes: 2 additions & 2 deletions Kitodo-DataEditor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<artifactId>kitodo-data-format</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<org.apache.avalon.framework.version>4.3.1</org.apache.avalon.framework.version>
<hamcrest.version>2.2-rc1</hamcrest.version>
<hibernate.version>5.6.10.Final</hibernate.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
<jaxb.api.version>2.3.3</jaxb.api.version>
<jaxb.glassfish-runtime.version>2.3.6</jaxb.glassfish-runtime.version>
<jaxb2-basics-runtime.version>1.11.1</jaxb2-basics-runtime.version>
<jaxen.version>1.2.0</jaxen.version>
Expand Down Expand Up @@ -226,8 +226,8 @@
<!-- Include jaxb runtime dependencies which have been removed
from system library in Java 11+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
Expand Down