Skip to content

Commit 65309e8

Browse files
slawekjaranowskislawekjaranowski
committed
Improve ITs for set goal
ref #1106
1 parent 2a696ac commit 65309e8

File tree

41 files changed

+62
-1726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+62
-1726
lines changed

‎versions-maven-plugin/src/it/it-set-005-properties/pom.xml

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -18,87 +18,4 @@
1818
<module>module-a2</module>
1919
</modules>
2020

21-
<build>
22-
<pluginManagement>
23-
<plugins>
24-
<plugin>
25-
<artifactId>maven-antrun-plugin</artifactId>
26-
<version>1.1</version>
27-
</plugin>
28-
<plugin>
29-
<artifactId>maven-assembly-plugin</artifactId>
30-
<version>2.2-beta-2</version>
31-
</plugin>
32-
<plugin>
33-
<artifactId>maven-clean-plugin</artifactId>
34-
<version>2.2</version>
35-
</plugin>
36-
<plugin>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<version>2.0.2</version>
39-
</plugin>
40-
<plugin>
41-
<artifactId>maven-dependency-plugin</artifactId>
42-
<version>2.0</version>
43-
</plugin>
44-
<plugin>
45-
<artifactId>maven-deploy-plugin</artifactId>
46-
<version>2.3</version>
47-
</plugin>
48-
<plugin>
49-
<artifactId>maven-ear-plugin</artifactId>
50-
<version>2.3.1</version>
51-
</plugin>
52-
<plugin>
53-
<artifactId>maven-ejb-plugin</artifactId>
54-
<version>2.1</version>
55-
</plugin>
56-
<plugin>
57-
<artifactId>maven-install-plugin</artifactId>
58-
<version>2.2</version>
59-
</plugin>
60-
<plugin>
61-
<artifactId>maven-jar-plugin</artifactId>
62-
<version>2.2</version>
63-
</plugin>
64-
<plugin>
65-
<artifactId>maven-javadoc-plugin</artifactId>
66-
<version>2.4</version>
67-
</plugin>
68-
<plugin>
69-
<artifactId>maven-plugin-plugin</artifactId>
70-
<version>2.4.1</version>
71-
</plugin>
72-
<plugin>
73-
<artifactId>maven-rar-plugin</artifactId>
74-
<version>2.2</version>
75-
</plugin>
76-
<plugin>
77-
<artifactId>maven-release-plugin</artifactId>
78-
<version>2.0-beta-7</version>
79-
</plugin>
80-
<plugin>
81-
<artifactId>maven-resources-plugin</artifactId>
82-
<version>2.2</version>
83-
</plugin>
84-
<plugin>
85-
<artifactId>maven-site-plugin</artifactId>
86-
<version>2.0</version>
87-
</plugin>
88-
<plugin>
89-
<artifactId>maven-source-plugin</artifactId>
90-
<version>2.0.4</version>
91-
</plugin>
92-
<plugin>
93-
<artifactId>maven-surefire-plugin</artifactId>
94-
<version>2.4.2</version>
95-
</plugin>
96-
<plugin>
97-
<artifactId>maven-war-plugin</artifactId>
98-
<version>2.1-alpha-1</version>
99-
</plugin>
100-
</plugins>
101-
</pluginManagement>
102-
</build>
103-
10421
</project>

‎versions-maven-plugin/src/it/it-set-005-properties/verify.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ assert parentPom.version == '1.2.1-SNAPSHOT'
55

66
def moduleA1 = new XmlSlurper().parse( new File( basedir, 'module-a1/pom.xml' ) )
77
assert moduleA1.parent.version == '1.2.1-SNAPSHOT'
8+
assert moduleA1.version == '2.0.7-SNAPSHOT'
89

910
def moduleA2 = new XmlSlurper().parse( new File( basedir, 'module-a2/pom.xml' ) )
1011
assert moduleA2.parent.version == '1.2.1-SNAPSHOT'

‎versions-maven-plugin/src/it/it-set-005/module-a1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>localdomain.localhost</groupId>
55
<artifactId>project-a</artifactId>
6-
<version>1.2.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>

