Skip to content

Commit

Permalink
Upgrade to runtime 0.0.2 - Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
EugenMayer committed Oct 29, 2023
1 parent d2aae60 commit 0ad7dd0
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
IMAGE_FQDN: ghcr.io/eugenmayer/kontextwork-converter
BASE_IMAGE_VERSION: 0.0.1
BASE_IMAGE_VERSION: 0.0.2

jobs:
docker:
Expand Down
2 changes: 1 addition & 1 deletion .run/ConverterApplication.run.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ConverterApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="officeconverter.main" />
<module name="de.kontextwork.officeconverter.main" />
<option name="SPRING_BOOT_MAIN_CLASS" value="de.kontextwork.converter.ConverterApplication" />
<method v="2">
<option name="Make" enabled="true" />
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE_VERSION=0.0.1
ARG BASE_IMAGE_VERSION=0.0.2
# ------------------------- builder
FROM bellsoft/liberica-openjdk-debian:17 as builder
RUN mkdir -p /src
Expand Down
26 changes: 12 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
buildscript {
ext.kotlin_version = '1.8.0'
ext.kotlin_version = '1.9.10'
ext {
// @see https://mvnrepository.com/artifact/org.jodconverter/jodconverter-local
jodconverterVersion = '4.4.6'

// @see https://mvnrepository.com/artifact/org.mockito/mockito-core
mockitoVersion = '5.3.1'
mockitoVersion = '5.6.0'

// @see https://mvnrepository.com/artifact/org.apache.tika/tika-parsers
tikaVersion = '2.8.0'
tikaVersion = '2.9.1'

// @see https://mvnrepository.com/artifact/org.projectlombok/lombok
lombokVersion = '1.18.26'
lombokVersion = '1.18.30'

// @see https://mvnrepository.com/artifact/commons-io/commons-io
commonsIo = '2.12.0'
commonsIo = '2.15.0'

// javax.annotation needed when compiling against > Java 8 since it is no longer included
// @see https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api
javaxAnnotations = '1.3.2'

// @see https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime
jaxb = "4.0.1"
jaxb = "4.0.4"
}
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}

ext['log4j2.version'] = '2.20.0'
}

plugins {
Expand All @@ -42,18 +40,18 @@ plugins {

// @see https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
// changing that will upgrade spring to the corresponding version
id 'org.springframework.boot' version '3.0.6'
id 'org.springframework.boot' version '3.1.5'

// much better output during running tests
// see https://github.com/radarsh/gradle-test-logger-plugin for configuration options
id "com.adarshr.test-logger" version "3.2.0"
id "com.adarshr.test-logger" version "4.0.0"

// @see https://plugins.gradle.org/plugin/org.sonarqube
id "org.sonarqube" version "3.5.0.2730"
id "org.sonarqube" version "4.4.1.3373"

id "org.jetbrains.kotlin.jvm" version "1.8.21"
id "org.jetbrains.kotlin.plugin.allopen" version "1.8.21"
id "org.jetbrains.kotlin.plugin.spring" version "1.8.21"
id "org.jetbrains.kotlin.jvm" version "1.9.10"
id "org.jetbrains.kotlin.plugin.allopen" version "1.9.10"
id "org.jetbrains.kotlin.plugin.spring" version "1.9.10"
}

apply plugin: 'io.spring.dependency-management'
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {

"org.jetbrains.kotlin:kotlin-reflect",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8",
'org.apache.logging.log4j:log4j-api-kotlin:1.2.0'
'org.apache.logging.log4j:log4j-api-kotlin:1.3.0'
)

testImplementation(
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down

0 comments on commit 0ad7dd0

Please sign in to comment.