Skip to content

Commit

Permalink
Korjattu riippuvuuksien versionumerot ja enabloitu enforcer
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkorri
jkorri committed Jan 5, 2024
1 parent 82249b4 commit c061146
Show file tree
Hide file tree
Showing 15 changed files with 239 additions and 162 deletions.
1 change: 0 additions & 1 deletion kirjasto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
<artifactId>java-cas</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Expand Down
13 changes: 5 additions & 8 deletions lambdat/ajastus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,18 @@
</properties>

<dependencies>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>skannaus</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-core</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sqs</artifactId>
<version>2.20.149</version>
</dependency>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>skannaus</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand All @@ -40,7 +38,6 @@
<dependency>
<groupId>io.github.crac</groupId>
<artifactId>org-crac</artifactId>
<version>0.1.3</version>
</dependency>
</dependencies>

Expand Down
16 changes: 4 additions & 12 deletions lambdat/lahetys/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,42 +26,34 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-core</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-events</artifactId>
<version>3.11.3</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sqs</artifactId>
<version>2.20.149</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>lambda</artifactId>
<version>2.20.149</version>
</dependency>
<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>simple-java-mail</artifactId>
<version>8.3.1</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.20.149</version>
</dependency>

<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>simple-java-mail</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>io.github.crac</groupId>
<artifactId>org-crac</artifactId>
<version>0.1.3</version>
</dependency>
</dependencies>

Expand Down
3 changes: 0 additions & 3 deletions lambdat/migraatio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-core</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand All @@ -35,8 +34,6 @@
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<!-- myöhemmät versiot eivät toimi testeissä, katso: https://github.com/flyway/flyway/issues/3672 -->
<version>9.16.3</version>
</dependency>
</dependencies>

Expand Down
52 changes: 5 additions & 47 deletions lambdat/raportointi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
</properties>

<dependencies>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>shared</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws.serverless</groupId>
<artifactId>aws-serverless-java-container-springboot3</artifactId>
<version>2.0.0-M2</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand All @@ -34,37 +37,26 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas</artifactId>
<version>6.1.4</version>
</dependency>

<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
<artifactId>opintopolku-user-details-service</artifactId>
<!-- Päivitä !!! -->
<version>0.3.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
<artifactId>opintopolku-cas-servlet-filter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_3</artifactId>
<version>2.15.2</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
Expand All @@ -76,56 +68,22 @@
<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
<artifactId>java-cas</artifactId>
<version>1.0.8-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>shared</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.2.0</version>
<exclusions>
<!-- swagger-ui asuu S3:ssa -->
<exclusion>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>4.3.2</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>2.15.2</version>
</dependency>

<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.20.149</version>
</dependency>

<dependency>
<groupId>io.github.crac</groupId>
<artifactId>org-crac</artifactId>
<version>0.1.3</version>
</dependency>

<!-- needed for email validation -->
Expand Down
3 changes: 0 additions & 3 deletions lambdat/siivous/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,14 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-core</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-events</artifactId>
<version>3.11.3</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.20.149</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
4 changes: 2 additions & 2 deletions lambdat/skannaus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>2.15.2</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_3</artifactId>
<version>2.15.2</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
4 changes: 2 additions & 2 deletions lambdat/tilapaivitys/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>2.15.2</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_3</artifactId>
<version>2.15.2</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
63 changes: 9 additions & 54 deletions lambdat/vastaanotto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
</properties>

<dependencies>
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>shared</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws.serverless</groupId>
<artifactId>aws-serverless-java-container-springboot3</artifactId>
<version>2.0.0-M2</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand All @@ -34,37 +37,30 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas</artifactId>
<version>6.1.4</version>
</dependency>

<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
<artifactId>opintopolku-user-details-service</artifactId>
<!-- Päivitä !!! -->
<version>0.3.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
<artifactId>opintopolku-cas-servlet-filter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_3</artifactId>
<version>2.15.2</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
Expand All @@ -76,63 +72,22 @@
<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
<artifactId>java-cas</artifactId>
<version>1.0.8-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>shared</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.2.0</version>
<exclusions>
<!-- swagger-ui asuu S3:ssa -->
<exclusion>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>4.3.2</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>2.15.2</version>
</dependency>

<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.20.149</version>
</dependency>

<dependency>
<groupId>io.github.crac</groupId>
<artifactId>org-crac</artifactId>
<version>0.1.3</version>
</dependency>

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

Expand Down
1 change: 0 additions & 1 deletion lambdat/vastaanotto/src/main/scala/fi/oph/viestinvalitys/vastaanotto/model/Lahetys.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package fi.oph.viestinvalitys.vastaanotto.model

import com.fasterxml.jackson.module.scala.JsonScalaEnumeration
import Lahetys.*
import io.swagger.v3.oas.annotations.media.Schema
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode
Expand Down
Loading

0 comments on commit c061146

Please sign in to comment.