Skip to content

Commit 88eb269

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.2.0' into 'master'
2 parents 5b23868 + 073220b commit 88eb269

File tree

7 files changed

+47
-24
lines changed

7 files changed

+47
-24
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ npm-debug.log
1616
.settings
1717
.externalToolBuilders
1818
.pmd
19+
.eclipse-pmd
1920
.checkstyle
2021
.idea
2122
.vagrant
2223
*.iml
2324
.DS_Store
25+
*.retry
2426
.rubygems
2527
.sass-cache
2628
.rubygems-gem-maven-plugin
2729
*.sublime-*
2830
*nbactions*.xml
2931
.temp/
32+
.vlt
33+
.vlt-sync*
34+
.brackets.json

‎parent_toplevel/changes.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,21 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="1.2.0" date="2020-01-09">
27+
<action type="update" dev="sseifert">
28+
Update to reflow-maven-skin 1.0.10.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to global-parent 30.
32+
</action>
33+
<action type="update" dev="sseifert">
34+
Update dependencies.
35+
</action>
36+
<action type="update" dev="sseifert">
37+
Add wcm.io Spotbugs Annotations and JetBrains Nullability Annotations.
38+
</action>
39+
</release>
40+
2641
<release version="1.1.6" date="2019-06-26">
2742
<action type="update" dev="sseifert">
2843
Switch wcm.io domains to HTTPS.

‎parent_toplevel/pom.xml‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.maven</groupId>
2727
<artifactId>io.wcm.maven.global-parent</artifactId>
28-
<version>26</version>
28+
<version>30</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops</groupId>
3333
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
34-
<version>1.1.6</version>
34+
<version>1.2.0</version>
3535
<packaging>pom</packaging>
3636

3737
<name>Toplevel Parent</name>
@@ -92,6 +92,20 @@
9292
</properties>
9393

9494
<dependencies>
95+
96+
<!-- Recommended global dependency for nullability annotations -->
97+
<dependency>
98+
<groupId>org.jetbrains</groupId>
99+
<artifactId>annotations</artifactId>
100+
<scope>provided</scope>
101+
</dependency>
102+
103+
<!-- Spotbugs annotations -->
104+
<dependency>
105+
<groupId>io.wcm.tooling.spotbugs</groupId>
106+
<artifactId>io.wcm.tooling.spotbugs.annotations</artifactId>
107+
<scope>provided</scope>
108+
</dependency>
95109

96110
<!-- Testing -->
97111
<dependency>
@@ -111,17 +125,7 @@
111125
</dependency>
112126
<dependency>
113127
<groupId>org.junit.jupiter</groupId>
114-
<artifactId>junit-jupiter-api</artifactId>
115-
<scope>test</scope>
116-
</dependency>
117-
<dependency>
118-
<groupId>org.junit.jupiter</groupId>
119-
<artifactId>junit-jupiter-params</artifactId>
120-
<scope>test</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.junit.jupiter</groupId>
124-
<artifactId>junit-jupiter-engine</artifactId>
128+
<artifactId>junit-jupiter</artifactId>
125129
<scope>test</scope>
126130
</dependency>
127131

@@ -160,19 +164,18 @@
160164
<dependency>
161165
<groupId>org.mockito</groupId>
162166
<artifactId>mockito-core</artifactId>
163-
<version>2.25.0</version>
167+
<version>3.2.4</version>
164168
</dependency>
165169
<dependency>
166170
<groupId>org.mockito</groupId>
167171
<artifactId>mockito-junit-jupiter</artifactId>
168-
<version>2.25.0</version>
172+
<version>3.2.4</version>
169173
</dependency>
170174
<!-- Import all JUnit 5 dependencies -->
171175
<dependency>
172176
<groupId>org.junit</groupId>
173177
<artifactId>junit-bom</artifactId>
174-
<!-- Stick with JUnit 5.3.2 until Eclipse Inifinittest plugin supports newer versions -->
175-
<version>5.3.2</version>
178+
<version>5.5.2</version>
176179
<type>pom</type>
177180
<scope>import</scope>
178181
</dependency>

‎parent_toplevel/src/site/site.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
-->
2121

2222
<project name="devops.wcm.io"
23-
xmlns="http://maven.apache.org/DECORATION/1.3.0"
23+
xmlns="http://maven.apache.org/DECORATION/1.8.0"
2424
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
25-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
25+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
2626

2727
<bannerLeft>
2828
<name><![CDATA[<img src="https://wcm.io/images/[email protected]"/> wcm.io DevOps]]></name>
@@ -35,7 +35,7 @@
3535
<skin>
3636
<groupId>io.wcm.maven.skins</groupId>
3737
<artifactId>reflow-maven-skin</artifactId>
38-
<version>1.0.8</version>
38+
<version>1.0.10</version>
3939
</skin>
4040
<custom>
4141
<reflowSkin>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.1.5-SNAPSHOT</version>
29+
<version>1.1.7-SNAPSHOT</version>
3030
<relativePath>parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎public_site/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.1.5-SNAPSHOT</version>
29+
<version>1.1.7-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎public_site/src/site/site.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
-->
2121

2222
<project name="devops.wcm.io"
23-
xmlns="http://maven.apache.org/DECORATION/1.3.0"
23+
xmlns="http://maven.apache.org/DECORATION/1.8.0"
2424
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
25-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
25+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
2626

2727
<custom>
2828
<reflowSkin>

0 commit comments

Comments
 (0)