Skip to content

Commit b1acb2c

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 7c90193 + 2ad646a commit b1acb2c

File tree

29 files changed

+868
-181
lines changed

29 files changed

+868
-181
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Build validation
2+
3+
name: Build
4+
5+
on:
6+
push:
7+
branches-ignore:
8+
- master
9+
- experimental/**
10+
pull_request:
11+
types: [opened, synchronize, reopened]
12+
branches-ignore:
13+
- master
14+
- experimental/**
15+
workflow_dispatch:
16+
17+
jobs:
18+
build:
19+
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
matrix:
23+
java: [11, 17]
24+
os: [ubuntu-latest]
25+
distribution: [temurin]
26+
include:
27+
- java: 11
28+
os: windows-latest
29+
distribution: temurin
30+
- java: 11
31+
os: macos-latest
32+
distribution: temurin
33+
34+
steps:
35+
- name: Maven Build with SonarCloud
36+
uses: wcm-io-devops/github-action-maven-build-sonar@v1
37+
with:
38+
os: ${{ matrix.os }}
39+
java-version: ${{ matrix.java }}
40+
maven-executable: ./mvnw
41+
sonar-run-on-os: ubuntu-latest
42+
sonar-run-on-java-version: 11
43+
sonar-token: ${{ secrets.SONAR_TOKEN }}
44+
github-token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Deploy snapshots to Sonatype 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+
- name: Checkout code
18+
uses: actions/checkout@v3
19+
20+
- name: Configure GIT
21+
run: |
22+
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
23+
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
24+
25+
- name: Setup JDK
26+
uses: actions/setup-java@v3
27+
with:
28+
distribution: temurin
29+
java-version: 11
30+
cache: maven
31+
32+
- name: Build, verify, deploy, generate site
33+
env:
34+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
35+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
36+
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
37+
38+
- name: Stage and deploy site
39+
run: >
40+
./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm
41+
-Dscmpublish.checkinComment="Maven site: ${{ github.repository }}"
42+
-Dusername=${{ secrets.GH_SITE_DEPLOY_USERNAME }}
43+
-Dpassword=${{ secrets.GH_SITE_DEPLOY_PAT }}

‎.github/workflows/release-from-tag.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Release from Tag
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
workflow_dispatch:
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
steps:
15+
- uses: actions/checkout@v3
16+
- uses: ncipollo/release-action@v1
17+
with:
18+
body: 'Changes: https://devops.wcm.io/conga/plugins/sling/changes-report.html'
19+
token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 8 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,6 @@
4242
</snapshots>
4343
</repository>
4444

45-
<repository>
46-
<id>adobe-public-releases</id>
47-
<name>Adobe Public Repository</name>
48-
<url>https://repo.adobe.com/nexus/content/groups/public/</url>
49-
<releases>
50-
<enabled>true</enabled>
51-
<updatePolicy>never</updatePolicy>
52-
</releases>
53-
<snapshots>
54-
<enabled>false</enabled>
55-
</snapshots>
56-
</repository>
57-
58-
<repository>
59-
<id>wcm-io-apache-intermediate-release</id>
60-
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
61-
<layout>default</layout>
62-
<releases>
63-
<enabled>true</enabled>
64-
<updatePolicy>never</updatePolicy>
65-
</releases>
66-
<snapshots>
67-
<enabled>false</enabled>
68-
</snapshots>
69-
</repository>
70-
7145
<repository>
7246
<id>oss-snapshots</id>
7347
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -111,32 +85,6 @@
11185
</snapshots>
11286
</pluginRepository>
11387

114-
<pluginRepository>
115-
<id>adobe-public-releases</id>
116-
<name>Adobe Public Repository</name>
117-
<url>https://repo.adobe.com/nexus/content/groups/public/</url>
118-
<releases>
119-
<enabled>true</enabled>
120-
<updatePolicy>never</updatePolicy>
121-
</releases>
122-
<snapshots>
123-
<enabled>false</enabled>
124-
</snapshots>
125-
</pluginRepository>
126-
127-
<pluginRepository>
128-
<id>wcm-io-apache-intermediate-release</id>
129-
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
130-
<layout>default</layout>
131-
<releases>
132-
<enabled>true</enabled>
133-
<updatePolicy>never</updatePolicy>
134-
</releases>
135-
<snapshots>
136-
<enabled>false</enabled>
137-
</snapshots>
138-
</pluginRepository>
139-
14088
<pluginRepository>
14189
<id>oss-snapshots</id>
14290
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -173,4 +121,12 @@
173121
<activeProfile>default</activeProfile>
174122
</activeProfiles>
175123

124+
<servers>
125+
<server>
126+
<id>ossrh</id>
127+
<username>${env.SONATYPE_USERNAME}</username>
128+
<password>${env.SONATYPE_PASSWORD}</password>
129+
</server>
130+
</servers>
131+
176132
</settings>

‎.mvn/wrapper/maven-wrapper.jar‎

57.4 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

‎.travis.yml‎

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

‎Jenkinsfile‎

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

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<img src="https://wcm.io/images/[email protected]"/> CONGA Plugin for Apache Sling
22
======
3-
[![Build Status](https://travis-ci.org/wcm-io-devops/conga-sling-plugin.png?branch=develop)](https://travis-ci.org/wcm-io-devops/conga-sling-plugin)
4-
[![Code Coverage](https://codecov.io/gh/wcm-io-devops/conga-sling-plugin/branch/develop/graph/badge.svg)](https://codecov.io/gh/wcm-io-devops/conga-sling-plugin)
3+
[![Build](https://github.com/wcm-io-devops/conga-sling-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga-sling-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
4+
[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.sling)](https://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/io.wcm.devops.conga.plugins.sling)
5+
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga-sling-plugin&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga-sling-plugin)
56

67
Documentation: https://devops.wcm.io/conga/plugins/sling/<br/>
7-
Issues: https://wcm-io.atlassian.net/projects/WDCONGA<br/>
8+
Issues: https://github.com/wcm-io-devops/conga-sling-plugin/issues<br/>
89
Wiki: https://wcm-io.atlassian.net/wiki/<br/>
9-
Continuous Integration: https://travis-ci.org/conga-sling-plugin
10+
Continuous Integration: https://github.com/wcm-io-devops/conga-sling-plugin/actions<br/>
11+
Commercial support: https://wcm.io/commercial-support.html
1012

1113

1214
## Build from sources
1315

1416
If you want to build from sources make sure you have configured all [Maven Repositories](https://devops.wcm.io/maven.html) in your settings.xml.
1517

16-
See [Travis Maven settings.xml](https://github.com/conga-sling-plugin/blob/master/.travis.maven-settings.xml) for an example with a full configuration.
18+
See [Maven Settings](https://github.com/wcm-io-devops/conga-sling-plugin/blob/develop/.maven-settings.xml) for an example with a full configuration.
1719

1820
Then you can build using
1921

0 commit comments

Comments
 (0)