Merge branch 'refs/heads/master' into querydsl

orekyuu · orekyuu · commit cfa28316fd78 · 2024-11-17T21:33:21.000+09:00
# Conflicts:
#	gradle.properties
#	pom.xml
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.seasar.doma
 version=1.0
 quarkusVersion=3.16.3
-quarkusDomaVersion=0.0.12
+quarkusDomaVersion=0.0.11
 domaVersion=3.1.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/pom.xml b/pom.xml
@@ -12,9 +12,9 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>3.16.3</quarkus.platform.version>
-        <quarkus-doma.version>0.0.12</quarkus-doma.version>
+        <quarkus-doma.version>0.0.11</quarkus-doma.version>
         <doma.version>3.1.0</doma.version>
-        <surefire-plugin.version>3.5.0</surefire-plugin.version>
+        <surefire-plugin.version>3.5.2</surefire-plugin.version>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>
         <docker-plugin.version>0.28.0</docker-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
@@ -21,7 +21,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/hibernate-orm-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1086 
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1130 
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/hibernate-orm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1086
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1130
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/hibernate-orm-jvm`
`22`	`22`	`#`
`23`	`23`	`###`
`24`		`-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1086`
	`24`	`+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1130`
`25`	`25`
`26`	`26`	`ARG JAVA_PACKAGE=java-11-openjdk-headless`
`27`	`27`	`ARG RUN_JAVA_VERSION=1.3.8`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`# docker run -i --rm -p 8080:8080 quarkus/hibernate-orm`
`15`	`15`	`#`
`16`	`16`	`###`
`17`		`-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1086`
	`17`	`+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1130`
`18`	`18`	`WORKDIR /work/`
`19`	`19`	`RUN chown 1001 /work \`
`20`	`20`	`&& chmod "g+rwX" /work \`