Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
KochTobi committed Oct 28, 2024
2 parents 684de64 + d5fa539 commit f1366d2
Show file tree
Hide file tree
Showing 30 changed files with 71 additions and 70 deletions.
2 changes: 1 addition & 1 deletion application-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>application-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion broadcasting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>broadcasting</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions domain-concept/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>domain-concept</artifactId>
Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.17.2</version>
<version>2.18.0</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions email-service-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<groupId>life.qbic.infrastructure</groupId>
Expand All @@ -21,13 +21,13 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>identity</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>project-management</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion finances-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<groupId>life.qbic.finances</groupId>
Expand Down
4 changes: 2 additions & 2 deletions finances-infrastructure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>finances-infrastructure</artifactId>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>finances</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions finances/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>finances</artifactId>
Expand Down Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>life.qbic.finances</groupId>
<artifactId>finances-api</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions identity-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<groupId>life.qbic.datamanager</groupId>
Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>application-commons</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions identity-infrastructure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<artifactId>identity-infrastructure</artifactId>
<dependencies>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>identity</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-jakarta-server</artifactId>
<version>2.37.0</version>
<version>2.38.0</version>
</dependency>

</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions identity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -45,25 +45,25 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>broadcasting</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>application-commons</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>logging</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>domain-concept</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -86,7 +86,7 @@
<dependency>
<groupId>life.qbic.datamanager</groupId>
<artifactId>identity-api</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions logging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>logging</artifactId>
Expand All @@ -26,12 +26,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.10</version>
<version>1.5.11</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.5.10</version>
<version>1.5.11</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -53,7 +53,7 @@
<dependency>
<groupId>life.qbic.logging</groupId>
<artifactId>subscription-api</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<name>Data Manager</name>
<version>1.4.0</version>
<version>1.5.0</version>
<modules>
<module>user-interface</module>
<module>identity</module>
Expand All @@ -30,12 +30,12 @@

<properties>
<java.version>17</java.version>
<vaadin.version>24.4.13</vaadin.version>
<vaadin.version>24.5.2</vaadin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson.version>2.17.2</jackson.version>
<jackson.version>2.18.0</jackson.version>
</properties>

<parent>
Expand Down Expand Up @@ -150,7 +150,7 @@
<dependency>
<groupId>org.jobrunr</groupId>
<artifactId>jobrunr-spring-boot-3-starter</artifactId>
<version>7.2.2</version>
<version>7.3.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -182,7 +182,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>3.0.2</version>
<version>4.0.1</version>
<executions>
<execution>
<id>default</id>
Expand Down Expand Up @@ -217,7 +217,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
<configuration>
<useModulePath>false</useModulePath>
<includes>
Expand Down
4 changes: 2 additions & 2 deletions project-management-infrastructure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<groupId>life.qbic.identity</groupId>
Expand All @@ -29,7 +29,7 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>project-management</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions project-management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>project-management</artifactId>
Expand Down Expand Up @@ -37,13 +37,13 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>application-commons</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>logging</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -54,7 +54,7 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>domain-concept</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -77,13 +77,13 @@
<dependency>
<groupId>life.qbic.datamanager</groupId>
<artifactId>identity-api</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>life.qbic.finances</groupId>
<artifactId>finances-api</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion subscription-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>life.qbic.logging</groupId>
Expand Down
4 changes: 2 additions & 2 deletions subscription-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>life.qbic.logging</groupId>
Expand All @@ -14,7 +14,7 @@
<dependency>
<groupId>life.qbic.logging</groupId>
<artifactId>subscription-api</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit f1366d2

Please sign in to comment.