Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
schnatterer committed Oct 21, 2022
1 parent cdca960 commit c50bdab
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
5 changes: 4 additions & 1 deletion Dockerfile
@@ -1,11 +1,14 @@
ARG ENV=prod

# Keep all of them in sync with the versions in pom.xml
ARG JDK_VERSION='17'
ARG GROOVY_VERSION='3.0.13'
ARG GRAAL_VERSION='22.1.0'

FROM alpine:3.16.2 as alpine

FROM ghcr.io/graalvm/graalvm-ce:ol8-java${JDK_VERSION}-22.1.0 AS graal
# Keep in sync with the version in pom.xml
FROM ghcr.io/graalvm/graalvm-ce:ol8-java${JDK_VERSION}-${GRAAL_VERSION} AS graal

FROM graal as maven-cache
ENV MAVEN_OPTS=-Dmaven.repo.local=/mvn
Expand Down
22 changes: 13 additions & 9 deletions pom.xml
Expand Up @@ -10,15 +10,18 @@
<parent>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-parent</artifactId>
<version>3.4.0</version>
<!-- When updating, also update groovyVersion -->
<version>3.7.2</version>
</parent>

<properties>
<packaging>jar</packaging>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- This version seems to depend on the one used by micronaut-inject-groovy! -->
<groovyVersion>3.0.9</groovyVersion>
<!-- Keep in sync with the version in Dockerfile -->
<groovyVersion>3.0.13</groovyVersion>
<mockitoVersion>4.8.0</mockitoVersion>
<exec.mainClass>com.cloudogu.gitops.cli.GitopsPlaygroundCliMain</exec.mainClass>
</properties>

Expand Down Expand Up @@ -107,7 +110,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
<version>5.6.2</version>
<version>5.7.3</version>
</dependency>
<dependency>
<!-- Avoids java.lang.NoClassDefFoundError: org/apache/commons/logging/Log-->
Expand Down Expand Up @@ -139,35 +142,35 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.3.1</version>
<version>${mockitoVersion}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>4.3.1</version>
<version>${mockitoVersion}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-yaml</artifactId>
<version>3.0.10</version>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.22.0</version>
<version>3.23.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.10.3</version>
<version>2.13.4</version>
<scope>test</scope>
</dependency>

Expand All @@ -182,7 +185,8 @@
<dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>22.0.0.2</version>
<!-- Keep in sync with version in Dockerfile-->
<version>22.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit c50bdab

Please sign in to comment.