‎versions-maven-plugin/src/it/it-set-005/pom.xml

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -18,87 +18,4 @@
1818
<module>module-a2</module>
1919
</modules>
2020

21-
<build>
22-
<pluginManagement>
23-
<plugins>
24-
<plugin>
25-
<artifactId>maven-antrun-plugin</artifactId>
26-
<version>1.1</version>
27-
</plugin>
28-
<plugin>
29-
<artifactId>maven-assembly-plugin</artifactId>
30-
<version>2.2-beta-2</version>
31-
</plugin>
32-
<plugin>
33-
<artifactId>maven-clean-plugin</artifactId>
34-
<version>2.2</version>
35-
</plugin>
36-
<plugin>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<version>2.0.2</version>
39-
</plugin>
40-
<plugin>
41-
<artifactId>maven-dependency-plugin</artifactId>
42-
<version>2.0</version>
43-
</plugin>
44-
<plugin>
45-
<artifactId>maven-deploy-plugin</artifactId>
46-
<version>2.3</version>
47-
</plugin>
48-
<plugin>
49-
<artifactId>maven-ear-plugin</artifactId>
50-
<version>2.3.1</version>
51-
</plugin>
52-
<plugin>
53-
<artifactId>maven-ejb-plugin</artifactId>
54-
<version>2.1</version>
55-
</plugin>
56-
<plugin>
57-
<artifactId>maven-install-plugin</artifactId>
58-
<version>2.2</version>
59-
</plugin>
60-
<plugin>
61-
<artifactId>maven-jar-plugin</artifactId>
62-
<version>2.2</version>
63-
</plugin>
64-
<plugin>
65-
<artifactId>maven-javadoc-plugin</artifactId>
66-
<version>2.4</version>
67-
</plugin>
68-
<plugin>
69-
<artifactId>maven-plugin-plugin</artifactId>
70-
<version>2.4.1</version>
71-
</plugin>
72-
<plugin>
73-
<artifactId>maven-rar-plugin</artifactId>
74-
<version>2.2</version>
75-
</plugin>
76-
<plugin>
77-
<artifactId>maven-release-plugin</artifactId>
78-
<version>2.0-beta-7</version>
79-
</plugin>
80-
<plugin>
81-
<artifactId>maven-resources-plugin</artifactId>
82-
<version>2.2</version>
83-
</plugin>
84-
<plugin>
85-
<artifactId>maven-site-plugin</artifactId>
86-
<version>2.0</version>
87-
</plugin>
88-
<plugin>
89-
<artifactId>maven-source-plugin</artifactId>
90-
<version>2.0.4</version>
91-
</plugin>
92-
<plugin>
93-
<artifactId>maven-surefire-plugin</artifactId>
94-
<version>2.4.2</version>
95-
</plugin>
96-
<plugin>
97-
<artifactId>maven-war-plugin</artifactId>
98-
<version>2.1-alpha-1</version>
99-
</plugin>
100-
</plugins>
101-
</pluginManagement>
102-
</build>
103-
10421
</project>

‎versions-maven-plugin/src/it/it-set-005/verify.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import groovy.xml.XmlSlurper
22

3-
def parentPom = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
3+
def parentPom = new XmlSlurper().parse(new File(basedir, 'pom.xml'))
44
assert parentPom.version == '1.2.1-SNAPSHOT'
55

6-
def moduleA1 = new XmlSlurper().parse( new File( basedir, 'module-a1/pom.xml' ) )
6+
def moduleA1 = new XmlSlurper().parse(new File(basedir, 'module-a1/pom.xml'))
77
assert moduleA1.parent.version == '1.2.1-SNAPSHOT'
8+
assert moduleA1.version == '2.0.7-SNAPSHOT'
89

9-
def moduleA2 = new XmlSlurper().parse( new File( basedir, 'module-a2/pom.xml' ) )
10+
def moduleA2 = new XmlSlurper().parse(new File(basedir, 'module-a2/pom.xml'))
1011
assert moduleA2.parent.version == '1.2.1-SNAPSHOT'
12+
assert moduleA2.version == '1.2.1-SNAPSHOT'
1113

