Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release composum-nodes-3.4.2 - AEM asset view enhancements #283

Merged
merged 5 commits into from
Apr 28, 2022
Merged

release composum-nodes-3.4.2 - AEM asset view enhancements #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f47213e
next development iteration
ist-rw Apr 7, 2022
5812d43
enable Github Actions build
stoerr Apr 14, 2022
433b48b
video and pdf support for the browsers AEM asset view
ist-rw Apr 22, 2022
66cc07b
video and pdf support for the browsers AEM asset view - embdded PDF v…
ist-rw Apr 25, 2022
638bb79
release composum-nodes-3.4.2 - AEM asset view enhancements
ist-rw Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions .github/settings-istrepo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
xmlns="http://maven.apache.org/SETTINGS/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- Settings to build with IST repository and deploy to IST repository. -->

<servers>
<server>
<id>istrepo</id>
<username>${env.NEXUS_BUILD_USER}</username>
<password>${env.NEXUS_BUILD_PASSWD}</password>
</server>
<server>
<id>istrepo-internal</id>
<username>${env.NEXUS_BUILD_USER}</username>
<password>${env.NEXUS_BUILD_PASSWD}</password>
</server>
<server>
<id>istrepo-snapshots</id>
<username>${env.NEXUS_BUILD_USER}</username>
<password>${env.NEXUS_BUILD_PASSWD}</password>
</server>
</servers>

<mirrors>
<!-- -->
<mirror>
<id>istrepo</id>
<name>istrepo</name>
<mirrorOf>*</mirrorOf>
<url>https://repo.ist-software.com/repository/maven-public</url>
</mirror>
<!-- -->
</mirrors>

<profiles>

<!--
* deployment profiles for each branch
* starts the deployment for a branch if deployment configuration is present
* only one branch should have a working deployment configuration for one target
-->
<profile>
<id>master</id>
</profile>

<profile>
<id>develop</id>
<properties>
<deploy.package>true</deploy.package>
<sling.scheme>https</sling.scheme>
<sling.secure>true</sling.secure>
<sling.host>test.composum.com</sling.host>
<sling.port>443</sling.port>
<sling.context></sling.context>
<sling.password>${env.NEXUS_BUILD_PASSWD}</sling.password>
</properties>
</profile>

<!--
* default repository profiles
-->
<profile>
<id>istrepo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>istrepo-internal</id>
<name>istrepo</name>
<url>https://repo.ist-software.com/repository/maven-releases</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>istrepo-snapshots</id>
<name>istrepo</name>
<url>https://repo.ist-software.com/repository/maven-snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>istrepo-internal</id>
<name>istrepo</name>
<url>https://repo.ist-software.com/repository/maven-releases</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>istrepo-snapshots</id>
<name>istrepo</name>
<url>https://repo.ist-software.com/repository/maven-snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>

</profiles>
</settings>
51 changes: 51 additions & 0 deletions .github/settings-public.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
xmlns="http://maven.apache.org/SETTINGS/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- Try building with only the public repositories -->

<profiles>

<!-- https://repo.adobe.com/index.html
According to https://experienceleaguecommunities.adobe.com/t5/adobe-experience-manager/not-able-to-access-repo-adobe-com/td-p/386197
the adobe public repo is to be migrated to maven central, but as of 20/04/11 at least the
com.day.jcr.vault:content-package-maven-plugin-parent:pom:0.0.24 is missing for the
com.day.jcr.vault:content-package-maven-plugin:jar:0.0.24 .
TODO: remove this ASAP and just use normal settings provided by Github Actions.
-->
<profile>
<id>adobe-public</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<pluginRepositories>
<pluginRepository>
<!-- prefer maven central plugin repo -->
<id>central</id>
<name>Central Repository</name>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>

<pluginRepository>
<!-- But fall back to adobe repo for the missing things. :-( -->
<id>adobe-public-releases</id>
<name>Adobe Public Repository</name>
<url>https://repo.adobe.com/nexus/content/groups/public</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>

</profiles>
</settings>
29 changes: 0 additions & 29 deletions .github/workflows/build.yml
View file
Open in desktop

This file was deleted.

40 changes: 40 additions & 0 deletions .github/workflows/develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This builds develop and deploys a snapshot to our repository.
# Will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
name: Develop - Build and Deploy Snapshot

on:
push:
branches: [ develop ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven

- name: Build with Maven
# When parent-2:1.7 is active, -P ensureSnapshots will do a sanity check of the version number
run: mvn -s .github/settings-istrepo.xml -P ensureSnapshots -B verify

- name: Sanitycheck version before deploying
run: |
echo "Version: "
mvn -s .github/settings-istrepo.xml help:evaluate -Dexpression=project.version -q -DforceStdout
mvn -s .github/settings-istrepo.xml help:evaluate -Dexpression=project.version -q -DforceStdout | egrep -- '-SNAPSHOT$' > /dev/null || exit 1
# unfortunately, this would require a snapshot parent if just called from the command line, so we cannot use it: :-(
# mvn org.apache.maven.plugins:maven-enforcer-plugin:3.0.0:enforce -Drules=requireSnapshotVersion

- name: Deploy with Maven
run: mvn -s .github/settings-istrepo.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -P develop -B deploy
env:
NEXUS_BUILD_USER: ${{ secrets.NEXUS_BUILD_USER }}
NEXUS_BUILD_PASSWD: ${{ secrets.NEXUS_BUILD_PASSWD }}
38 changes: 38 additions & 0 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#
# Will build a Java project with Maven, but NOT cache/restore any dependencies to check with central repo
name: Master - Test public build and generate and deploy site

on:
push:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
# deliberately not, to check with central repo: cache: maven

- name: Check versioning
run: mvn -s .github/settings-public.xml org.apache.maven.plugins:maven-enforcer-plugin:3.0.0:enforce -Drules=requireReleaseVersion,requireReleaseDeps

- name: Check build with Maven
run: mvn -s .github/settings-public.xml -B verify

- name: Site with Maven
run: mvn -s .github/settings-public.xml -B site site:stage

- name: Deploy Site
uses: JamesIves/github-pages-deploy-action@v4.3.0
with:
branch: gh-pages
folder: target/staging
git-config-name: build
git-config-email: <>
22 changes: 22 additions & 0 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Sanity check for pull requests - just checks that it compiles.
# Will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
name: Pullrequest - Sanitycheck

on: pull_request

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven

- name: Build with Maven
run: mvn -s .github/settings-istrepo.xml -B verify
2 changes: 1 addition & 1 deletion commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.composum.nodes</groupId>
<artifactId>composum-nodes</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
</parent>

<artifactId>composum-nodes-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion console/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.composum.nodes</groupId>
<artifactId>composum-nodes</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
</parent>

<artifactId>composum-nodes-console</artifactId>
Expand Down
Loading