Skip to content

Commit aa1cc35

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.2.2' into 'master'
2 parents 88eb269 + 6b351ab commit aa1cc35

File tree

5 files changed

+50
-7
lines changed

5 files changed

+50
-7
lines changed

‎Jenkinsfile‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
@Library('pipeline-library') pipelineLibrary
2+
@Library('pv-pipeline-library') pvPipelineLibrary
3+
4+
5+
import io.wcm.devops.jenkins.pipeline.ssh.SSHTarget
6+
7+
import static de.provision.devops.jenkins.pipeline.utils.ConfigConstants.*
8+
import static io.wcm.devops.jenkins.pipeline.utils.ConfigConstants.*
9+
10+
// See:
11+
// https://github.com/pro-vision/jenkins-pv-pipeline-library
12+
// https://github.com/pro-vision/jenkins-pv-pipeline-library/blob/master/docs/config-structure.md
13+
// Also have a look at https://github.com/wcm-io-devops/jenkins-pipeline-library for further configuration options
14+
15+
List triggers = defaults.getTriggers()
16+
triggers.push(githubPush())
17+
18+
Map config = [
19+
(BUILD_WRAPPER): [
20+
(BUILD_WRAPPER_SSH_TARGETS): [new SSHTarget("ssh-wcm.io")]
21+
],
22+
(PROPERTIES) : [
23+
(PROPERTIES_PIPELINE_TRIGGERS): triggers
24+
],
25+
(STAGE_COMPILE): [
26+
(MAVEN): [
27+
(MAVEN_GOALS): ["clean", "deploy", "site-deploy"],
28+
]
29+
],
30+
(STAGE_FEATURE_PREPARATION): [
31+
(STAGE_FEATURE_PREPARATION_MERGE): [
32+
(STAGE_FEATURE_PREPARATION_MERGE_ENABLED): false
33+
]
34+
]
35+
]
36+
37+
routeDefaultJenkinsFile(config)

‎parent_toplevel/changes.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
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.2" date="2020-04-14">
27+
<action type="update" dev="sseifert">
28+
Update to global-parent 32.
29+
</action>
30+
</release>
31+
2632
<release version="1.2.0" date="2020-01-09">
2733
<action type="update" dev="sseifert">
2834
Update to reflow-maven-skin 1.0.10.

‎parent_toplevel/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
#L%
2020
-->
2121

22-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2323
<modelVersion>4.0.0</modelVersion>
2424

2525
<parent>
2626
<groupId>io.wcm.maven</groupId>
2727
<artifactId>io.wcm.maven.global-parent</artifactId>
28-
<version>30</version>
28+
<version>32</version>
2929
<relativePath />
3030
</parent>
3131

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

3737
<name>Toplevel Parent</name>

‎pom.xml‎

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

2222
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2424
<modelVersion>4.0.0</modelVersion>
2525

2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.1.7-SNAPSHOT</version>
29+
<version>1.2.0</version>
3030
<relativePath>parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎public_site/pom.xml‎

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

2222
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2424
<modelVersion>4.0.0</modelVersion>
2525

2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.1.7-SNAPSHOT</version>
29+
<version>1.2.0</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

0 commit comments

Comments
 (0)