Skip to content

Commit f6f68e5

Browse files
wildonewildone
authored
Merge pull request #4 from aem-design/develop
Develop
2 parents 825fffa + 612b972 commit f6f68e5

File tree

84 files changed

+3728
-1264
lines changed

Some content is hidden

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

84 files changed

+3728
-1264
lines changed

‎.editorconfig‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 2
7+
indent_style = space
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false
13+
14+
[*.{groovy,java,xml}]
15+
indent_size = 4

‎.github/workflows/main.yml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
name: ci
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
max-parallel: 4
10+
matrix:
11+
python-version: [3.6]
12+
env:
13+
DOCKER_IMAGE: "aemdesign/centos-java-buildpack"
14+
SONAR_ORGANISATION: "aemdesign-github"
15+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
16+
SONAR_URL: "https://sonarcloud.io"
17+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
18+
SONATYPE_USERNAME: "aemdesign"
19+
GITHUB_USER: aemdesign
20+
TRAVIS_TOKEN: ${{ secrets.TRAVIS_TOKEN }}
21+
GITHUB_EMAIL: ${{ secrets.GITHUB_EMAIL }}
22+
GITHUB_USERNAME: ${{ secrets.GITHUB_USERNAME }}
23+
GITHUB_TOKEN_ADMIN: ${{ secrets.GITHUB_TOKEN_ADMIN }}
24+
AEM_NAME: ${{ secrets.AEM_NAME }}
25+
AEM_KEY: ${{ secrets.AEM_KEY }}
26+
GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
27+
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
28+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
29+
GPG_EXECUTABLE: gpg
30+
GPG_PRESET_EXECUTABLE: /usr/lib/gnupg/gpg-preset-passphrase
31+
GPG_PUBID: "50A036956AAC64C13EF47B10D1E96A30ECFC7DFF"
32+
GPG_PUBID_KEYGRIP: "020E615868703482DC2CD110B98D2702B6ABF89C"
33+
34+
35+
36+
steps:
37+
- uses: actions/checkout@v1
38+
with:
39+
submodules: true
40+
lfs: true
41+
- uses: actions/setup-node@v1
42+
with:
43+
node-version: '10.x'
44+
registry-url: https://npm.pkg.github.com/
45+
scope: "@aem-design"
46+
env:
47+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN_ADMIN }}
48+
- name: set up python ${{ matrix.python-version }}
49+
uses: actions/setup-python@v1
50+
with:
51+
python-version: ${{ matrix.python-version }}
52+
- name: get release notes
53+
run: |
54+
source <(curl -sL https://github.com/aem-design/aemdesign-docker/releases/latest/download/github_get_version.sh)
55+
echo "===START==="
56+
echo $GIT_RELEASE_NOTES
57+
echo "====END===="
58+
echo CURRENT_VERSION=$CURRENT_VERSION
59+
- name: set eval variables
60+
run: |
61+
echo ::set-env name=DOCKER_COMMAND::docker run --user $(id -u):$(id -g) -v ${GITHUB_WORKSPACE}:/build ${DOCKER_IMAGE}
62+
$DOCKER_COMMAND java -version
63+
$DOCKER_COMMAND node -v
64+
git config --global user.email "${GITHUB_EMAIL}"
65+
git config --global user.name "${GITHUB_USERNAME}"
66+
- name: setup gpg
67+
run: |
68+
source <(curl -sL https://github.com/aem-design/aemdesign-docker/releases/latest/download/setup-gpg.sh)
69+
- name: docker - mvn clean (cache .m2 in ./build/.m2/repository in repo dir)
70+
run: $DOCKER_COMMAND mvn clean -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -Dmaven.repo.local=./build/.m2/repository
71+
- name: docker - mvn package
72+
run: $DOCKER_COMMAND mvn package -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -Dmaven.repo.local=./build/.m2/repository
73+
74+
- name: docker - sonar qube on master
75+
if: github.ref == 'refs/heads/master'
76+
run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
77+
- name: docker - sonar qube on master
78+
if: github.ref != 'refs/heads/master'
79+
run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.branch.target=master" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
80+
81+
- name: run unit tests with coverage reports
82+
run: mvn test -q && bash <(curl -s https://codecov.io/bash)
83+
84+
- name: deploy to maven cental
85+
if: github.ref == 'refs/heads/master'
86+
run: $DOCKER_COMMAND echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import && echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust && mvn clean deploy --settings default.xml -B -P release
87+
88+
- uses: meeDamian/[email protected]
89+
if: github.ref == 'refs/heads/master'
90+
with:
91+
token: ${{ secrets.GITHUB_TOKEN }}
92+
tag: ${CURRENT_VERSION}
93+
name: ${CURRENT_VERSION}
94+
body: $GIT_RELEASE_NOTES
95+
files: >
96+
aemdesign-aem-core-deploy/target/aemdesign-aem-core-deploy-$CURRENT_VERSION.zip
97+
aemdesign-aem-services/target/aemdesign-aem-services-$CURRENT_VERSION.jar
98+
aemdesign-aem-author/target/aemdesign-aem-author-$CURRENT_VERSION.zip
99+
aemdesign-aem-common/target/aemdesign-aem-common-$CURRENT_VERSION.zip
100+
101+
- name: trigger build of bundle docker container
102+
if: github.ref == 'refs/heads/master'
103+
run: |
104+
docker run --rm aemdesign/travis-trigger-build sbb --github_user=${GITHUB_USER} --github_repo=aem --github_branch=6.5.0-bundle --travis_token=${TRAVIS_TOKEN}
105+
docker run --rm aemdesign/travis-trigger-build sbb --github_user=${GITHUB_USER} --github_repo=aem --github_branch=6.4.0-bundle --travis_token=${TRAVIS_TOKEN}
106+
107+
- name: automation test if failure
108+
run: |
109+
df
110+
docker ps -a
111+
docker logs -t service_aem_container_name
112+
if: failure()
113+

‎.gitlab-ci.yml‎

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

‎.travis.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ before_install:
1414
- echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
1515
- mvn clean -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -q && echo "CLEAN DONE"
1616
- mvn package -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -q && echo "PACKAGE AND LOCAL INSTALL DONE"
17-
- if [[ $TRAVIS_BRANCH == "master" && $SONAR_ENABLED == "true" ]]; then mvn sonar:sonar -q "-Dsonar.branch.name=${TRAVIS_BRANCH}" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}" && echo "SONAR ON ${TRAVIS_BRANCH} DONE"; fi
17+
- if [[ $TRAVIS_BRANCH == "master" && $SONAR_ENABLED == "true" && $TRAVIS_PULL_REQUEST == "false" ]]; then mvn sonar:sonar -q "-Dsonar.branch.name=${TRAVIS_BRANCH}" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}" && echo "SONAR ON ${TRAVIS_BRANCH} DONE"; fi
1818
- if [[ $TRAVIS_BRANCH != "master" && $SONAR_ENABLED == "true" ]]; then mvn sonar:sonar -q "-Dsonar.branch.name=${TRAVIS_BRANCH}" "-Dsonar.branch.target=master" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}" && echo "SONAR ON ${TRAVIS_BRANCH} DONE"; fi
19+
- export GIT_RELEASE_NOTES="$(git log $(git describe --tags --abbrev=0)..HEAD --pretty=format:"%h - %s (%an)")"
1920
- echo "READY"
2021
- declare -a REPO_SLUG_ARRAY="(${TRAVIS_REPO_SLUG/\// })"
2122

@@ -26,14 +27,14 @@ install:
2627

2728
## Build and release to maven central
2829
script:
29-
- if [[ $TRAVIS_BRANCH == "master" ]]; then mvn clean deploy --settings default.xml -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests=true -B -Prelease; fi
30+
- if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]]; then mvn clean deploy --settings default.xml -B -Prelease; fi
3031

3132
## Get the project version, only tag if tag does not exist
3233
before_deploy:
3334
- export CURRENT_VERSION=$(mvn help:evaluate -q -DforceStdout -Dexpression=project.version)
3435
- echo CURRENT_VERSION=$CURRENT_VERSION
3536
- export TRAVIS_TAG=$CURRENT_VERSION
36-
- if [[ $TRAVIS_BRANCH == "master" ]] && [[ -z $(git tag -l "$CURRENT_VERSION") ]]; then git tag $TRAVIS_TAG; fi
37+
- if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]] && [[ -z $(git tag -l "$CURRENT_VERSION") ]]; then git tag $TRAVIS_TAG; fi
3738

3839
## Create release in GitHub
3940
deploy:
@@ -45,13 +46,16 @@ deploy:
4546
- aemdesign-aem-author/target/aemdesign-aem-author-$CURRENT_VERSION.zip
4647
- aemdesign-aem-common/target/aemdesign-aem-common-$CURRENT_VERSION.zip
4748
skip_cleanup: true
49+
tag_name: $CURRENT_VERSION
50+
name: $CURRENT_VERSION
51+
target_commitish: $TRAVIS_COMMIT
52+
body: $GIT_RELEASE_NOTES
4853
on:
4954
branch: master
50-
name: $CURRENT_VERSION
5155
- provider: script
52-
script: if [[ $TRAVIS_BRANCH == "master" ]]; then bash docker run --rm aemdesign/travis-trigger-build sbb --github_user=${REPO_SLUG_ARRAY[0]} --github_repo=aem --github_branch=6.5.0-bundle --travis_token=${TRAVIS_TOKEN}; fi
56+
script: if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]]; then bash docker run --rm aemdesign/travis-trigger-build sbb --github_user=${REPO_SLUG_ARRAY[0]} --github_repo=aem --github_branch=6.5.0-bundle --travis_token=${TRAVIS_TOKEN}; fi
5357
- provider: script
54-
script: if [[ $TRAVIS_BRANCH == "master" ]]; then bash docker run --rm aemdesign/travis-trigger-build sbb --github_user=${REPO_SLUG_ARRAY[0]} --github_repo=aem --github_branch=6.4.0-bundle --travis_token=${TRAVIS_TOKEN}; fi
58+
script: if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]]; then bash docker run --rm aemdesign/travis-trigger-build sbb --github_user=${REPO_SLUG_ARRAY[0]} --github_repo=aem --github_branch=6.4.0-bundle --travis_token=${TRAVIS_TOKEN}; fi
5559

