Skip to content

Commit b7cfc8b

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents beaf301 + 36fedb6 commit b7cfc8b

File tree

30 files changed

+233
-359
lines changed

30 files changed

+233
-359
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: 12 additions & 26 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/**
@@ -19,33 +20,18 @@ jobs:
1920
runs-on: ${{ matrix.os }}
2021
strategy:
2122
matrix:
22-
os: [ ubuntu-latest ]
23-
java: [8, 11]
23+
java: [11, 17]
24+
os: [ubuntu-latest]
25+
distribution: [temurin]
2426

2527
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
28+
- name: Maven Build with SonarCloud
29+
uses: wcm-io-devops/github-action-maven-build-sonar@v1
3330
with:
31+
os: ${{ matrix.os }}
3432
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: ./mvnw -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)
33+
maven-executable: ./mvnw
34+
sonar-run-on-os: ubuntu-latest
35+
sonar-run-on-java-version: 11
36+
sonar-token: ${{ secrets.SONAR_TOKEN }}
37+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/maven-deploy.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
1+
# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages
22

33
name: Deploy
44

@@ -14,39 +14,27 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
# Check out Git repository
1817
- name: Checkout code
19-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
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@v3
3027
with:
31-
java-version: 1.8
28+
distribution: temurin
29+
java-version: 11
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-
# Deploy site to Github Pages
5038
- name: Stage and deploy site
5139
run: >
5240
./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@v3
16+
- uses: ncipollo/release-action@v1
17+
with:
18+
body: 'Changes: https://wcm.io/samples/changes-report.html'
19+
token: ${{ secrets.GITHUB_TOKEN }}

‎.maven-settings.xml

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

45-
<repository>
46-
<id>wcm-io-apache-intermediate-release</id>
47-
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
48-
<layout>default</layout>
49-
<releases>
50-
<enabled>true</enabled>
51-
<updatePolicy>never</updatePolicy>
52-
</releases>
53-
<snapshots>
54-
<enabled>false</enabled>
55-
</snapshots>
56-
</repository>
57-
5845
<repository>
5946
<id>oss-snapshots</id>
6047
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -98,19 +85,6 @@
9885
</snapshots>
9986
</pluginRepository>
10087

101-
<pluginRepository>
102-
<id>wcm-io-apache-intermediate-release</id>
103-
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
104-
<layout>default</layout>
105-
<releases>
106-
<enabled>true</enabled>
107-
<updatePolicy>never</updatePolicy>
108-
</releases>
109-
<snapshots>
110-
<enabled>false</enabled>
111-
</snapshots>
112-
</pluginRepository>
113-
11488
<pluginRepository>
11589
<id>oss-snapshots</id>
11690
<url>https://oss.sonatype.org/content/repositories/snapshots</url>

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

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<img src="https://wcm.io/images/favicon-16@2x.png"/> wcm.io Samples
22
======
3-
[![Build](https://github.com/wcm-io/wcm-io-samples/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io/wcm-io-samples/actions?query=workflow%3ABuild+branch%3Adevelop)
4-
[![Code Coverage](https://codecov.io/gh/wcm-io/wcm-io-samples/branch/develop/graph/badge.svg)](https://codecov.io/gh/wcm-io/wcm-io-samples)
3+
[![Build](https://github.com/wcm-io/io.wcm.samples/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io/io.wcm.samples/actions?query=workflow%3ABuild+branch%3Adevelop)
4+
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io_io.wcm.samples&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io_io.wcm.samples)
55

66
Sample projects and applications to demonstrate and test wcm.io features.
77

88
Documentation: https://wcm.io/samples/<br/>
9-
Issues: https://wcm-io.atlassian.net/browse/WSAM<br/>
9+
Issues: https://github.com/wcm-io/io.wcm.samples/issues<br/>
1010
Wiki: https://wcm-io.atlassian.net/wiki/<br/>
11-
Continuous Integration: https://github.com/wcm-io/wcm-io-samples/actions<br/>
11+
Continuous Integration: https://github.com/wcm-io/io.wcm.samples/actions<br/>
1212
Commercial support: https://wcm.io/commercial-support.html
1313

1414

1515
### Build and deploy samples from source
1616

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

19-
See [Maven Settings](https://github.com/wcm-io/wcm-io-samples/blob/develop/.maven-settings.xml) for an example with a full configuration.
19+
See [Maven Settings](https://github.com/wcm-io/io.wcm.samples/blob/develop/.maven-settings.xml) for an example with a full configuration.
2020

21-
- Clone the github repository https://github.com/wcm-io/wcm-io-samples
21+
- Clone the github repository https://github.com/wcm-io/io.wcm.samples
2222
- Start an AEM author instance at http://localhost:4502
2323
- Execute deploy script `build-deploy.sh` to deploy the application and sample content and configuration to the instance.
2424
- Open http://localhost:4502/editor.html/content/wcm-io-samples/en.html in your browser
2525

2626

2727
### System requirements
2828

29-
- AEM 6.5 or AEMaaCS
30-
- JDK 1.8 or Java 11
29+
- AEM 6.5.7+ or AEMaaCS SDK
30+
- Java 11

‎build-deploy_aem65.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
# #%L
3+
# wcm.io
4+
# %%
5+
# Copyright (C) 2021 wcm.io
6+
# %%
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
# #L%
19+
20+
21+
SLING_URL="http://localhost:45025"
22+
23+
if [[ $0 == *":\\"* ]]; then
24+
DISPLAY_PAUSE_MESSAGE=true
25+
fi
26+
27+
if [ "$?" -ne "0" ]; then
28+
exit
29+
fi
30+
31+
./build-deploy.sh --sling.url=${SLING_URL} --display.pause.message=${DISPLAY_PAUSE_MESSAGE} "$@"

‎bundles/clientlibs/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.samples</groupId>
2727
<artifactId>io.wcm.samples.parent</artifactId>
28-
<version>1.4.0</version>
28+
<version>1.4.2</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.samples.clientlibs</artifactId>
34-
<version>1.4.0</version>
34+
<version>1.4.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>Sample Application Clientlibs</name>

0 commit comments

Comments
 (0)