Skip to content

Commit 115df72

Browse files
slawekjaranowskislawekjaranowski
committed
Bump parent from 72 to 73
- execute spotless by JDK 11 - add missing import for groovy XmlSlurper in ITs
1 parent 5547184 commit 115df72

File tree

27 files changed

+88
-23
lines changed

27 files changed

+88
-23
lines changed

‎pom.xml‎

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.codehaus.mojo</groupId>
77
<artifactId>mojo-parent</artifactId>
8-
<version>72</version>
8+
<version>73</version>
99
</parent>
1010

1111
<groupId>org.codehaus.mojo.versions</groupId>
@@ -107,7 +107,7 @@
107107
<scm>
108108
<connection>scm:git:https://github.com/mojohaus/versions.git</connection>
109109
<developerConnection>scm:git:ssh://[email protected]/mojohaus/versions.git</developerConnection>
110-
<tag>2.14.2</tag>
110+
<tag>HEAD</tag>
111111
<url>https://github.com/mojohaus/versions/tree/master</url>
112112
</scm>
113113

@@ -122,10 +122,13 @@
122122
</ciManagement>
123123

124124
<properties>
125-
<mojo.java.target>1.8</mojo.java.target>
126-
<maven.compiler.source>${mojo.java.target}</maven.compiler.source>
125+
<mojo.java.target>8</mojo.java.target>
126+
127+
<!-- some of plugins requires JDK 11 -->
128+
<recommendedJavaBuildVersion>11</recommendedJavaBuildVersion>
129+
127130
<junitBomVersion>5.9.1</junitBomVersion>
128-
<mavenVersion>3.2.5</mavenVersion>
131+
<maven.version>3.2.5</maven.version>
129132
<doxiaVersion>1.12.0</doxiaVersion>
130133
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
131134
<pluginVersion>${project.version}</pluginVersion>
@@ -145,37 +148,37 @@
145148
<dependency>
146149
<groupId>org.apache.maven</groupId>
147150
<artifactId>maven-plugin-api</artifactId>
148-
<version>${mavenVersion}</version>
151+
<version>${maven.version}</version>
149152
<scope>provided</scope>
150153
</dependency>
151154
<dependency>
152155
<groupId>org.apache.maven</groupId>
153156
<artifactId>maven-artifact</artifactId>
154-
<version>${mavenVersion}</version>
157+
<version>${maven.version}</version>
155158
<scope>provided</scope>
156159
</dependency>
157160
<dependency>
158161
<groupId>org.apache.maven</groupId>
159162
<artifactId>maven-core</artifactId>
160-
<version>${mavenVersion}</version>
163+
<version>${maven.version}</version>
161164
<scope>provided</scope>
162165
</dependency>
163166
<dependency>
164167
<groupId>org.apache.maven</groupId>
165168
<artifactId>maven-model</artifactId>
166-
<version>${mavenVersion}</version>
169+
<version>${maven.version}</version>
167170
<scope>provided</scope>
168171
</dependency>
169172
<dependency>
170173
<groupId>org.apache.maven</groupId>
171174
<artifactId>maven-settings</artifactId>
172-
<version>${mavenVersion}</version>
175+
<version>${maven.version}</version>
173176
<scope>provided</scope>
174177
</dependency>
175178
<dependency>
176179
<groupId>org.apache.maven</groupId>
177180
<artifactId>maven-compat</artifactId>
178-
<version>${mavenVersion}</version>
181+
<version>${maven.version}</version>
179182
</dependency>
180183

181184
<dependency>
@@ -313,17 +316,6 @@
313316
<build>
314317

315318
<plugins>
316-
<plugin>
317-
<groupId>com.diffplug.spotless</groupId>
318-
<artifactId>spotless-maven-plugin</artifactId>
319-
</plugin>
320-
<plugin>
321-
<groupId>org.apache.maven.plugins</groupId>
322-
<artifactId>maven-checkstyle-plugin</artifactId>
323-
<configuration>
324-
<configLocation>${checkstyle.spotless.config}</configLocation>
325-
</configuration>
326-
</plugin>
327319
<plugin>
328320
<groupId>org.codehaus.mojo</groupId>
329321
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -377,4 +369,29 @@
377369
</plugins>
378370
</reporting>
379371

372+
<profiles>
373+
<profile>
374+
<id>java11+</id>
375+
<activation>
376+
<jdk>[11,)</jdk>
377+
</activation>
378+
379+
<build>
380+
<!--- newer versions of plugins requires JDK 11 -->
381+
<plugins>
382+
<plugin>
383+
<groupId>com.diffplug.spotless</groupId>
384+
<artifactId>spotless-maven-plugin</artifactId>
385+
</plugin>
386+
<plugin>
387+
<groupId>org.apache.maven.plugins</groupId>
388+
<artifactId>maven-checkstyle-plugin</artifactId>
389+
<configuration>
390+
<configLocation>${checkstyle.spotless.config}</configLocation>
391+
</configuration>
392+
</plugin>
393+
</plugins>
394+
</build>
395+
</profile>
396+
</profiles>
380397
</project>

‎versions-maven-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<description>The Versions Maven Plugin is used when you want to manage the versions of artifacts in a project's POM.</description>
1717

1818
<prerequisites>
19-
<maven>${mavenVersion}</maven>
19+
<maven>${maven.version}</maven>
2020
</prerequisites>
2121

2222
<dependencies>

‎versions-maven-plugin/src/it/it-changerecord-update-parent-001/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.xml.XmlSlurper
2+
13
def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
24
assert changes.dependencyUpdate.find { node -> node.@kind == 'parent-update'
35
&& node.@groupId == 'localhost'

‎versions-maven-plugin/src/it/it-changerecord-update-properties-001/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.xml.XmlSlurper
2+
13
def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
24
assert changes.dependencyUpdate.find { node -> node.@kind == 'property-update'
35
&& node.@groupId == 'localhost'

‎versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.xml.XmlSlurper
2+
13
def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
24
assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
35
&& node.@groupId == 'localhost'

‎versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.xml.XmlSlurper
2+
13
def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
24
assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
35
&& node.@groupId == 'localhost'

‎versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.xml.XmlSlurper
2+
13
def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
24
assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
35
&& node.@groupId == 'localhost'

‎versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.xml.XmlSlurper
2+
13
def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
24
assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
35
&& node.@groupId == 'localhost'

‎versions-maven-plugin/src/it/it-compare-dependencies-issue-289/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
import groovy.xml.XmlSlurper
2+
13
def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
24
assert project.parent.version == '2.0'

‎versions-maven-plugin/src/it/it-force-releases-issue-134/verify.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.xml.XmlSlurper
2+
13
def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
24

35
assert project.dependencyManagement.dependencies.'*'.size() == 1

0 commit comments

Comments
 (0)