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

merge develop into main #423

Merged
merged 11 commits into from
Nov 1, 2024
Merged

merge develop into main #423

merged 11 commits into from
Nov 1, 2024

Conversation

kkrebs
Copy link
Contributor

@kkrebs kkrebs commented Oct 1, 2024

No description provided.

Possommi and others added 6 commits August 23, 2024 16:46
* UBO-283 Set mycore version to 2022.06.3-SNAPSHOT

* UBO-283 Fixed compile errors

* UBO-283 Removed deprecated api invocation

* UBO-283 Replaced deprecated StringUtils.getLevenshteinDistance() with LevenshteinDistance.getDefaultInstance().apply(normalizeTitle(titleFromAleph), normalizeTitle(titleFromBibEntry)).intValue()

* UBO-283 Moved basket2solradd.xsl and solr2csv.xsl to /xslt. Set TransformerFactoryClass for xslt 1 stylesheets

* UBO-283 Include variable $User-Agent in html-layout.xsl to avoid blank landing page

* UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (comment)

* UBO-283 Added mapping files in persistence.xml

* UBO-283 Curly braces must now be encoded in json.facet

* UBO-283 Improved readability of added properties

* UBO-291 Use h2 for testing

* UBO-291 Set mycore version to 2023.06.1-SNAPSHOT

* UBO-291 Sort poms

* UBO-291 Added sort pom plugin

* UBO-291 Removed property "<property name="hibernate.dialect" value=" org.hibernate.dialect.H2Dialect"/>" from persistence.xml

* UBO-291 Fixed persistence.xml

* UBO-291 Set mycore version to 2023.06.2-SNAPSHOT

* UBO-283 Fixed compile error and sort pom.xml

* UBO-283 Migrated to MCRJobQueue to MCRJobQueueManager

* UBO-283 Set mycore version to 2023.06.03-SNAPSHOT

* UBO-283 Updated ImportListJobAction to mycore version 2023.06.x

* UBO-283 delete obsolete language classification, update versions and

installation documentation

---------

Co-authored-by: Kathleen Neumann <[email protected]>
* UBO-283 switch also docker image to tomcat 10

* fix docker-entrypoint.sh

- c3p0 to Hikari migration in persistence.xml
- javax.persistence to jakarta.persistence migration in persistence.xml
- use "reload mappings in jpa configuration file" command

---------

Co-authored-by: Sebastian Hofmann <[email protected]>
@kkrebs kkrebs marked this pull request as draft October 1, 2024 15:51
@kkrebs kkrebs marked this pull request as ready for review October 31, 2024 22:01
@kkrebs kkrebs merged commit 5065300 into main Nov 1, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants