From 74d7d6d2cbfe67e2bc97a79fb03f01a8d9d842c2 Mon Sep 17 00:00:00 2001
From: kasramp <kasra_mp@yahoo.com>
Date: Sun, 30 Apr 2023 14:13:23 +0200
Subject: [PATCH] #25 final version of release note generation

---
 .github/workflows/build_and_release.yml     |  9 +++---
 .github/workflows/generate_release_note.yml | 14 --------
 pom.xml                                     | 36 ++++++++++-----------
 3 files changed, 23 insertions(+), 36 deletions(-)
 delete mode 100644 .github/workflows/generate_release_note.yml

diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
index 9d1328d..995773a 100644
--- a/.github/workflows/build_and_release.yml
+++ b/.github/workflows/build_and_release.yml
@@ -56,18 +56,19 @@ jobs:
         shell: bash
         run: |
           echo "::set-output name=TAGGED_VERSION::$(git for-each-ref --sort=-creatordate --format='%(refname:short)' refs/tags --count 10 | grep -oP '^eris-(\d+).*' | head -1)"
-      - name: Generate Release Notes
+      - name: Generate release note
         uses: release-drafter/release-drafter@v5.23.0
-        id: release-drafter
+        id: release_note
+        if: ${{ github.ref == 'refs/heads/master' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           config-name: release.yml
       - name: Perform release
         uses: softprops/action-gh-release@v1
-        if: ${{ github.ref == 'refs/heads/develop' }}
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: ${{ steps.tagged_version.outputs.TAGGED_VERSION }}
-          body: ${{ steps.release-drafter.outputs.changelog }}
+          body: ${{ steps.release_note.outputs.changelog }}
           files: |
             target/*.jar
\ No newline at end of file
diff --git a/.github/workflows/generate_release_note.yml b/.github/workflows/generate_release_note.yml
deleted file mode 100644
index dd84985..0000000
--- a/.github/workflows/generate_release_note.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Generate Release Note
-on:
-  release:
-    types: [published]
-jobs:
-  generate-release-notes:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Generate Release Note
-        uses: release-drafter/release-drafter@v5.23.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          config-path: .github/release.yml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f989f86..e5abcba 100755
--- a/pom.xml
+++ b/pom.xml
@@ -115,12 +115,12 @@
             <version>5.3.1</version>
             <scope>test</scope>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.owasp</groupId>-->
-<!--            <artifactId>dependency-check-maven</artifactId>-->
-<!--            <version>8.2.1</version>-->
-<!--            <type>maven-plugin</type>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <version>8.2.1</version>
+            <type>maven-plugin</type>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -185,18 +185,18 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0</version>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.owasp</groupId>-->
-<!--                <artifactId>dependency-check-maven</artifactId>-->
-<!--                <version>8.2.1</version>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>check</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>8.2.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>