Skip to content

Commit bae6ea9

Browse files
carloscarlos
committed
Fix plugin version on sample projects
1 parent b0ff427 commit bae6ea9

4 files changed

Lines changed: 90 additions & 85 deletions

File tree

‎src/it/custom-properties/pom.xml‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
33
http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>com.code54.mojo</groupId>
7-
<artifactId>buildversion-plugin-example</artifactId>
8-
<version>9.9.99</version>
6+
<groupId>com.code54.mojo</groupId>
7+
<artifactId>buildversion-plugin-example</artifactId>
8+
<version>9.9.99</version>
99

10-
<name>Build version project example</name>
11-
<organization>
12-
<name>Code54</name>
13-
<url>http://code54.com</url>
14-
</organization>
10+
<name>Build version project example</name>
11+
<organization>
12+
<name>Code54</name>
13+
<url>http://code54.com</url>
14+
</organization>
1515

16-
<build>
17-
<plugins>
18-
<plugin>
19-
<groupId>com.code54.mojo</groupId>
20-
<artifactId>buildversion-plugin</artifactId>
21-
<version>1.0.3</version>
22-
<executions>
23-
<execution>
24-
<goals><goal>set-properties</goal></goals>
25-
<configuration>
26-
<tstampFormat>yyyy-MM-dd</tstampFormat>
27-
<customProperties>
16+
<build>
17+
<plugins>
18+
<plugin>
19+
<groupId>com.code54.mojo</groupId>
20+
<artifactId>buildversion-plugin</artifactId>
21+
<version>1.1-SNAPSHOT</version>
22+
<executions>
23+
<execution>
24+
<goals>
25+
<goal>set-properties</goal>
26+
</goals>
27+
<configuration>
28+
<tstampFormat>yyyy-MM-dd</tstampFormat>
29+
<customProperties>
2830
{ :build-commit-uppercase (clojure.string/upper-case build-commit) }
29-
</customProperties>
30-
</configuration>
31-
</execution>
32-
</executions>
33-
</plugin>
31+
</customProperties>
32+
</configuration>
33+
</execution>
34+
</executions>
35+
</plugin>
3436

35-
</plugins>
36-
</build>
37+
</plugins>
38+
</build>
3739

3840
</project>

‎src/it/setting-git-cmd/pom.xml‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
33
http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>com.code54.mojo</groupId>
7-
<artifactId>buildversion-plugin-example</artifactId>
8-
<version>9.9.99</version>
6+
<groupId>com.code54.mojo</groupId>
7+
<artifactId>buildversion-plugin-example</artifactId>
8+
<version>9.9.99</version>
99

10-
<name>Build version project example</name>
11-
<organization>
12-
<name>Code54</name>
13-
<url>http://code54.com</url>
14-
</organization>
10+
<name>Build version project example</name>
11+
<organization>
12+
<name>Code54</name>
13+
<url>http://code54.com</url>
14+
</organization>
1515

16-
<build>
17-
<plugins>
18-
<plugin>
19-
<groupId>com.code54.mojo</groupId>
20-
<artifactId>buildversion-plugin</artifactId>
21-
<version>1.0.3</version>
22-
<executions>
23-
<execution>
24-
<goals><goal>set-properties</goal></goals>
25-
<configuration>
26-
<gitCmd>./git.sh</gitCmd>
27-
</configuration>
28-
</execution>
29-
</executions>
30-
</plugin>
16+
<build>
17+
<plugins>
18+
<plugin>
19+
<groupId>com.code54.mojo</groupId>
20+
<artifactId>buildversion-plugin</artifactId>
21+
<version>1.1-SNAPSHOT</version>
22+
<executions>
23+
<execution>
24+
<goals>
25+
<goal>set-properties</goal>
26+
</goals>
27+
<configuration>
28+
<gitCmd>./git.sh</gitCmd>
29+
</configuration>
30+
</execution>
31+
</executions>
32+
</plugin>
3133

32-
</plugins>
33-
</build>
34+
</plugins>
35+
</build>
3436

3537
</project>

‎src/it/simple-project/pom.xml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
33
http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>com.code54.mojo</groupId>
7-
<artifactId>buildversion-plugin-example</artifactId>
8-
<version>9.9.99</version>
6+
<groupId>com.code54.mojo</groupId>
7+
<artifactId>buildversion-plugin-example</artifactId>
8+
<version>9.9.99</version>
99

10-
<name>Build version project example</name>
11-
<organization>
12-
<name>Code54</name>
13-
<url>http://code54.com</url>
14-
</organization>
10+
<name>Build version project example</name>
11+
<organization>
12+
<name>Code54</name>
13+
<url>http://code54.com</url>
14+
</organization>
1515

16-
<build>
17-
<plugins>
18-
<plugin>
19-
<groupId>com.code54.mojo</groupId>
20-
<artifactId>buildversion-plugin</artifactId>
21-
<version>1.0.3</version>
22-
<executions>
23-
<execution>
24-
<goals><goal>set-properties</goal></goals>
25-
</execution>
26-
</executions>
27-
</plugin>
28-
29-
</plugins>
30-
</build>
16+
<build>
17+
<plugins>
18+
<plugin>
19+
<groupId>com.code54.mojo</groupId>
20+
<artifactId>buildversion-plugin</artifactId>
21+
<version>1.1-SNAPSHOT</version>
22+
<executions>
23+
<execution>
24+
<goals>
25+
<goal>set-properties</goal>
26+
</goals>
27+
</execution>
28+
</executions>
29+
</plugin>
30+
</plugins>
31+
</build>
3132

3233
</project>

‎src/it/simple-project/verify.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
def targetString = "build-version: 1.2.0-SNAPSHOT"
33

4-
// println "*** Checking build log output. Looking for build-version${targetString}"
4+
println "*** Checking build log output. Looking for build-version${targetString}"
55

66
def build_log = new File("target/it/simple-project/build.log").text
77

0 commit comments

Comments
 (0)