Merge branch 'release/7.6'

bsorrentino · Jun 3, 2022 · bb7dc92 · bb7dc92
2 parents 038ffb9 + 98d2aca
commit bb7dc92
Show file tree

Hide file tree

Showing 16 changed files with 184 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,91 @@
 ## Next release
 ### Generic changes
 
+**build: set version to next release**
+
+
+[f6d7c5895144f96](https://github.com/bsorrentino/maven-confluence-plugin/commit/f6d7c5895144f96) bsorrentino *2022-06-03 15:25:39*
+
+**Merge branch 'feature/pr267' into develop**
+
+
+[a9413fb9d78e4be](https://github.com/bsorrentino/maven-confluence-plugin/commit/a9413fb9d78e4be) bsorrentino *2022-06-03 13:21:44*
+
+**Merge branch 'feature/multipleJiraInstances' of https://github.com/tspindler/maven-confluence-plugin into feature/pr267**
+
+
+[dfbbd1c66d45fba](https://github.com/bsorrentino/maven-confluence-plugin/commit/dfbbd1c66d45fba) bsorrentino *2022-06-03 13:20:46*
+
+**Merge branch 'feature/pr265' into develop**
+
+
+[f87fe0a07c9ffaa](https://github.com/bsorrentino/maven-confluence-plugin/commit/f87fe0a07c9ffaa) bsorrentino *2022-06-03 13:15:39*
+
+**fix(core): upgrade jackson from 2.12.0 to version 2.12.7 to fix security issue**
+
+ * fix PR #265
+
+[87210cc8ad24d50](https://github.com/bsorrentino/maven-confluence-plugin/commit/87210cc8ad24d50) bsorrentino *2022-06-03 13:15:21*
+
+**Merge remote-tracking branch 'origin/dependabot/maven/core/com.fasterxml.jackson.core-jackson-databind-2.12.6.1' into feature/pr265**
+
+
+[562a79aaf2963da](https://github.com/bsorrentino/maven-confluence-plugin/commit/562a79aaf2963da) bsorrentino *2022-06-03 13:05:20*
+
+**build: move to next development version**
+
+
+[2977d45b00956b7](https://github.com/bsorrentino/maven-confluence-plugin/commit/2977d45b00956b7) bsorrentino *2022-06-03 13:03:34*
+
+**added function to define jira instance baseurl bsorrentino#136**
+
+
+[ecea4d2b9767cc5](https://github.com/bsorrentino/maven-confluence-plugin/commit/ecea4d2b9767cc5) tspindler *2022-06-01 12:13:07*
+
+**Merge tag 'v7.5' into develop**
+
+ * new release
+
+[a37e81df195468e](https://github.com/bsorrentino/maven-confluence-plugin/commit/a37e81df195468e) bsorrentino *2022-04-01 11:24:23*
+
+**Bump jackson-databind from 2.12.0 to 2.12.6.1 in /core**
+
+ * Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.12.0 to 2.12.6.1.
+ * - [Release notes](https://github.com/FasterXML/jackson/releases)
+ * - [Commits](https://github.com/FasterXML/jackson/commits)
+ * ---
+ * updated-dependencies:
+ * - dependency-name: com.fasterxml.jackson.core:jackson-databind
+ * dependency-type: direct:production
+ * ...
+ * Signed-off-by: dependabot[bot] &lt;[email protected]&gt;
+
+[7df5e821ee91132](https://github.com/bsorrentino/maven-confluence-plugin/commit/7df5e821ee91132) dependabot[bot] *2022-04-01 11:06:28*
+
+
+## v7.5
+### Generic changes
+
+**Merge branch 'hotfix/7.5'**
+
+
+[038ffb96acf802f](https://github.com/bsorrentino/maven-confluence-plugin/commit/038ffb96acf802f) bsorrentino *2022-04-01 11:24:15*
+
+**update release version**
+
+
+[f7ee12eaf4bda15](https://github.com/bsorrentino/maven-confluence-plugin/commit/f7ee12eaf4bda15) bsorrentino *2022-04-01 11:24:06*
+
+**update changelog**
+
+
+[6097399e98bb019](https://github.com/bsorrentino/maven-confluence-plugin/commit/6097399e98bb019) bsorrentino *2022-04-01 11:09:57*
+
+**Merge branch 'master' into develop**
+
+
+[417cfcd604ba0f5](https://github.com/bsorrentino/maven-confluence-plugin/commit/417cfcd604ba0f5) bsorrentino *2022-04-01 11:05:41*
+
 **Merge branch 'hotfix/docs'**
 
 
@@ -15,9 +100,11 @@
 
 [8526cd456884e12](https://github.com/bsorrentino/maven-confluence-plugin/commit/8526cd456884e12) bsorrentino *2022-04-01 11:05:23*
 
+**Merge tag 'v7.5' into develop**
 
-## v7.5
-### Generic changes
+ * new release
+
+[9828cee1b4e44fe](https://github.com/bsorrentino/maven-confluence-plugin/commit/9828cee1b4e44fe) bsorrentino *2022-04-01 11:01:49*
 
 **Merge branch 'release/7.5'**
 

diff --git a/README.md b/README.md
@@ -27,19 +27,20 @@ For pratical samples refer to folder/module [test-publishing](https://github.com
 
 ## News
 
- Date  | Release | Info   
---- | --- | ---
- **Apr 1, 2022** | [Release 7.5](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.5) | Fix empty table cell not handled properly. Refer to [#264](https://github.com/bsorrentino/maven-confluence-plugin/issues/264).
- **Jan 10, 2022** | [Release 7.4](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.4) | Fix problem with **encoding**. Refer to [#261](https://github.com/bsorrentino/maven-confluence-plugin/issues/261).
- **Aug 09, 2021** | [Release 7.3.2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.3.2) | Fix problem with **ReadTimeout** & **WriteTimeout**. Refer to [#256](https://github.com/bsorrentino/maven-confluence-plugin/issues/256). see the PR [#257](https://github.com/bsorrentino/maven-confluence-plugin/pull/257) for details. Thanks to [qwazer](https://github.com/qwazer) for contribution
- **Aug 07, 2021** | [Release 7.3.1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.3.1) | Refer to  [#256](https://github.com/bsorrentino/maven-confluence-plugin/issues/256) for details
- **Jul 31, 2021** | [Release 7.3](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.3) | Refer to discussion [#247](https://github.com/bsorrentino/maven-confluence-plugin/discussions/247) for details
- **Jul 19, 2021** | [Release 7.2.1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.2.1) | Refer to [#253](https://github.com/bsorrentino/maven-confluence-plugin/issues/253) for details
- **Jun 10, 2021** | [Release 7.2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.2) | Refer to [#252](https://github.com/bsorrentino/maven-confluence-plugin/issues/252) for details
- **Jun 01, 2021** | [Release 7.1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.1) | Refer to [#248](https://github.com/bsorrentino/maven-confluence-plugin/issues/248) for details
- **May 18, 2021** | [Release 7.0](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0) | Refer to [Major Release 7.0](https://github.com/bsorrentino/maven-confluence-plugin/projects/1) for details
- **Mar 07, 2021** | [Release 7.0-rc2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0-rc2) | Refer to [#245](https://github.com/bsorrentino/maven-confluence-plugin/issues/245) npe when children uri from classpath
- **Feb 11, 2021** | [Release 7.0-rc1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0-rc1) | Refer to [#244](https://github.com/bsorrentino/maven-confluence-plugin/issues/244) processor-freemarker doesn't work on 7.0-beta2.
+ Date  | Release                                                                                             | Info   
+--- |-----------------------------------------------------------------------------------------------------| ---
+ **Jun 3, 2022** | [Release 7.6](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.6)             | Merged PR [#201](https://github.com/bsorrentino/maven-confluence-plugin/pull/267) "**added function to define jira instance baseurl**", that fix issue [#136](https://github.com/bsorrentino/maven-confluence-plugin/issues/136). Thanks to [tspindler](https://github.com/tspindler) for contribution
+ **Apr 1, 2022** | [Release 7.5](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.5)             | Fix empty table cell not handled properly. Refer to [#264](https://github.com/bsorrentino/maven-confluence-plugin/issues/264).
+ **Jan 10, 2022** | [Release 7.4](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.4)             | Fix problem with **encoding**. Refer to [#261](https://github.com/bsorrentino/maven-confluence-plugin/issues/261).
+ **Aug 09, 2021** | [Release 7.3.2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.3.2)         | Fix problem with **ReadTimeout** & **WriteTimeout**. Refer to [#256](https://github.com/bsorrentino/maven-confluence-plugin/issues/256). see the PR [#257](https://github.com/bsorrentino/maven-confluence-plugin/pull/257) for details. Thanks to [qwazer](https://github.com/qwazer) for contribution
+ **Aug 07, 2021** | [Release 7.3.1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.3.1)         | Refer to  [#256](https://github.com/bsorrentino/maven-confluence-plugin/issues/256) for details
+ **Jul 31, 2021** | [Release 7.3](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.3)             | Refer to discussion [#247](https://github.com/bsorrentino/maven-confluence-plugin/discussions/247) for details
+ **Jul 19, 2021** | [Release 7.2.1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.2.1)         | Refer to [#253](https://github.com/bsorrentino/maven-confluence-plugin/issues/253) for details
+ **Jun 10, 2021** | [Release 7.2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.2)             | Refer to [#252](https://github.com/bsorrentino/maven-confluence-plugin/issues/252) for details
+ **Jun 01, 2021** | [Release 7.1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.1)             | Refer to [#248](https://github.com/bsorrentino/maven-confluence-plugin/issues/248) for details
+ **May 18, 2021** | [Release 7.0](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0)             | Refer to [Major Release 7.0](https://github.com/bsorrentino/maven-confluence-plugin/projects/1) for details
+ **Mar 07, 2021** | [Release 7.0-rc2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0-rc2)     | Refer to [#245](https://github.com/bsorrentino/maven-confluence-plugin/issues/245) npe when children uri from classpath
+ **Feb 11, 2021** | [Release 7.0-rc1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0-rc1)     | Refer to [#244](https://github.com/bsorrentino/maven-confluence-plugin/issues/244) processor-freemarker doesn't work on 7.0-beta2.
  **Feb 09, 2021** | [Release 7.0-beta2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0-beta2) | Refer to [#240](https://github.com/bsorrentino/maven-confluence-plugin/issues/240) add the `page id` to the deploy history(state) manager. <br> Refer to [#241](https://github.com/bsorrentino/maven-confluence-plugin/issues/241) Increase socket timeout. <br> Refer to [#242](https://github.com/bsorrentino/maven-confluence-plugin/issues/242) add i18n titles to ProjectSummaryRenderer and ScmRenderer. **Thanks to [3a04huk ](https://github.com/bsorrentino/maven-confluence-plugin/issues?q=is%3Apr+author%3A3a04huk) for the [PR](https://github.com/bsorrentino/maven-confluence-plugin/pull/243)**
  **Jan 03, 2021** | [Release 7.0-beta1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.0-beta1) | This release introduce [multi version jar](http://openjdk.java.net/jeps/238) support. Refer to [#224](https://github.com/bsorrentino/maven-confluence-plugin/issues/224).<br> From this release the **Pegdown markdown parser** has been removed as dependency and it will be not supported anymore.It has been replaced by **Commonmark**
 

diff --git a/addon-scrollversions/pom.xml b/addon-scrollversions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.5</version>
+        <version>7.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.5</version>
+        <version>7.6</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
     </licenses>
 
     <properties>
-        <jackson.version>2.12.0</jackson.version>
+        <jackson.version>2.12.7</jackson.version>
     </properties>
 
     <dependencies>

diff --git a/gitlog+jira/pom.xml b/gitlog+jira/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.5</version>
+        <version>7.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gitlog+jira/src/main/java/org/bsc/reporting/renderer/GitLogJiraIssuesRenderer.java b/gitlog+jira/src/main/java/org/bsc/reporting/renderer/GitLogJiraIssuesRenderer.java
@@ -1,12 +1,19 @@
 package org.bsc.reporting.renderer;
 
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
 import org.eclipse.jgit.lib.Repository;
 
-import java.util.*;
-
 /**
  * @author ar
  * @since Date: 01.05.2015
@@ -15,17 +22,18 @@ public class GitLogJiraIssuesRenderer extends AbstractMavenReportRenderer {
 
     private final Log log;
     private String gitLogSinceTagName;
-    private String gitLogUntilTagName;
-    private CalculateRuleForSinceTagName calculateRuleForSinceTagName;
-    private String currentVersion;
-    private String gitLogTagNamesPattern;
-    private List<String> jiraProjectKeyList;
-    private Boolean gitLogGroupByVersions;
+    private final String gitLogUntilTagName;
+    private final CalculateRuleForSinceTagName calculateRuleForSinceTagName;
+    private final String currentVersion;
+    private final String gitLogTagNamesPattern;
+    private final List<String> jiraProjectKeyList;
+    private final Boolean gitLogGroupByVersions;
+    private final URL gitLogJiraInstanceBaseUrl;
 
     /**
      * Default constructor.
      *
-     * @param sink the sink to use.
+     * @param sink                      the sink to use.
      */
     public GitLogJiraIssuesRenderer(
             Sink sink,
@@ -36,6 +44,7 @@ public GitLogJiraIssuesRenderer(
             CalculateRuleForSinceTagName calculateRuleForSinceTagName,
             String gitLogTagNamesPattern,
             Boolean gitLogGroupByVersions,
+            URL gitLogJiraInstanceBaseUrl,
             Log log)
     {
         super(sink);
@@ -46,21 +55,28 @@ public GitLogJiraIssuesRenderer(
         this.jiraProjectKeyList = jiraProjectKeyList;
         this.gitLogTagNamesPattern = gitLogTagNamesPattern;
         this.gitLogGroupByVersions = gitLogGroupByVersions;
+        this.gitLogJiraInstanceBaseUrl = gitLogJiraInstanceBaseUrl;
         this.log = log;
     }
 
-    public static String formatJiraIssuesToString(Collection<String> jiraIssues) {
+    public String formatJiraIssuesToString(Collection<String> jiraIssues) {
 
         StringBuilder output = new StringBuilder(100);
 
         for (String jiraIssueKey : jiraIssues) {
-            output.append("{jira:").append(jiraIssueKey).append("}\\\\\n");
+            output.append("{jira:").append(jiraIssueKey);
+
+            if (gitLogJiraInstanceBaseUrl != null) {
+                output.append("|url=").append(gitLogJiraInstanceBaseUrl).append("/browse/").append(jiraIssueKey);
+            }
+
+            output.append("}\\\\\n");
         }
         return output.toString();
 
     }
 
-    private static String formatJiraIssuesByVersionToString(LinkedHashMap<String, Set<String>> map) {
+    private String formatJiraIssuesByVersionToString(LinkedHashMap<String, Set<String>> map) {
         StringBuilder output = new StringBuilder(100);
         //print the keys in reverse insertion order
         ListIterator<String> iter =

diff --git a/plugin-reporting/pom.xml b/plugin-reporting/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.5</version>
+        <version>7.6</version>
     </parent>
 
     <prerequisites>

diff --git a/plugin-reporting/src/main/java/org/bsc/mojo/ConfluenceDeployMojo.java b/plugin-reporting/src/main/java/org/bsc/mojo/ConfluenceDeployMojo.java
@@ -1,7 +1,23 @@
 package org.bsc.mojo;
 
-import biz.source_code.miniTemplator.MiniTemplator;
-import biz.source_code.miniTemplator.MiniTemplator.VariableNotDefinedException;
+import static java.lang.String.format;
+import static java.util.Optional.ofNullable;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.bsc.confluence.model.SiteProcessor.processPageUri;
+
+import java.io.StringWriter;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -34,25 +50,21 @@
 import org.bsc.confluence.DeployStateManager;
 import org.bsc.confluence.ParentChildTuple;
 import org.bsc.confluence.model.Site;
-import org.bsc.markdown.MarkdownProcessor;
 import org.bsc.mojo.configuration.MarkdownProcessorInfo;
 import org.bsc.reporting.plugin.PluginConfluenceDocGenerator;
-import org.bsc.reporting.renderer.*;
+import org.bsc.reporting.renderer.CalculateRuleForSinceTagName;
+import org.bsc.reporting.renderer.DependenciesRenderer;
+import org.bsc.reporting.renderer.GitLogJiraIssuesRenderer;
+import org.bsc.reporting.renderer.ProjectSummaryRenderer;
+import org.bsc.reporting.renderer.ProjectTeamRenderer;
+import org.bsc.reporting.renderer.ReportingResolutionListener;
+import org.bsc.reporting.renderer.ScmRenderer;
 import org.bsc.reporting.sink.ConfluenceSink;
 import org.codehaus.plexus.component.repository.ComponentDependency;
 import org.codehaus.plexus.i18n.I18N;
 
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-
-import static java.lang.String.format;
-import static java.util.Optional.ofNullable;
-import static java.util.concurrent.CompletableFuture.completedFuture;
-import static org.bsc.confluence.model.SitePrinter.print;
-import static org.bsc.confluence.model.SiteProcessor.processPageUri;
+import biz.source_code.miniTemplator.MiniTemplator;
+import biz.source_code.miniTemplator.MiniTemplator.VariableNotDefinedException;
 
 /**
  *
@@ -153,14 +165,14 @@ public class ConfluenceDeployMojo extends AbstractConfluenceDeployMojo {
      *
      * @since 4.2
      */
-    @Parameter(defaultValue = "")
+    @Parameter
     private String gitLogSinceTagName;
     /**
      * Parse git log commits until first occurrence of specified tag name
      *
      * @since 4.2
      */
-    @Parameter(defaultValue = "")
+    @Parameter
     private String gitLogUntilTagName;
     /**
      * If specified, plugin will try to calculate and replace actual gitLogSinceTagName value
@@ -183,14 +195,14 @@ public class ConfluenceDeployMojo extends AbstractConfluenceDeployMojo {
      *
      * @since 4.2
      */
-    @Parameter(defaultValue="")
+    @Parameter
     private List<String> gitLogJiraProjectKeyList;
     /**
      * The pattern to filter out tagName. Can be used for filter only version tags.
      *
      * @since 4.2
      */
-    @Parameter(defaultValue="")
+    @Parameter
     private String gitLogTagNamesPattern;
     /**
      * Enable grouping by versions tag
@@ -199,6 +211,13 @@ public class ConfluenceDeployMojo extends AbstractConfluenceDeployMojo {
      */
     @Parameter(defaultValue="false")
     private Boolean gitLogGroupByVersions;
+
+    /**
+     * Sets baseurl for specific jira instance
+     */
+    @Parameter
+    private URL gitLogJiraInstanceBaseUrl;
+
     /**
      * Overrides system locale used for content generation
      *
@@ -414,6 +433,7 @@ protected void generateProjectHomeTemplate( final MiniTemplator t, final Site si
                         gitLogCalculateRuleForSinceTagName,
                         gitLogTagNamesPattern,
                         gitLogGroupByVersions,
+                        gitLogJiraInstanceBaseUrl,
                         getLog());
                 gitLogJiraIssuesRenderer.render();