Skip to content

Commit 5115cda

Browse files
Merge branch 'develop' into 170-mavenCahing
2 parents c582c54 + 7b12b8d commit 5115cda

File tree

8 files changed

+16
-12
lines changed

8 files changed

+16
-12
lines changed

.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
build:
1818
name: Build
1919
runs-on: ubuntu-latest
20-
timeout-minutes: 15
20+
timeout-minutes: 30
2121

2222
steps:
2323
- name: Checkout

.github/workflows/release-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
push_to_registry:
1313
name: Build and publish
1414
runs-on: ubuntu-latest
15-
timeout-minutes: 15
15+
timeout-minutes: 30
1616

1717
steps:
1818
- name: Checkout

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
build:
2222
name: SonarCloud
2323
runs-on: ubuntu-latest
24-
timeout-minutes: 15
24+
timeout-minutes: 30
2525

2626
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
2727
steps:

app/src/main/docker/Dockerfile.jvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
2222
#
2323
###
24-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090
2525

2626
ARG JAVA_PACKAGE=java-17-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

app/src/main/docker/Dockerfile.native

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# docker run -i --rm -p 8080:8080 quarkus/app
1515
#
1616
###
17-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ SPDX-License-Identifier: Apache-2.0
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121

22-
<compiler-plugin.version>3.10.1</compiler-plugin.version>
23-
<surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
22+
<compiler-plugin.version>3.11.0</compiler-plugin.version>
23+
<surefire-plugin.version>3.0.0</surefire-plugin.version>
2424
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2525

2626
<compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
2727
<compas.core.version>0.12.0</compas.core.version>
2828

29-
<quarkus.platform.version>2.16.3.Final</quarkus.platform.version>
30-
<log4j2.version>2.19.0</log4j2.version>
29+
<quarkus.platform.version>2.16.5.Final</quarkus.platform.version>
30+
<log4j2.version>2.20.0</log4j2.version>
3131
<openpojo.version>0.9.1</openpojo.version>
32+
<maven.compiler.source>17</maven.compiler.source>
33+
<maven.compiler.target>17</maven.compiler.target>
3234
</properties>
3335

3436
<modules>
@@ -173,6 +175,8 @@ SPDX-License-Identifier: Apache-2.0
173175
<version>${compiler-plugin.version}</version>
174176
<configuration>
175177
<parameters>${maven.compiler.parameters}</parameters>
178+
<meminitial>2024m</meminitial>
179+
<maxmem>4024m</maxmem>
176180
</configuration>
177181
</plugin>
178182

riseclipse/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ SPDX-License-Identifier: Apache-2.0
3636
<log4j.version>1.2.19</log4j.version>
3737
<javax.inject.version>1.0.0</javax.inject.version>
3838

39-
<riseclipse.main.version>1.2.6</riseclipse.main.version>
40-
<riseclipse.scl.version>1.2.5</riseclipse.scl.version>
39+
<riseclipse.main.version>1.2.7</riseclipse.main.version>
40+
<riseclipse.scl.version>1.2.6</riseclipse.scl.version>
4141

4242
<riseclipse.p2.root>${project.basedir}/riseclipse-p2-to-m2</riseclipse.p2.root>
4343
</properties>

riseclipse/riseclipse-p2-to-m2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SPDX-License-Identifier: Apache-2.0
2929
<plugin>
3030
<groupId>org.eclipse.tycho.extras</groupId>
3131
<artifactId>tycho-eclipserun-plugin</artifactId>
32-
<version>3.0.2</version>
32+
<version>3.0.4</version>
3333
<configuration>
3434
<work>${project.build.directory}/maven/tmp/cbi</work>
3535
<executionEnvironment>JavaSE-17</executionEnvironment>

0 commit comments

Comments
 (0)