Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates to build (dependabot reported) and other stuff #951

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Updates to build (dependabot reported) and other stuff #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3653817
Update most comment (dependabot reported) and other stuff
cstamas Apr 19, 2024
13e61a1
Sort out plugins, use defs from parent
cstamas Apr 19, 2024
cb7c886
Some cleanup and deps (non key ones)
cstamas Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions build-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@
<maven.compiler.source>11</maven.compiler.source>

<roaster.version>2.28.0.Final</roaster.version>
<maven.version>3.9.0</maven.version>
<maven.plugin-tools.version>3.9.0</maven.plugin-tools.version>
<maven-plugin-plugin.version>3.9.0</maven-plugin-plugin.version>
<maven.version>3.9.6</maven.version>
<maven.plugin-tools.version>3.12.0</maven.plugin-tools.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -82,7 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${maven-plugin-plugin.version}</version>
<version>${maven.plugin-tools.version}</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
5 changes: 3 additions & 2 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
org/junit/jupiter/junit-jupiter/${junit.jupiter.version}
org/junit/jupiter/junit-jupiter-api/${junit.jupiter.version}</preinstall.artifacts>

<testcontainers.version>1.19.7</testcontainers.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -97,13 +98,13 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.18.1</version>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.18.1</version>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>extract</id>
Expand Down Expand Up @@ -96,7 +96,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
<executions>
<execution>
<id>add-unpacked-source-dir</id>
Expand Down
66 changes: 12 additions & 54 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@

<!-- dependency versions a..z -->
<apiguardian-api.version>1.0.0</apiguardian-api.version>
<assertj.version>3.24.2</assertj.version>
<assertj.version>3.25.3</assertj.version>
<commons-compress.version>1.26.1</commons-compress.version>
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
<graalvm.version>22.3.1</graalvm.version>
<graalvm.plugin.version>0.9.23</graalvm.plugin.version>
<groovy.version>4.0.13</groovy.version>
<graalvm.plugin.version>0.10.1</graalvm.plugin.version>
<groovy.version>4.0.21</groovy.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jansi.version>2.4.0</jansi.version>
<jline.version>3.24.0</jline.version>
<jansi.version>2.4.1</jansi.version>
<jline.version>3.25.1</jline.version>
<maven.version>4.0.0-alpha-8</maven.version>
<maven3.version>3.9.6</maven3.version>
<maven4.version>${maven.version}</maven4.version>
Expand All @@ -97,22 +97,15 @@

<!-- plugin versions a..z -->
<buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
<compiler.version>3.11.0</compiler.version>
<groovy-maven-plugin.version>3.0.0</groovy-maven-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
<maven-shade-plugin.version>3.5.0</maven-shade-plugin.version>
<mrm.version>1.5.0</mrm.version>
<surefire.version>3.2.2</surefire.version>
<groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
<mrm.version>1.6.0</mrm.version>
<junit-platform-launcher.version>1.3.2</junit-platform-launcher.version>
<release.plugin.version>3.0.1</release.plugin.version>
<takari-provisio.version>1.0.20</takari-provisio.version>
<takari-provisio.version>1.0.23</takari-provisio.version>

<javassist.version>3.29.2-GA</javassist.version>
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
<xstream.version>1.4.20</xstream.version>
<plexus-interactivity-api.version>1.0</plexus-interactivity-api.version>
<takari-smart-builder.version>0.6.4</takari-smart-builder.version>
<plexus-interactivity-api.version>1.3</plexus-interactivity-api.version>
<takari-smart-builder.version>0.6.5</takari-smart-builder.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -347,12 +340,9 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.40.0</version>
<configuration>
<java>
<palantirJavaFormat>
<version>2.38.0</version>
</palantirJavaFormat>
<palantirJavaFormat />
<includes>
<include>src/main/java/**/*.java</include>
<include>src/main/java-fallback/**/*.java</include>
Expand Down Expand Up @@ -395,36 +385,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
Expand Down Expand Up @@ -456,7 +416,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${release.plugin.version}</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<autoVersionSubmodules>true</autoVersionSubmodules>
Expand All @@ -476,7 +435,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -579,7 +538,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>create-source-distribution</id>
Expand Down