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.

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

Jump to bottom

feat: update spring-boot to 3.3.1 #86

Merged
merged 10 commits into from
Jul 11, 2024
Merged

feat: update spring-boot to 3.3.1 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd586e3
feat: update spring-boot to 3.3.1
danielgrigore Jul 10, 2024
4a854b1
Update maven.yml
danielgrigore Jul 10, 2024
0a7d42d
chore: set maven version
danielgrigore Jul 10, 2024
04f5fd3
chore: format xml
danielgrigore Jul 10, 2024
b127f54
chore: update versions
danielgrigore Jul 10, 2024
a3b1e1c
chore: use setuo-java v.4.2.1
danielgrigore Jul 10, 2024
111081d
fix: use setup-maven-action
danielgrigore Jul 10, 2024
3331d47
chore: remove logback versions
danielgrigore Jul 11, 2024
2ff6c2b
chore: library updates
danielgrigore Jul 11, 2024
33fe956
chore: remove hibernate/validator versions
danielgrigore Jul 11, 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
10 changes: 6 additions & 4 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-[email protected]
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
11 changes: 2 additions & 9 deletions 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>6.0.3-SNAPSHOT</version>
<version>7.0.0-SNAPSHOT</version>
</parent>

<artifactId>cosmo-api</artifactId>
Expand All @@ -24,7 +24,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
Expand All @@ -34,13 +33,7 @@
<!-- ical4j related libs -->
<dependency>
<groupId>org.mnode.ical4j</groupId>
<artifactId>ical4j</artifactId>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
<artifactId>ical4j</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
Expand Down
76 changes: 11 additions & 65 deletions cosmo-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,12 @@
<parent>
<groupId>net.oneandone.cosmo</groupId>
<artifactId>cosmo-multimodule</artifactId>
<version>6.0.3-SNAPSHOT</version>
<version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cosmo-core</artifactId>


<properties>
<maven-resources-plugin.version>2.5</maven-resources-plugin.version>
<maven-eclipse-plugin.version>2.8</maven-eclipse-plugin.version>
<maven-clean-plugin.version>2.1.1</maven-clean-plugin.version>
<maven-war-plugin.version>2.2</maven-war-plugin.version>
<maven-assembly-plugin.version>2.2.2</maven-assembly-plugin.version>
<maven-pmd-plugin.failOnViolation>false</maven-pmd-plugin.failOnViolation>

</properties>


<dependencies>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand Down Expand Up @@ -61,44 +48,27 @@
<!-- Apache commons -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.11.0</version>
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>


<!-- Logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>

<!-- XML processing -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<!-- <dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency> -->

<!-- Databases -->
<dependency>
<groupId>org.mariadb.jdbc</groupId>
Expand All @@ -119,36 +89,18 @@
parsing eTags. -->
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
<artifactId>abdera-core</artifactId>
</dependency>

<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-i18n</artifactId>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
<artifactId>abdera-i18n</artifactId>
</dependency>

<!-- ical4j related libs -->
<dependency>
<groupId>org.mnode.ical4j</groupId>
<artifactId>ical4j</artifactId>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
<artifactId>ical4j</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -217,18 +169,12 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
<artifactId>junit-jupiter</artifactId>
</dependency>

</dependencies>
Expand Down
8 changes: 2 additions & 6 deletions ...re/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibCalendarCollectionStamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
8 changes: 2 additions & 6 deletions ...o-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventExceptionStamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
8 changes: 2 additions & 6 deletions cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventStamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -42,7 +39,6 @@
*/
@Entity
@DiscriminatorValue("event")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class HibEventStamp extends HibBaseEventStamp implements EventStamp {

/**
Expand Down
9 changes: 3 additions & 6 deletions cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibMessageStamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 3 additions & 6 deletions cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibTaskStamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions cosmo-core/src/test/unit/resources/application-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cosmo-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>cosmo-multimodule</artifactId>
<groupId>net.oneandone.cosmo</groupId>
<version>6.0.2</version>
<version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>net.oneandone.cosmo</groupId>
<artifactId>cosmo-core</artifactId>
<version>6.0.2</version>
<version>7.0.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
1 change: 0 additions & 1 deletion cosmo-webapp/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading