Skip to content

Commit 7d93dce

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 1c29246 + 8d64738 commit 7d93dce

445 files changed

Lines changed: 65659 additions & 537 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- master
99
- experimental/**
1010
pull_request:
11+
types: [opened, synchronize, reopened]
1112
branches-ignore:
1213
- master
1314
- experimental/**
@@ -20,37 +21,24 @@ jobs:
2021
strategy:
2122
matrix:
2223
java: [8, 11, 17]
23-
os: [ ubuntu-latest ]
24+
os: [ubuntu-latest]
25+
distribution: [temurin]
2426
include:
2527
- java: 11
2628
os: windows-latest
29+
distribution: temurin
2730
- java: 11
2831
os: macos-latest
32+
distribution: temurin
2933

3034
steps:
31-
# Check out Git repository
32-
- name: Checkout code
33-
uses: actions/checkout@v2
34-
35-
# Set up environment with Java and Maven
36-
- name: Setup JDK
37-
uses: actions/setup-java@v1
35+
- name: Maven Build with SonarCloud
36+
uses: wcm-io-devops/github-action-maven-build-sonar@v1
3837
with:
38+
os: ${{ matrix.os }}
3939
java-version: ${{ matrix.java }}
40-
41-
# Set up dependency cache
42-
- name: Cache local Maven repository
43-
uses: actions/cache@v2
44-
with:
45-
path: ~/.m2/repository
46-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
47-
restore-keys: |
48-
${{ runner.os }}-maven-
49-
50-
# Build & install (required for 2nd build: example)
51-
- name: Build and verify
52-
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean install
53-
54-
# Build & verify example
55-
- name: Build and verify example
56-
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify -f example
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: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,27 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
# Check out Git repository
1817
- name: Checkout code
1918
uses: actions/checkout@v2
2019

21-
# Configure GIT
2220
- name: Configure GIT
2321
run: |
2422
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
2523
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2624
27-
# Set up environment with Java and Maven
2825
- name: Setup JDK
29-
uses: actions/setup-java@v1
26+
uses: actions/setup-java@v2
3027
with:
31-
java-version: 1.8
28+
distribution: temurin
29+
java-version: 8
30+
cache: 'maven'
3231

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
4332
- name: Build, verify, deploy, generate site
4433
env:
4534
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
4635
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
4736
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
4837

49-
# Run code coverage check
50-
- name: Run code coverage check
51-
run: bash <(curl -s https://codecov.io/bash)
52-
53-
# Deploy site to Github Pages
5438
- name: Stage and deploy site
5539
run: >
5640
./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm

‎.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@v2
16+
- uses: ncipollo/release-action@v1
17+
with:
18+
body: 'Changes: https://devops.wcm.io/conga/plugins/aem/changes-report.html'
19+
token: ${{ secrets.GITHUB_TOKEN }}

‎.mvn/wrapper/MavenWrapperDownloader.java‎

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

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

7.83 KB
Binary file not shown.

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +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.
117
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<img src="https://wcm.io/images/favicon-16@2x.png"/> CONGA Plugin for AEM
22
======
33
[![Build](https://github.com/wcm-io-devops/conga-aem-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga-aem-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
4-
[![Code Coverage](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin/branch/develop/graph/badge.svg)](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin)
4+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem)
5+
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga-aem-plugin&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga-aem-plugin)
56

67
Documentation: https://devops.wcm.io/conga/plugins/aem/<br/>
78
Issues: https://wcm-io.atlassian.net/projects/WDCONGA<br/>

‎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 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="2.17.0" date="2022-05-11">
27+
<action type="add" dev="sseifert">
28+
conga-aem-maven-plugin: Add new parameter packageTypeValidation which controls how to handle packages with invalid or without package types.
29+
</action>
30+
<action type="add" dev="sseifert">
31+
conga-aem-maven-plugin: Support to include OSGi bundles referenced in CONGA definitions to be directly included in "all" content package, or deployed to a local AEM instance.
32+
</action>
33+
<action type="update" dev="sseifert">
34+
conga-aem-maven-plugin: Generate "all" content packgage for environment if configured explicitly, even if it is configure to cloudManager.target=node.
35+
</action>
36+
<action type="update" dev="sseifert">
37+
Content Package Validator: Update to filevault-package-maven-plugin 1.3.0.
38+
</action>
39+
</release>
40+
2641
<release version="2.16.2" date="2022-01-06">
2742
<action type="update" dev="sseifert">
2843
conga-aem-maven-plugin: Declare maven core dependencies as provided.

‎conga-aem-plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.16.2</version>
28+
<version>2.17.0</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
34-
<version>2.16.2</version>
34+
<version>2.17.0</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/util/ContentPackageUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private static String mergeDescriptionFileHeader(String description, FileHeaderC
173173
@SuppressWarnings("null")
174174
String fileHeaderString = StringUtils.trim(fileHeader.getCommentLines().stream()
175175
.filter(line -> !StringUtils.contains(line, "*****"))
176-
.map(line -> StringUtils.trim(line))
176+
.map(StringUtils::trim)
177177
.collect(Collectors.joining("\n")));
178178
result.append(fileHeaderString);
179179
}

0 commit comments

Comments
 (0)