Skip to content

chore: spring boot 3.4.4 upgrade #92

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.

Sign up for GitHub

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

Merged
danielgrigore merged 4 commits into from
May 6, 2025
Merged

chore: spring boot 3.4.4 upgrade #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f96c190
chore: spring boot 3.4.4 upgrade
danielgrigore May 6, 2025
6733d5f
fix: new suggested workflow
danielgrigore May 6, 2025
ab8613b
chore: generated workflow
danielgrigore May 6, 2025
4d14eaf
fix: remove dependency graph update
danielgrigore May 6, 2025
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
12 changes: 5 additions & 7 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: run tests in java 17
uses: s4u/setup-maven-action@v1.14.0
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
maven-version: 3.9.4
- name: Show maven version
run: mvn --version
- name: Build with Maven
run: mvn -B package --file pom.xml
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
2 changes: 1 addition & 1 deletion cosmo-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>net.oneandone.cosmo</groupId>
<artifactId>cosmo-multimodule</artifactId>
<version>7.0.4-SNAPSHOT</version>
<version>7.1.0-SNAPSHOT</version>
</parent>

<artifactId>cosmo-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cosmo-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>net.oneandone.cosmo</groupId>
<artifactId>cosmo-multimodule</artifactId>
<version>7.0.4-SNAPSHOT</version>
<version>7.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cosmo-core</artifactId>
Expand Down
9 changes: 9 additions & 0 deletions cosmo-core/src/main/java/org/unitedinternet/cosmo/dao/hibernate/ContentDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@
import org.unitedinternet.cosmo.dao.ContentDao;
import org.unitedinternet.cosmo.dao.ModelValidationException;
import org.unitedinternet.cosmo.model.CollectionItem;
import org.unitedinternet.cosmo.model.CollectionSubscription;
import org.unitedinternet.cosmo.model.ContentItem;
import org.unitedinternet.cosmo.model.ICalendarItem;
import org.unitedinternet.cosmo.model.IcalUidInUseException;
import org.unitedinternet.cosmo.model.Item;
import org.unitedinternet.cosmo.model.NoteItem;
import org.unitedinternet.cosmo.model.User;
import org.unitedinternet.cosmo.model.hibernate.HibCollectionItem;
import org.unitedinternet.cosmo.model.hibernate.HibCollectionSubscriptionItem;
import org.unitedinternet.cosmo.model.hibernate.HibItem;
import org.unitedinternet.cosmo.model.hibernate.HibItemTombstone;

Expand Down Expand Up @@ -346,6 +348,13 @@ private void removeCollectionRecursive(CollectionItem collection) {
* Removing a collection does not automatically remove its children. Instead, the association to all the
* children is removed, and any children who have no parent collection are then removed.
*/
if (collection instanceof HibCollectionSubscriptionItem) {
HibCollectionSubscriptionItem subCollection = (HibCollectionSubscriptionItem) collection;
CollectionSubscription subScription = subCollection.getSubscription();
if (subScription != null) {
this.em.detach(subScription);
}
}
removeItemsFromCollection(collection);
this.em.remove(collection);
}
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>net.oneandone.cosmo</groupId>
<artifactId>cosmo-multimodule</artifactId>
<version>7.0.4-SNAPSHOT</version>
<version>7.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>cosmo-multimodule</name>
<description>CalDAV core implementation server</description>
Expand All @@ -27,7 +27,7 @@
<qxlint.report.profile>false</qxlint.report.profile>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<spring.boot.version>3.3.1</spring.boot.version>
<spring.boot.version>3.4.4</spring.boot.version>

<jackrabbit.version>3.0.1</jackrabbit.version>
<ical4j.version>3.2.14</ical4j.version>
Expand All @@ -40,7 +40,7 @@
<stax.version>1.0.1</stax.version>
<woodstox.version>4.0.6</woodstox.version>

<jackson.version>2.17.2</jackson.version>
<jackson.version>2.18.3</jackson.version>
<abdera.version>1.1.3</abdera.version>
<junit.version>5.10.3</junit.version>

Expand Down