Skip to content

Commit

Permalink
Merge pull request #294 from Opetushallitus/EH-1715
Browse files Browse the repository at this point in the history 
EH-1715: kirjastojen päivitys
  • Loading branch information
@tomikat
tomikat authored Dec 2, 2024
2 parents 382283e + 2c14f9c commit 903a863
Show file tree
Hide file tree
Showing 8 changed files with 265 additions and 99 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- name: Install Dependencies
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash
run: |
git clone https://github.com/Opetushallitus/ci-tools.git
lein deps
- name: Run tests
run: lein test

- name: Static checks
run: lein checkall
1 change: 1 addition & 0 deletions .java-version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17.0
2 changes: 1 addition & 1 deletion cdk/lib/heratepalvelu.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class HeratepalveluStack extends Stack {
stage: envName
};

this.runtime = lambda.Runtime.JAVA_11;
this.runtime = lambda.Runtime.JAVA_17;
}

createErrorMetricFilter = (stack: string, logGroup: LogGroup) => {
Expand Down
200 changes: 158 additions & 42 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<url>https://github.com/Opetushallitus/heratepalvelu</url>
<connection>scm:git:git://github.com/Opetushallitus/heratepalvelu.git</connection>
<developerConnection>scm:git:ssh://git@github.com/Opetushallitus/heratepalvelu.git</developerConnection>
<tag>86dfeca443fdbb97cdd21ad7239c209a09878ccb</tag>
<tag>fefbffd671ea41caa1c43994c14ef47638779f20</tag>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
Expand All @@ -29,8 +29,8 @@
<directory>resources</directory>
</testResource>
</testResources>
<directory>target/default</directory>
<outputDirectory>target/default/classes</outputDirectory>
<directory>target</directory>
<outputDirectory>target/classes</outputDirectory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -97,44 +97,174 @@
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.logging</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>core.memoize</artifactId>
<version>1.1.266</version>
</dependency>
<dependency>
<groupId>environ</groupId>
<artifactId>environ</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>clj-http</groupId>
<artifactId>clj-http</artifactId>
<version>3.13.0</version>
</dependency>
<dependency>
<groupId>cheshire</groupId>
<artifactId>cheshire</artifactId>
<version>5.12.0</version>
</dependency>
<dependency>
<groupId>clj-time</groupId>
<artifactId>clj-time</artifactId>
<version>0.15.2</version>
</dependency>
<dependency>
<groupId>clj-tuple</groupId>
<artifactId>clj-tuple</artifactId>
<version>0.2.2</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-recorder-sdk-core</artifactId>
<version>2.18.2</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-recorder-sdk-aws-sdk-v2</artifactId>
<version>2.18.2</version>
</dependency>
<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>2.2.9</version>
</dependency>
<dependency>
<groupId>dev.weavejester</groupId>
<artifactId>medley</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>aws-core</artifactId>
<version>2.10.56</version>
<version>2.29.21</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.43.Final</version>
<groupId>software.amazon.awssdk</groupId>
<artifactId>dynamodb</artifactId>
<version>2.29.21</version>
</dependency>
<dependency>
<groupId>fi.vm.sade</groupId>
<artifactId>scala-cas_2.12</artifactId>
<version>2.2.2-SNAPSHOT</version>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ssm</artifactId>
<version>2.29.21</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.28</version>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sqs</artifactId>
<version>2.29.21</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.10.0</version>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.29.21</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.0</version>
<version>2.24.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.0</version>
<version>2.24.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.24.1</version>
</dependency>
<dependency>
<groupId>prismatic</groupId>
<artifactId>schema</artifactId>
<version>1.1.11</version>
</dependency>
<dependency>
<groupId>hiccup</groupId>
<artifactId>hiccup</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>fi.vm.sade</groupId>
<artifactId>scala-cas_2.12</artifactId>
<version>2.2.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
<version>8.13.49</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>data.json</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.43.Final</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>2.15.4</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.12</artifactId>
<version>2.5.16</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.17.0</version>
</dependency>
</dependencies>
Expand All @@ -143,112 +273,98 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>1.11.3</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.logging</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>core.memoize</artifactId>
<version>1.0.257</version>
</dependency>
<dependency>
<groupId>environ</groupId>
<artifactId>environ</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>clj-http</groupId>
<artifactId>clj-http</artifactId>
<version>3.10.0</version>
</dependency>
<dependency>
<groupId>cheshire</groupId>
<artifactId>cheshire</artifactId>
<version>5.8.1</version>
</dependency>
<dependency>
<groupId>clj-time</groupId>
<artifactId>clj-time</artifactId>
<version>0.15.1</version>
</dependency>
<dependency>
<groupId>clj-tuple</groupId>
<artifactId>clj-tuple</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-recorder-sdk-core</artifactId>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-recorder-sdk-aws-sdk-v2</artifactId>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-core</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-lambda-java-events</artifactId>
<version>2.2.7</version>
</dependency>
<dependency>
<groupId>dev.weavejester</groupId>
<artifactId>medley</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>dynamodb</artifactId>
<version>2.10.56</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ssm</artifactId>
<version>2.10.56</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sqs</artifactId>
<version>2.10.60</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>prismatic</groupId>
<artifactId>schema</artifactId>
<version>1.1.11</version>
</dependency>
<dependency>
<groupId>hiccup</groupId>
<artifactId>hiccup</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>oph</groupId>
<artifactId>clj-cas</artifactId>
<version>0.6.2-SNAPSHOT</version>
<groupId>fi.vm.sade</groupId>
<artifactId>scala-cas_2.12</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
<version>8.13.35</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>data.json</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
</project>
Expand Down
Loading

0 comments on commit 903a863

Please sign in to comment.