Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# under the License.
wrapperVersion=3.3.2
distributionType=bin
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('hibernate-jenkins-pipeline-helpers@1.17') _
@Library('hibernate-jenkins-pipeline-helpers') _

import org.hibernate.jenkins.pipeline.helpers.version.Version

Expand All @@ -7,7 +7,7 @@ pipeline {
label 'Worker&&Containers'
}
tools {
maven 'Apache Maven 3.8'
maven 'Apache Maven 3.9'
jdk 'OpenJDK 17 Latest'
}
options {
Expand Down
6 changes: 3 additions & 3 deletions ci/release/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@Library('hibernate-jenkins-pipeline-helpers@1.17') _
@Library('hibernate-jenkins-pipeline-helpers') _

import org.hibernate.jenkins.pipeline.helpers.version.Version

pipeline {
agent {
label 'Worker&&Containers'
label 'Release'
}
tools {
maven 'Apache Maven 3.8'
maven 'Apache Maven 3.9'
jdk 'OpenJDK 17 Latest'
}
options {
Expand Down
20 changes: 18 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<develocity-maven-extension.version>1.23</develocity-maven-extension.version>
<!--
When updating maven version:
- Adjust the Jenkins files to reference the same version
- Regenerate the maven wrapper with mvn wrapper:wrapper
-->
<maven-core.version>3.9.9</maven-core.version>
<plexus-component.version>2.2.0</plexus-component.version>
<sisu-inject.version>0.3.5</sisu-inject.version>
Expand All @@ -26,7 +31,9 @@
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<version.gpg.plugin>3.2.7</version.gpg.plugin>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<!-- Run mvn wrapper:wrapper when updating the wrapper plugin version -->
<maven-wrapper-plugin.version>3.3.2</maven-wrapper-plugin.version>

<gpg.sign.skip>true</gpg.sign.skip>

Expand Down Expand Up @@ -105,6 +112,15 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-wrapper-plugin</artifactId>
<version>${maven-wrapper-plugin.version}</version>
<configuration>
<mavenVersion>${maven-core.version}</mavenVersion>
<distributionType>bin</distributionType>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -157,7 +173,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${version.gpg.plugin}</version>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
Loading