Skip to content

Commit

Permalink
Poistettu spring-boot-starter parent-projekti
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkorri
jkorri committed Jan 9, 2024
1 parent 2c818ac commit d4db307
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 36 deletions.
23 changes: 20 additions & 3 deletions integraatio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,25 @@
<artifactId>integraatio</artifactId>
<packaging>jar</packaging>
<name>integraatio</name>
<version>${project.parent.version}</version>
<version>0.1-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
Expand Down Expand Up @@ -67,12 +80,16 @@
<artifactId>jakarta.activation</artifactId>
</dependency>

<!-- Nämä riippuvuudet on poistettu varsinaisesta jar:sta koon pienentämiseksi -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
Expand Down
25 changes: 18 additions & 7 deletions lambdat/raportointi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,25 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>lahetysrajapinta</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>shared</artifactId>
Expand Down Expand Up @@ -85,13 +103,6 @@
<groupId>io.github.crac</groupId>
<artifactId>org-crac</artifactId>
</dependency>

<!-- needed for email validation -->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.7</version>
</dependency>
</dependencies>

<build>
Expand Down
17 changes: 13 additions & 4 deletions lambdat/vastaanotto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
Expand Down Expand Up @@ -95,10 +108,6 @@
<groupId>io.github.crac</groupId>
<artifactId>org-crac</artifactId>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
66 changes: 44 additions & 22 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,12 @@
<module>lambdat/siivous</module>
</modules>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.1</version>
</parent>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<encoding>UTF-8</encoding>
<scala.version>3.3.1</scala.version>
<spring.boot.version>3.2.1</spring.boot.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -163,7 +158,6 @@
<artifactId>uuid-creator</artifactId>
<version>5.3.5</version>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
Expand Down Expand Up @@ -197,6 +191,11 @@
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand All @@ -217,6 +216,21 @@
<artifactId>jakarta.activation</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -226,19 +240,7 @@
<artifactId>scala3-library_3</artifactId>
<version>${scala.version}</version>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>lambda</artifactId>
<version>2.20.149</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand All @@ -248,6 +250,29 @@
</dependencies>

<build>
<!-- Tämä tarvitaan jotta integraatiomoduuli pystyy käyttämään shade-pluginilla tehtyjä vastaanotto- ja raportointi-riippuvuuksia -->
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<!-- see http://davidb.github.com/scala-maven-plugin -->
Expand Down Expand Up @@ -283,7 +308,6 @@
<skip>true</skip>
</configuration>
</plugin>

<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
Expand All @@ -305,8 +329,6 @@
</execution>
</executions>
</plugin>


</plugins>
</build>

Expand Down

0 comments on commit d4db307

Please sign in to comment.