Skip to content

Commit 42806df

Browse files
authored
Merge pull request #38 from marko-bekhta/build/release-node
Use specific Jenkins nodes for releases
2 parents f589ac8 + 9faf1e8 commit 42806df

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
# under the License.
1717
wrapperVersion=3.3.2
1818
distributionType=bin
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
2020
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('hibernate-jenkins-pipeline-helpers@1.17') _
1+
@Library('hibernate-jenkins-pipeline-helpers') _
22

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

@@ -7,7 +7,7 @@ pipeline {
77
label 'Worker&&Containers'
88
}
99
tools {
10-
maven 'Apache Maven 3.8'
10+
maven 'Apache Maven 3.9'
1111
jdk 'OpenJDK 17 Latest'
1212
}
1313
options {

ci/release/Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@Library('hibernate-jenkins-pipeline-helpers@1.17') _
1+
@Library('hibernate-jenkins-pipeline-helpers') _
22

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

55
pipeline {
66
agent {
7-
label 'Worker&&Containers'
7+
label 'Release'
88
}
99
tools {
10-
maven 'Apache Maven 3.8'
10+
maven 'Apache Maven 3.9'
1111
jdk 'OpenJDK 17 Latest'
1212
}
1313
options {

pom.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1313

1414
<develocity-maven-extension.version>1.23</develocity-maven-extension.version>
15+
<!--
16+
When updating maven version:
17+
- Adjust the Jenkins files to reference the same version
18+
- Regenerate the maven wrapper with mvn wrapper:wrapper
19+
-->
1520
<maven-core.version>3.9.9</maven-core.version>
1621
<plexus-component.version>2.2.0</plexus-component.version>
1722
<sisu-inject.version>0.3.5</sisu-inject.version>
@@ -26,7 +31,9 @@
2631
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
2732
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
2833
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
29-
<version.gpg.plugin>3.2.7</version.gpg.plugin>
34+
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
35+
<!-- Run mvn wrapper:wrapper when updating the wrapper plugin version -->
36+
<maven-wrapper-plugin.version>3.3.2</maven-wrapper-plugin.version>
3037

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

@@ -105,6 +112,15 @@
105112

106113
<build>
107114
<plugins>
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-wrapper-plugin</artifactId>
118+
<version>${maven-wrapper-plugin.version}</version>
119+
<configuration>
120+
<mavenVersion>${maven-core.version}</mavenVersion>
121+
<distributionType>bin</distributionType>
122+
</configuration>
123+
</plugin>
108124
<plugin>
109125
<groupId>org.apache.maven.plugins</groupId>
110126
<artifactId>maven-compiler-plugin</artifactId>
@@ -157,7 +173,7 @@
157173
<plugin>
158174
<groupId>org.apache.maven.plugins</groupId>
159175
<artifactId>maven-gpg-plugin</artifactId>
160-
<version>${version.gpg.plugin}</version>
176+
<version>${maven-gpg-plugin.version}</version>
161177
<executions>
162178
<execution>
163179
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)