Skip to content

Commit 73e6f99

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop' into master
2 parents cedf6ba + f008878 commit 73e6f99

File tree

13 files changed

+197
-130
lines changed

13 files changed

+197
-130
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Build validation
2+
3+
name: Build
4+
5+
on:
6+
push:
7+
branches-ignore:
8+
- master
9+
- experimental/**
10+
pull_request:
11+
branches-ignore:
12+
- master
13+
- experimental/**
14+
workflow_dispatch:
15+
16+
jobs:
17+
build:
18+
19+
runs-on: ${{ matrix.os }}
20+
strategy:
21+
matrix:
22+
os: [ ubuntu-latest ]
23+
java: [8, 11]
24+
25+
steps:
26+
# Check out Git repository
27+
- name: Checkout code
28+
uses: actions/checkout@v2
29+
30+
# Set up environment with Java and Maven
31+
- name: Setup JDK
32+
uses: actions/setup-java@v1
33+
with:
34+
java-version: ${{ matrix.java }}
35+
36+
# Set up dependency cache
37+
- name: Cache local Maven repository
38+
uses: actions/cache@v2
39+
with:
40+
path: ~/.m2/repository
41+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
42+
restore-keys: |
43+
${{ runner.os }}-maven-
44+
45+
# Build & verify
46+
- name: Build and verify
47+
run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify
48+
49+
# Run code coverage check
50+
- name: Run code coverage check
51+
run: bash <(curl -s https://codecov.io/bash)

‎.github/workflows/maven-deploy.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
2+
3+
name: Deploy
4+
5+
on:
6+
push:
7+
branches:
8+
- develop
9+
workflow_dispatch:
10+
11+
jobs:
12+
build:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
# Check out Git repository
18+
- name: Checkout code
19+
uses: actions/checkout@v2
20+
21+
# Configure GIT
22+
- name: Configure GIT
23+
run: |
24+
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
25+
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
26+
27+
# Set up environment with Java and Maven
28+
- name: Setup JDK
29+
uses: actions/setup-java@v1
30+
with:
31+
java-version: 1.8
32+
33+
# Set up dependency cache
34+
- name: Cache local Maven repository
35+
uses: actions/cache@v2
36+
with:
37+
path: ~/.m2/repository
38+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
39+
restore-keys: |
40+
${{ runner.os }}-maven-
41+
42+
# Build, deploy to ossrh, generate and stage site
43+
- name: Build, verify, deploy, generate site
44+
env:
45+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
46+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
47+
run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
48+
49+
# Deploy site to Github Pages
50+
- name: Stage and deploy site
51+
run: >
52+
mvn -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm
53+
-Dscmpublish.checkinComment="Maven site: ${{ github.repository }}"
54+
-Dusername=${{ secrets.GH_SITE_DEPLOY_USERNAME }}
55+
-Dpassword=${{ secrets.GH_SITE_DEPLOY_PAT }}

.travis.maven-settings.xml renamed to .maven-settings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,12 @@
147147
<activeProfile>default</activeProfile>
148148
</activeProfiles>
149149

150+
<servers>
151+
<server>
152+
<id>ossrh</id>
153+
<username>${env.SONATYPE_USERNAME}</username>
154+
<password>${env.SONATYPE_PASSWORD}</password>
155+
</server>
156+
</servers>
157+
150158
</settings>

‎.travis.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎Jenkinsfile‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<img src="https://wcm.io/images/[email protected]"/> wcm.io DevOps Tooling
22
======
3-
[![Build Status](https://travis-ci.org/wcm-io-devops/devops-tooling.png?branch=develop)](https://travis-ci.org/wcm-io-devops/devops-tooling)
3+
[![Build](https://github.com/wcm-io-devops/devops-tooling/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/devops-tooling/actions?query=workflow%3ABuild+branch%3Adevelop)
44

55
Tooling for wcm.io DevOps projects

‎parent_toplevel/changes.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
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.6" date="2021-03-15">
27+
<action type="update" dev="sseifert">
28+
Update to global-parent 37.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to reflow-maven-skin 1.1.0.
32+
</action>
33+
</release>
34+
2635
<release version="1.2.4" date="2020-05-19">
2736
<action type="update" dev="sseifert">
2837
Update to global-parent 33.

‎parent_toplevel/pom.xml‎

Lines changed: 25 additions & 16 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>33</version>
28+
<version>37</version>
2929
<relativePath />
3030
</parent>
3131

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

3737
<name>Toplevel Parent</name>
@@ -57,11 +57,6 @@
5757
<url>https://wcm-io.atlassian.net/browse/</url>
5858
</issueManagement>
5959

60-
<ciManagement>
61-
<system>Travis CI</system>
62-
<url>https://travis-ci.org/wcm-io-devops</url>
63-
</ciManagement>
64-
6560
<developers>
6661
<developer>
6762
<name>wcm.io Community</name>
@@ -87,12 +82,12 @@
8782
<site.url.module.prefix>tooling/parent_toplevel</site.url.module.prefix>
8883
<site.url>https://devops.wcm.io</site.url>
8984
<site.deploy.id>ssh-wcm.io</site.deploy.id>
90-
<site.deploy.url />
85+
<site.deploy.url>scm:git:https://github.com/wcm-io-devops/wcm-io-devops.github.io.git</site.deploy.url>
9186

9287
</properties>
9388

9489
<dependencies>
95-
90+
9691
<!-- Recommended global dependency for nullability annotations -->
9792
<dependency>
9893
<groupId>org.jetbrains</groupId>
@@ -123,11 +118,11 @@
123118
<artifactId>mockito-junit-jupiter</artifactId>
124119
<scope>test</scope>
125120
</dependency>
126-
<dependency>
127-
<groupId>org.junit.jupiter</groupId>
128-
<artifactId>junit-jupiter</artifactId>
129-
<scope>test</scope>
130-
</dependency>
121+
<dependency>
122+
<groupId>org.junit.jupiter</groupId>
123+
<artifactId>junit-jupiter</artifactId>
124+
<scope>test</scope>
125+
</dependency>
131126

132127
</dependencies>
133128
<dependencyManagement>
@@ -291,7 +286,8 @@
291286
<groupId>org.apache.maven.plugins</groupId>
292287
<artifactId>maven-javadoc-plugin</artifactId>
293288
<configuration>
294-
<excludePackageNames>*.impl</excludePackageNames>
289+
<excludePackageNames>*.impl:*.impl.*</excludePackageNames>
290+
<notimestamp>true</notimestamp>
295291
</configuration>
296292
</plugin>
297293

@@ -346,6 +342,19 @@
346342
</configuration>
347343
</plugin>
348344

345+
<plugin>
346+
<groupId>org.jacoco</groupId>
347+
<artifactId>jacoco-maven-plugin</artifactId>
348+
<reportSets>
349+
<reportSet>
350+
<reports>
351+
<!-- select non-aggregate reports -->
352+
<report>report</report>
353+
</reports>
354+
</reportSet>
355+
</reportSets>
356+
</plugin>
357+
349358
</plugins>
350359
</reporting>
351360

@@ -398,7 +407,7 @@
398407
<site>
399408
<id>${site.deploy.id}</id>
400409
<name>Maven Site Deployment</name>
401-
<url>${site.deploy.url}${site.url.module.prefix}</url>
410+
<url>${site.deploy.url}/${site.url.module.prefix}</url>
402411
</site>
403412
</distributionManagement>
404413

‎parent_toplevel/src/site/site.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<skin>
3636
<groupId>io.wcm.maven.skins</groupId>
3737
<artifactId>reflow-maven-skin</artifactId>
38-
<version>1.0.12</version>
38+
<version>1.1.0</version>
3939
</skin>
4040
<custom>
4141
<reflowSkin>
@@ -119,6 +119,7 @@
119119
<item name="License" href="https://devops.wcm.io/license.html" />
120120
<item name="Commercial Support" href="https://wcm.io/commercial-support.html" />
121121
<item name="Imprint" href="https://wcm.io/imprint.html" />
122+
<item name="Privacy Policy" href="https://wcm.io/privacy.html" />
122123
</menu>
123124
<menu name="Categories" inherit="top">
124125
<item name="CONGA - CONfiguration GenerAtor" href="https://devops.wcm.io/conga/"/>
@@ -128,7 +129,6 @@
128129
<item name="Issues" href="https://wcm-io.atlassian.net" />
129130
<item name="Wiki" href="https://wcm-io.atlassian.net/wiki/" />
130131
<item name="Mailing Lists" href="https://wcm.io/mailing-lists.html" />
131-
<item name="Continuous Integration" href="https://travis-ci.org/wcm-io-devops" />
132132
<item name="Fork on GitHub" href="http://github.com/wcm-io-devops" />
133133
</menu>
134134
<menu name="Maven documentation" inherit="top" ref="reports"/>

0 commit comments

Comments
 (0)