‎versions-maven-plugin/src/it/it-set-006/invoker.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:set -DnewVersion=1.2.1-SNAPSHOT -DupdateMatchingVersions=false
2-
invoker.nonRecursive=true
1+
invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:set \
2+
-DnewVersion=1.2.1-SNAPSHOT \
3+
-DupdateMatchingVersions=false

‎versions-maven-plugin/src/it/it-set-006/module-a1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>localdomain.localhost</groupId>
55
<artifactId>project-a</artifactId>
6-
<version>1.2.1-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>

‎versions-maven-plugin/src/it/it-set-006/pom.xml

Lines changed: 3 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<name>mversions-114</name>
1010

1111
<description>
12-
invoking versions:set on root module should not update child module versions
13-
unless they are the same as the parent old version unless
12+
invoking versions:set on root module should update all child module versions
13+
even they are the different as the parent old version
14+
with DupdateMatchingVersions=false
1415
</description>
1516

1617
<modules>
@@ -19,87 +20,4 @@
1920
<module>module-a3</module>
2021
</modules>
2122

22-
<build>
23-
<pluginManagement>
24-
<plugins>
25-
<plugin>
26-
<artifactId>maven-antrun-plugin</artifactId>
27-
<version>1.1</version>
28-
</plugin>
29-
<plugin>
30-
<artifactId>maven-assembly-plugin</artifactId>
31-
<version>2.2-beta-2</version>
32-
</plugin>
33-
<plugin>
34-
<artifactId>maven-clean-plugin</artifactId>
35-
<version>2.2</version>
36-
</plugin>
37-
<plugin>
38-
<artifactId>maven-compiler-plugin</artifactId>
39-
<version>2.0.2</version>
40-
</plugin>
41-
<plugin>
42-
<artifactId>maven-dependency-plugin</artifactId>
43-
<version>2.0</version>
44-
</plugin>
45-
<plugin>
46-
<artifactId>maven-deploy-plugin</artifactId>
47-
<version>2.3</version>
48-
</plugin>
49-
<plugin>
50-
<artifactId>maven-ear-plugin</artifactId>
51-
<version>2.3.1</version>
52-
</plugin>
53-
<plugin>
54-
<artifactId>maven-ejb-plugin</artifactId>
55-
<version>2.1</version>
56-
</plugin>
57-
<plugin>
58-
<artifactId>maven-install-plugin</artifactId>
59-
<version>2.2</version>
60-
</plugin>
61-
<plugin>
62-
<artifactId>maven-jar-plugin</artifactId>
63-
<version>2.2</version>
64-
</plugin>
65-
<plugin>
66-
<artifactId>maven-javadoc-plugin</artifactId>
67-
<version>2.4</version>
68-
</plugin>
69-
<plugin>
70-
<artifactId>maven-plugin-plugin</artifactId>
71-
<version>2.4.1</version>
72-
</plugin>
73-
<plugin>
74-
<artifactId>maven-rar-plugin</artifactId>
75-
<version>2.2</version>
76-
</plugin>
77-
<plugin>
78-
<artifactId>maven-release-plugin</artifactId>
79-
<version>2.0-beta-7</version>
80-
</plugin>
81-
<plugin>
82-
<artifactId>maven-resources-plugin</artifactId>
83-
<version>2.2</version>
84-
</plugin>
85-
<plugin>
86-
<artifactId>maven-site-plugin</artifactId>
87-
<version>2.0</version>
88-
</plugin>
89-
<plugin>
90-
<artifactId>maven-source-plugin</artifactId>
91-
<version>2.0.4</version>
92-
</plugin>
93-
<plugin>
94-
<artifactId>maven-surefire-plugin</artifactId>
95-
<version>2.4.2</version>
96-
</plugin>
97-
<plugin>
98-
<artifactId>maven-war-plugin</artifactId>
99-
<version>2.1-alpha-1</version>
100-
</plugin>
101-
</plugins>
102-
</pluginManagement>
103-
</build>
104-
10523
</project>

0 commit comments

Comments
 (0)