5660
#notifications:
5761
# email: false

‎aemdesign-aem-author/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>design.aem</groupId>
1010
<artifactId>aemdesign-aem-core</artifactId>
11-
<version>2.0.508</version>
11+
<version>2.0.581</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

@@ -17,7 +17,7 @@
1717
<!-- ====================================================================== -->
1818

1919
<artifactId>aemdesign-aem-author</artifactId>
20-
<version>2.0.508</version>
20+
<version>2.0.581</version>
2121
<packaging>content-package</packaging>
2222
<name>AEM Design - Core - AEM Author UI Updates</name>
2323
<description>Updates to OOTB AEM</description>

‎aemdesign-aem-common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>design.aem</groupId>
1010
<artifactId>aemdesign-aem-core</artifactId>
11-
<version>2.0.508</version>
11+
<version>2.0.581</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

@@ -17,7 +17,7 @@
1717
<!-- ====================================================================== -->
1818

1919
<artifactId>aemdesign-aem-common</artifactId>
20-
<version>2.0.508</version>
20+
<version>2.0.581</version>
2121
<packaging>content-package</packaging>
2222
<name>AEM Design - Core - AEM Common</name>
2323
<description>AEM Design package with all common components</description>

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/vendorlib/bootstrap/js.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
js/bootstrap.min.js
2-
#js/bootstrap.bundle.js
1+
#js/bootstrap.min.js
2+
js/bootstrap.bundle.js

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/.content.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
jcr:description="Allows displaying content within Details Components"
4+
jcr:primaryType="cq:Component"
5+
jcr:title="Content Template"
6+
cq:icon="fileTemplate"
7+
sling:resourceSuperType="aemdesign/components/content/contenttemplate/v1/contenttemplate"
8+
componentGroup="AEM.Design - Content"/>

‎aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/v1/contenttemplate/.content.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
jcr:description="Allows displaying content within Details Components"
4+
jcr:primaryType="cq:Component"
5+
jcr:title="Content Template"
6+
cq:icon="fileTemplate"
7+
componentGroup="hidden"/>

0 commit comments

Comments
 (0)