diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 8d0f3605..800d58a7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,12 +20,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: run tests in java 17 - uses: actions/setup-java@v3 + uses: s4u/setup-maven-action@v1.14.0 with: java-version: '17' distribution: 'temurin' - cache: maven - - name: Build with Maven + maven-version: 3.9.4 + - name: Show maven version + run: mvn --version + - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/cosmo-api/pom.xml b/cosmo-api/pom.xml index a17e7120..d90b7d84 100644 --- a/cosmo-api/pom.xml +++ b/cosmo-api/pom.xml @@ -4,7 +4,7 @@ net.oneandone.cosmo cosmo-multimodule - 6.0.3-SNAPSHOT + 7.0.0-SNAPSHOT cosmo-api @@ -24,7 +24,6 @@ org.apache.commons commons-lang3 - 3.14.0 jakarta.servlet @@ -34,13 +33,7 @@ org.mnode.ical4j - ical4j - - - commons-codec - commons-codec - - + ical4j org.springframework.security diff --git a/cosmo-core/pom.xml b/cosmo-core/pom.xml index c0fceea8..f1ed5035 100644 --- a/cosmo-core/pom.xml +++ b/cosmo-core/pom.xml @@ -12,25 +12,12 @@ net.oneandone.cosmo cosmo-multimodule - 6.0.3-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 cosmo-core - - - 2.5 - 2.8 - 2.1.1 - 2.2 - 2.2.2 - false - - - - - - + org.springframework.boot spring-boot-starter-web @@ -61,44 +48,27 @@ org.apache.commons - commons-lang3 - 3.14.0 + commons-lang3 org.apache.commons - commons-text - 1.11.0 + commons-text commons-io - commons-io - 2.15.1 + commons-io commons-codec commons-codec - - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - xerces xercesImpl - + org.mariadb.jdbc @@ -119,36 +89,18 @@ parsing eTags. --> org.apache.abdera - abdera-core - - - commons-codec - commons-codec - - + abdera-core org.apache.abdera - abdera-i18n - - - commons-codec - commons-codec - - + abdera-i18n org.mnode.ical4j - ical4j - - - commons-codec - commons-codec - - + ical4j @@ -217,18 +169,12 @@ org.hibernate.validator hibernate-validator - - - - org.apache.httpcomponents - httpclient - + org.junit.jupiter - junit-jupiter - test + junit-jupiter diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibCalendarCollectionStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibCalendarCollectionStamp.java index 4fd49b16..cdc8e699 100644 --- a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibCalendarCollectionStamp.java +++ b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibCalendarCollectionStamp.java @@ -19,11 +19,6 @@ import java.util.Iterator; import java.util.Set; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.unitedinternet.cosmo.hibernate.validator.Color; import org.unitedinternet.cosmo.hibernate.validator.DisplayName; import org.unitedinternet.cosmo.hibernate.validator.Timezone; @@ -35,6 +30,8 @@ import org.unitedinternet.cosmo.model.QName; import org.unitedinternet.cosmo.model.Stamp; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.model.Component; import net.fortuna.ical4j.model.Property; @@ -48,7 +45,6 @@ */ @Entity @DiscriminatorValue("calendar") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibCalendarCollectionStamp extends HibStamp implements ICalendarConstants, CalendarCollectionStamp { private static final long serialVersionUID = 4397868099410967516L; diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventExceptionStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventExceptionStamp.java index 5cbc9f17..b27a68da 100644 --- a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventExceptionStamp.java +++ b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventExceptionStamp.java @@ -15,11 +15,6 @@ */ package org.unitedinternet.cosmo.model.hibernate; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.unitedinternet.cosmo.CosmoException; import org.unitedinternet.cosmo.calendar.ICalendarUtils; import org.unitedinternet.cosmo.hibernate.validator.EventException; @@ -29,6 +24,8 @@ import org.unitedinternet.cosmo.model.NoteItem; import org.unitedinternet.cosmo.model.Stamp; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.model.Component; import net.fortuna.ical4j.model.component.VEvent; @@ -38,7 +35,6 @@ */ @Entity @DiscriminatorValue("eventexception") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibEventExceptionStamp extends HibBaseEventStamp implements EventExceptionStamp { private static final long serialVersionUID = 3992468809776886156L; diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventStamp.java index 374770cb..1fcbd507 100644 --- a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventStamp.java +++ b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventStamp.java @@ -18,11 +18,6 @@ import java.util.ArrayList; import java.util.List; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.unitedinternet.cosmo.CosmoException; import org.unitedinternet.cosmo.calendar.ICalendarUtils; import org.unitedinternet.cosmo.hibernate.validator.Event; @@ -32,6 +27,8 @@ import org.unitedinternet.cosmo.model.NoteItem; import org.unitedinternet.cosmo.model.Stamp; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.model.Component; import net.fortuna.ical4j.model.component.VEvent; @@ -42,7 +39,6 @@ */ @Entity @DiscriminatorValue("event") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibEventStamp extends HibBaseEventStamp implements EventStamp { /** diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibMessageStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibMessageStamp.java index e74c1e8b..b0d34f7b 100644 --- a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibMessageStamp.java +++ b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibMessageStamp.java @@ -17,23 +17,20 @@ import java.io.Reader; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.unitedinternet.cosmo.model.Item; import org.unitedinternet.cosmo.model.MessageStamp; import org.unitedinternet.cosmo.model.QName; import org.unitedinternet.cosmo.model.Stamp; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; + /** * Hibernate persistent MessageStamp. */ @Entity @DiscriminatorValue("message") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibMessageStamp extends HibStamp implements MessageStamp { private static final long serialVersionUID = -6100568628972081120L; diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibTaskStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibTaskStamp.java index 6fcd222a..a63ebe6e 100644 --- a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibTaskStamp.java +++ b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibTaskStamp.java @@ -15,23 +15,20 @@ */ package org.unitedinternet.cosmo.model.hibernate; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.unitedinternet.cosmo.model.Item; import org.unitedinternet.cosmo.model.QName; import org.unitedinternet.cosmo.model.Stamp; import org.unitedinternet.cosmo.model.TaskStamp; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; + /** * Hibernate persistent TaskStamp. */ @Entity @DiscriminatorValue("task") -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class HibTaskStamp extends HibStamp implements TaskStamp { private static final long serialVersionUID = -6197756070431706553L; diff --git a/cosmo-core/src/test/unit/resources/application-test.yaml b/cosmo-core/src/test/unit/resources/application-test.yaml index 489e9032..ce6838b0 100644 --- a/cosmo-core/src/test/unit/resources/application-test.yaml +++ b/cosmo-core/src/test/unit/resources/application-test.yaml @@ -59,13 +59,11 @@ spring: datasource: url: jdbc:mariadb://localhost:33060/test?autoReconnect=true username: root - password: - driver-class-name: org.mariadb.jdbc.Driver + password: hikari: maximum-pool-size: 10 jpa: - properties: - hibernate.dialect: org.hibernate.dialect.MariaDB103Dialect + properties: hibernate.cache.use_query_cache: false hibernate.cache.use_second_level_cache: false hibernate.show_sql: false diff --git a/cosmo-webapp/pom.xml b/cosmo-webapp/pom.xml index 1c0c223b..b4c5a1ba 100644 --- a/cosmo-webapp/pom.xml +++ b/cosmo-webapp/pom.xml @@ -5,7 +5,7 @@ cosmo-multimodule net.oneandone.cosmo - 6.0.2 + 7.0.0-SNAPSHOT 4.0.0 @@ -17,7 +17,7 @@ net.oneandone.cosmo cosmo-core - 6.0.2 + 7.0.0-SNAPSHOT diff --git a/cosmo-webapp/src/main/resources/application.yaml b/cosmo-webapp/src/main/resources/application.yaml index 2708cabb..b8b28213 100644 --- a/cosmo-webapp/src/main/resources/application.yaml +++ b/cosmo-webapp/src/main/resources/application.yaml @@ -70,7 +70,6 @@ spring: maximum-pool-size: 10 jpa: properties: - hibernate.dialect: org.hibernate.dialect.MariaDB103Dialect hibernate.cache.use_query_cache: false hibernate.cache.use_second_level_cache: false hibernate.show_sql: false diff --git a/pom.xml b/pom.xml index 2e514c4c..e1a15ca4 100644 --- a/pom.xml +++ b/pom.xml @@ -10,15 +10,9 @@ 4.0.0 - - net.oneandone.maven.poms - foss-parent - 1.6.1 - - net.oneandone.cosmo cosmo-multimodule - 6.0.3-SNAPSHOT + 7.0.0-SNAPSHOT pom @@ -33,32 +27,22 @@ false UTF-8 - 3.1.0 - 5.8.3 - 6.2.2.Final - 8.0.0.Final - - 2.2.4 + 3.3.1 + 3.0.1 3.2.14 - 1.9.2 - 2.0.7 - 1.4.8 + 1.9.22.1 - 3.1.4 - 2.12.0 + 3.4.0 + 2.12.2 1.6.1 1.0.1 4.0.6 - 4.5.12 - 2.11.0 - 1.1.3 - 5.9.2 - - 4.7.3.4 - 3.6.0 + 2.17.2 + 1.1.3 + 5.10.3 true @@ -69,6 +53,18 @@ false true + + 4.7.3.4 + 3.6.0 + 2.5.3 + 3.0.1 + 3.0.1 + 1.6 + 3.0 + 3.2.5 + 3.4.0 + 3.13.0 + @@ -123,7 +119,7 @@ dev.atchison.mariaDB4j mariaDB4j test - 2.7.1 + 2.7.2 @@ -147,6 +143,10 @@ org.slf4j slf4j-log4j12 + + commons-codec + commons-codec + @@ -165,38 +165,7 @@ - - - - - org.hibernate.orm - hibernate-core - ${hibernate.core.version} - - - - org.hibernate.validator - hibernate-validator - ${hibernate-validator.version} - - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - runtime - - - org.springframework - spring-expression - - - commons-logging - commons-logging - - - - + org.aspectj aspectjweaver @@ -228,6 +197,10 @@ commons-logging commons-logging + + commons-codec + commons-codec + org.apache.geronimo.specs geronimo-activation_1.1_spec @@ -247,44 +220,17 @@ commons-logging commons-logging + + commons-codec + commons-codec + org.apache.geronimo.specs geronimo-activation_1.1_spec - - - - org.slf4j - jcl-over-slf4j - runtime - ${slf4j.version} - - - org.slf4j - slf4j-api - compile - ${slf4j.version} - - - - ch.qos.logback - logback-classic - runtime - ${logback.version} - - - ch.qos.logback - logback-core - runtime - ${logback.version} - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - + com.fasterxml.jackson.core jackson-core @@ -295,6 +241,17 @@ jackson-databind ${jackson.version} + + + org.apache.commons + commons-text + 1.12.0 + + + commons-io + commons-io + 2.16.1 + @@ -312,6 +269,7 @@ org.apache.maven.plugins maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} true checkstyle-suppressions.xml @@ -321,6 +279,7 @@ com.mycila license-maven-plugin + ${maven-license-plugin.version}
${maven-license-plugin.header}
false @@ -332,19 +291,13 @@ SLASHSTAR_STYLE - - - - net.oneandone.maven.poms - foss-configs - ${foss-configs.version} - - + org.apache.maven.plugins maven-javadoc-plugin + ${maven-javadoc-plugin.version} none true @@ -353,14 +306,35 @@ org.apache.maven.plugins - maven-compiler-plugin + maven-compiler-plugin + ${maven-compiler-plugin.version} true -parameters - + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + true + + + forked-path + true + + + @@ -383,5 +357,79 @@ https://github.com/1and1/ HEAD + + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + com.mycila + license-maven-plugin + + + + check + + + + + + + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + danielgrigore + Daniel Grigore + 1 & 1 Internet AG + ${project.url} + https://github.com/danielgrigore + +1 + + developer + + + +