Merge pull request #328 from xenit-eu/master

Release 2.1.0

.github/workflows/ci.yml

@@ -0,0 +1,64 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+env:
+  ORG_GRADLE_PROJECT_alfresco_nexus_username: ${{ secrets.ALFRESCO_NEXUS_USERNAME }}
+  ORG_GRADLE_PROJECT_alfresco_nexus_password: ${{ secrets.ALFRESCO_NEXUS_PASSWORD }}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Test
+        run: ./gradlew test
+      - name: Upload analysis to sonarcloud
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
+        run: ./gradlew sonarqube
+  integration-test:
+    runs-on: ubuntu-latest
+    if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.base_ref, 'master') || startswith(github.ref, 'refs/heads/release') }}
+    strategy:
+      matrix:
+        flavour: [ "community", "enterprise" ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Test
+        run: ./gradlew integrationTest -P${{ matrix.flavour }}
+        env:
+          ORG_GRADLE_PROJECT_xenit_docker_registry_url: ${{ secrets.XENIT_DOCKER_REGISTRY_URL }}
+          ORG_GRADLE_PROJECT_xenit_docker_registry_username: ${{ secrets.XENIT_DOCKER_REGISTRY_USERNAME }}
+          ORG_GRADLE_PROJECT_xenit_docker_registry_password: ${{ secrets.XENIT_DOCKER_REGISTRY_PASSWORD }}
+  publish:
+    needs: [test, integration-test]
+    runs-on: ubuntu-latest
+    if: ${{ startsWith(github.ref, 'refs/heads/master') || startswith(github.ref, 'refs/heads/release') }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Publish
+        env:
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVEN_CENTRAL_GPG_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVEN_CENTRAL_GPG_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatype_password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+        run: ./gradlew publish -PsigningKeyId=CDE3528F

CHANGELOG.md

@@ -1,6 +1,6 @@
 ---
 title: Changelog - Dynamic Extensions for Alfresco
-date: 10 September 2020
+date: 10 May 2021
 report: true
 colorlinks: true
 ---
@@ -21,6 +21,11 @@ Version template:
  -->
 # Dynamic Extensions For Alfresco Changelog
 
+## [2.1.0] - 2021-05-10
+### Added
+* Alfresco 7 support
+* [#321](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/pull/321) Gradle plugin supports creating DE Bundles from arbitrary Jars
+
 ## [2.0.5] - 2020-09-10
 ### Fixed
 * [#306](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/306) Alfresco 6.2.1 issues due to cglib imports in control-panel bundle

README.md

@@ -1,10 +1,16 @@
 # Dynamic Extensions for Alfresco
 
 [![Apache License 2](https://img.shields.io/badge/license-Apache%202-blue.svg)](LICENSE)
-[![Travis Build Status](https://img.shields.io/travis/xenit-eu/dynamic-extensions-for-alfresco?label=Travis)](https://travis-ci.org/xenit-eu/dynamic-extensions-for-alfresco)
-[![Jenkins Build Status](https://jenkins-2.xenit.eu/buildStatus/icon?job=Xenit+Github%2Fdynamic-extensions-for-alfresco%2Fmaster&subject=Jenkins)](https://jenkins-2.xenit.eu/job/Xenit%20Github/job/dynamic-extensions-for-alfresco/job/master/)
+[![CI](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/workflows/CI/badge.svg)](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/actions?query=workflow%3ACI+branch%3Amaster)
 [![Maven Central](https://img.shields.io/maven-central/v/eu.xenit/alfresco-dynamic-extensions-repo-61.svg?maxAge=300)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22eu.xenit%22%20AND%20a%3A%22alfresco-dynamic-extensions-repo-*%22)
 
+> [![Xenit Logo](https://xenit.eu/wp-content/uploads/2017/09/XeniT_Website_Logo.png)](https://xenit.eu/open-source)
+>
+> Dynamic Extensions is a part of the Xenit Open Source Tooling around Alfresco. Xenit is company with a deep expertise 
+> and a strong team around Alfresco. If you'd like to learn more about our 
+> [tools](https://xenit.eu/open-source), [services](https://xenit.eu/alfresco) and 
+> [products](https://xenit.eu/alfresco-products), please visit our [website](https://xenit.eu).
+
 Add OSGi based hot-deploy functionality and Spring annotation based configuration to Alfresco.
 
 ## Introduction
@@ -60,6 +66,7 @@ the [Alfresco Docker Gradle Plugins](https://github.com/xenit-eu/alfresco-docker
 
 Dynamic Extensions is systematically integration-tested against:
 
+* Alfresco Enterprise & Community 7.0
 * Alfresco Enterprise & Community 6.2 (Requires hotfix, see below)
 * Alfresco Enterprise & Community 6.1 (Requires hotfix, see below)
 * Alfresco Enterprise & Community 6.0

alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-70/module.properties

@@ -0,0 +1,7 @@
+module.id = ${project.parent.name}
+module.version = ${project.version.replace('-SNAPSHOT','')}
+module.title = Dynamic Extensions for Alfresco ${project.ext.simpleAlfrescoVersion}
+module.description = Dynamic Extensions for Alfresco module package
+
+module.repo.version.min=7.0.0
+module.repo.version.max=7.0.99

annotations-runtime/src/test/java/com/github/dynamicextensionsalfresco/webscripts/ExceptionHandlerAbstractClass.java

@@ -0,0 +1,14 @@
+package com.github.dynamicextensionsalfresco.webscripts;
+
+import com.github.dynamicextensionsalfresco.webscripts.annotations.ExceptionHandler;
+
+public abstract class ExceptionHandlerAbstractClass {
+
+    IndexOutOfBoundsException indexOutOfBoundsException;
+
+    @ExceptionHandler(IndexOutOfBoundsException.class)
+    protected void handleIndexOutOfBoundsException(final IndexOutOfBoundsException e) {
+        indexOutOfBoundsException = e;
+    }
+
+}

annotations-runtime/src/test/java/com/github/dynamicextensionsalfresco/webscripts/ExceptionHandlerExample.java

@@ -8,7 +8,7 @@
 
 @Component
 @Spied
-public class ExceptionHandlerExample {
+public class ExceptionHandlerExample extends ExceptionHandlerAbstractClass implements ExceptionHandlerInterface {
 
 	IllegalArgumentException illegalArgumentException;
 
@@ -28,6 +28,16 @@ public void throwIllegalStateException() {
 		throw new IllegalStateException();
 	}
 
+	@Uri("/throwUnsupportedOperationException")
+	public void throwUnsupportedOperationException() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Uri("/throwIndexOutOfBoundsException")
+	public void throwIndexOutOfBoundsException() {
+		throw new IndexOutOfBoundsException();
+	}
+
 	/* Utility operations */
 
 	@ExceptionHandler(IllegalArgumentException.class)

annotations-runtime/src/test/java/com/github/dynamicextensionsalfresco/webscripts/ExceptionHandlerInterface.java

@@ -0,0 +1,14 @@
+package com.github.dynamicextensionsalfresco.webscripts;
+
+import static org.junit.Assert.assertNotNull;
+
+import com.github.dynamicextensionsalfresco.webscripts.annotations.ExceptionHandler;
+
+public interface ExceptionHandlerInterface {
+
+    @ExceptionHandler(UnsupportedOperationException.class)
+    default void handleUnsupportedOperationException(final UnsupportedOperationException ignore) {
+        assertNotNull(ignore);
+    }
+
+}