Merge pull request #335 from xenit-eu/master

DEVEM-492 Release 2.1.1
xenit-eu · Sep 14, 2021 · f8c0ff8 · f8c0ff8
2 parents d24ea69 + b8063c5
commit f8c0ff8
Show file tree

Hide file tree

Showing 21 changed files with 1,608 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,4 +61,10 @@ jobs:
           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
+        run: ./gradlew publish -PsigningKeyId=CDE3528F
+      - name: Publish Gradle Plugin
+        if: ${{ startswith(github.ref, 'refs/heads/release') }}
+        env:
+          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PLUGINS_PUBLISH_KEY }}
+          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PLUGINS_PUBLISH_SECRET }}
+        run: ./gradlew publishPlugins -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,11 @@ Version template:
  -->
 # Dynamic Extensions For Alfresco Changelog
 
+## [2.1.1] - 2021-09-08
+### Fixed
+* [#329](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/329) Reenable publishing of gradle plugin
+* [#331](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/331) DEVEM-486 Fix regresssion in JSONWriterResolution
+
 ## [2.1.0] - 2021-05-10
 ### Added
 * Alfresco 7 support