Skip to content

Commit beaf301

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop' into master
2 parents df02d1d + fd3ca3e commit beaf301

File tree

95 files changed

+1934
-552
lines changed

Some content is hidden

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

95 files changed

+1934
-552
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: ./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)

‎.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: ./mvnw -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+
./mvnw -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 }}

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ npm-debug.log
1616
.settings
1717
.externalToolBuilders
1818
.pmd
19+
.eclipse-pmd
1920
.checkstyle
2021
.idea
2122
.vagrant
2223
*.iml
2324
.DS_Store
25+
*.retry
2426
.rubygems
2527
.sass-cache
2628
.rubygems-gem-maven-plugin
2729
*.sublime-*
2830
*nbactions*.xml
2931
.temp/
32+
.vlt
33+
.vlt-sync*
34+
.brackets.json

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

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +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-
5845
<repository>
5946
<id>wcm-io-apache-intermediate-release</id>
6047
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
@@ -111,19 +98,6 @@
11198
</snapshots>
11299
</pluginRepository>
113100

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-
127101
<pluginRepository>
128102
<id>wcm-io-apache-intermediate-release</id>
129103
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
@@ -173,4 +147,12 @@
173147
<activeProfile>default</activeProfile>
174148
</activeProfiles>
175149

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+
176158
</settings>

‎.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* Copyright 2007-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
import java.net.*;
17+
import java.io.*;
18+
import java.nio.channels.*;
19+
import java.util.Properties;
20+
21+
public class MavenWrapperDownloader {
22+
23+
private static final String WRAPPER_VERSION = "0.5.6";
24+
/**
25+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
26+
*/
27+
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
28+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
29+
30+
/**
31+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
32+
* use instead of the default one.
33+
*/
34+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
35+
".mvn/wrapper/maven-wrapper.properties";
36+
37+
/**
38+
* Path where the maven-wrapper.jar will be saved to.
39+
*/
40+
private static final String MAVEN_WRAPPER_JAR_PATH =
41+
".mvn/wrapper/maven-wrapper.jar";
42+
43+
/**
44+
* Name of the property which should be used to override the default download url for the wrapper.
45+
*/
46+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
47+
48+
public static void main(String args[]) {
49+
System.out.println("- Downloader started");
50+
File baseDirectory = new File(args[0]);
51+
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
52+
53+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
54+
// wrapperUrl parameter.
55+
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
56+
String url = DEFAULT_DOWNLOAD_URL;
57+
if(mavenWrapperPropertyFile.exists()) {
58+
FileInputStream mavenWrapperPropertyFileInputStream = null;
59+
try {
60+
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
61+
Properties mavenWrapperProperties = new Properties();
62+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
63+
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
64+
} catch (IOException e) {
65+
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
66+
} finally {
67+
try {
68+
if(mavenWrapperPropertyFileInputStream != null) {
69+
mavenWrapperPropertyFileInputStream.close();
70+
}
71+
} catch (IOException e) {
72+
// Ignore ...
73+
}
74+
}
75+
}
76+
System.out.println("- Downloading from: " + url);
77+
78+
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
79+
if(!outputFile.getParentFile().exists()) {
80+
if(!outputFile.getParentFile().mkdirs()) {
81+
System.out.println(
82+
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
83+
}
84+
}
85+
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
86+
try {
87+
downloadFileFromURL(url, outputFile);
88+
System.out.println("Done");
89+
System.exit(0);
90+
} catch (Throwable e) {
91+
System.out.println("- Error downloading");
92+
e.printStackTrace();
93+
System.exit(1);
94+
}
95+
}
96+
97+
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
98+
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
99+
String username = System.getenv("MVNW_USERNAME");
100+
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
101+
Authenticator.setDefault(new Authenticator() {
102+
@Override
103+
protected PasswordAuthentication getPasswordAuthentication() {
104+
return new PasswordAuthentication(username, password);
105+
}
106+
});
107+
}
108+
URL website = new URL(urlString);
109+
ReadableByteChannel rbc;
110+
rbc = Channels.newChannel(website.openStream());
111+
FileOutputStream fos = new FileOutputStream(destination);
112+
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
113+
fos.close();
114+
rbc.close();
115+
}
116+
117+
}

‎.mvn/wrapper/maven-wrapper.jar

49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
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

‎.travis.yml

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

‎README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<img src="https://wcm.io/images/favicon-16@2x.png"/> wcm.io Samples
22
======
3-
[![Build Status](https://travis-ci.org/wcm-io/wcm-io-samples.png?branch=develop)](https://travis-ci.org/wcm-io/wcm-io-samples)
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)
45

56
Sample projects and applications to demonstrate and test wcm.io features.
67

78
Documentation: https://wcm.io/samples/<br/>
89
Issues: https://wcm-io.atlassian.net/browse/WSAM<br/>
910
Wiki: https://wcm-io.atlassian.net/wiki/<br/>
10-
Continuous Integration: https://travis-ci.org/wcm-io/wcm-io-samples/
11+
Continuous Integration: https://github.com/wcm-io/wcm-io-samples/actions<br/>
12+
Commercial support: https://wcm.io/commercial-support.html
1113

1214

1315
### Build and deploy samples from source
1416

1517
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.
1618

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

1921
- Clone the github repository https://github.com/wcm-io/wcm-io-samples
2022
- Start an AEM author instance at http://localhost:4502
@@ -24,5 +26,5 @@ See [Travis Maven settings.xml](https://github.com/wcm-io/wcm-io-samples/blob/ma
2426

2527
### System requirements
2628

27-
- AEM 6.3 or higher
28-
- JDK 1.8
29+
- AEM 6.5 or AEMaaCS
30+
- JDK 1.8 or Java 11

0 commit comments

Comments
 (0)