Skip to content

Commit

Permalink
Merge pull request #21 from IDSIA/dev
Browse files Browse the repository at this point in the history
Version 1.6.1
  • Loading branch information
cbonesana authored Mar 30, 2023
2 parents 9b4c23a + 193733e commit 06ea506
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions AdapQuestBackend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>adapquest</artifactId>
<groupId>ch.idsia.adaptive</groupId>
<version>1.6</version>
<version>1.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -27,7 +27,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.1.1.RELEASE</version>
<version>2.7.10</version>
<configuration>
<fork>true</fork>
<mainClass>ch.idsia.adaptive.backend.AdapQuestBackend</mainClass>
Expand All @@ -49,7 +49,7 @@
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.7.3</version>
<version>2.7.10</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -178,13 +178,13 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.5.0</version>
<version>42.6.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.30</version>
<version>8.0.32</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
Expand Down
2 changes: 1 addition & 1 deletion AdapQuestExchange/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>adapquest</artifactId>
<groupId>ch.idsia.adaptive</groupId>
<version>1.6</version>
<version>1.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion AdapQuestExperiments/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>adapquest</artifactId>
<groupId>ch.idsia.adaptive</groupId>
<version>1.6</version>
<version>1.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build stage
FROM maven:3.6.3-openjdk-11-slim AS build
FROM maven:3.8.7-openjdk-18-slim AS build

# create working directory for building
WORKDIR /build
Expand All @@ -20,7 +20,7 @@ COPY AdapQuestExperiments/src AdapQuestExperiments/src
RUN mvn clean install package -Dmaven.test.skip

# Package stage
FROM openjdk:11-jre-slim
FROM openjdk:18.0-slim

# create app directory
WORKDIR /adaptive
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>ch.idsia.adaptive</groupId>
<artifactId>adapquest</artifactId>
<packaging>pom</packaging>
<version>1.6</version>
<version>1.6.1</version>
<modules>
<module>AdapQuestBackend</module>
<module>AdapQuestExchange</module>
Expand All @@ -18,7 +18,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<adapquest.version>1.6</adapquest.version>
<adapquest.version>1.6.1</adapquest.version>
</properties>

<build>
Expand Down

0 comments on commit 06ea506

Please sign in to comment.