Merge branch 'release/7.12'

bsorrentino · Jun 26, 2023 · a00f97c · a00f97c
2 parents 3ba40fc + c6192c5
commit a00f97c
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,67 @@
 
 <!-- Changelog for bsorrentino maven-confluence-plugin. -->
 
+## Next release
+### Generic changes
+
+**build: move to next version 7.12**
+
+
+[f70f9d5c308c422](https://github.com/bsorrentino/maven-confluence-plugin/commit/f70f9d5c308c422) bsorrentino *2023-06-23 18:38:02*
+
+**build: move to next dev version**
+
+
+[96d0999f4057f0d](https://github.com/bsorrentino/maven-confluence-plugin/commit/96d0999f4057f0d) bsorrentino *2023-06-23 18:17:05*
+
+**Merge branch 'feature/pr288' into develop**
+
+
+[c4b960e134429a2](https://github.com/bsorrentino/maven-confluence-plugin/commit/c4b960e134429a2) bsorrentino *2023-06-23 18:15:11*
+
+**refactor(SiteProcessor.java): Optional usage refinement**
+
+ * use Optional.OfNullable() instead Optional.of()
+
+[220426a4c952a9f](https://github.com/bsorrentino/maven-confluence-plugin/commit/220426a4c952a9f) bsorrentino *2023-06-23 18:14:03*
+
+**Merge branch 'williamschey-master' into feature/pr288**
+
+
+[83e977cc998064b](https://github.com/bsorrentino/maven-confluence-plugin/commit/83e977cc998064b) bsorrentino *2023-06-23 18:07:45*
+
+**#287: Changed to use Optional.ofNullable to deal with nulls**
+
+
+[5997ce7ddffd33a](https://github.com/bsorrentino/maven-confluence-plugin/commit/5997ce7ddffd33a) William Schey *2023-06-23 08:06:10*
+
+**#287: Fix for NPE that is throw when trying to link internally to project**
+
+
+[622ae475a55a570](https://github.com/bsorrentino/maven-confluence-plugin/commit/622ae475a55a570) William Schey *2023-06-23 06:32:50*
+
+**Merge branch 'master' into develop**
+
+
+[90b6784c533e68f](https://github.com/bsorrentino/maven-confluence-plugin/commit/90b6784c533e68f) Build Pipeline *2023-03-23 09:05:22*
+
+**Merge branch 'hotfix/changelog'**
+
+
+[3ba40fc5a0c85de](https://github.com/bsorrentino/maven-confluence-plugin/commit/3ba40fc5a0c85de) Build Pipeline *2023-03-23 09:05:20*
+
+**docs(CHANGELOG.md): update**
+
+
+[345993d38a96642](https://github.com/bsorrentino/maven-confluence-plugin/commit/345993d38a96642) Build Pipeline *2023-03-23 09:05:00*
+
+**Merge tag 'v7.11' into develop**
+
+ * new release
+
+[a3511124ab4627f](https://github.com/bsorrentino/maven-confluence-plugin/commit/a3511124ab4627f) Build Pipeline *2023-03-23 09:02:31*
+
+
 ## v7.11
 ### Generic changes
 
@@ -111,6 +172,10 @@
 
 [20e7233fad07815](https://github.com/bsorrentino/maven-confluence-plugin/commit/20e7233fad07815) bsorrentino *2023-03-04 11:13:15*
 
+
+## v7.10
+### Generic changes
+
 **Merge branch 'release/7.10'**
 
 
@@ -448,6 +513,10 @@
 
 [b2c477701450e30](https://github.com/bsorrentino/maven-confluence-plugin/commit/b2c477701450e30) Build Pipeline *2022-12-09 12:02:52*
 
+
+## v7.7.1
+### Generic changes
+
 **Merge branch 'hotfix/7.7.1'**
 
 

diff --git a/README.md b/README.md
@@ -28,15 +28,16 @@ For practical samples refer to folder/module [test-publishing](https://github.co
 
 ## News
 
- Date             | Release                                                                                   | Info                                                                                                                                                                                                                                                                                                                                
-------------------|-------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-| **Mar 23, 2023** | [Release 7.11](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.11) | Support of Confluence `Excerpt` macro. Refer to [#285](https://github.com/bsorrentino/maven-confluence-plugin/issues/285)                                                                                                                                                                                                           |
-| **Mar 4, 2023**  | [Release 7.10](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.10) | Allow to skip html tags in markdown processing. Refer to [#284](https://github.com/bsorrentino/maven-confluence-plugin/issues/284)                                                                                                                                                                                                  |
-| **Jan 4, 2023**  | [Release 7.9](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.9)   | Fix problem Problem parsing `%` character from markdown to wiki. Refer to [#282](https://github.com/bsorrentino/maven-confluence-plugin/issues/282)                                                                                                                                                                                 |
-| **Dec 9, 2022**  | [Release 7.8](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.8)   | Merged PR [#281](https://github.com/bsorrentino/maven-confluence-plugin/pull/281) that fix [#280](https://github.com/bsorrentino/maven-confluence-plugin/issue/280) "**allows specifying additional HTTP headers in the servers section of settings.xml**". Thanks to [DirkMahler](https://github.com/DirkMahler) for contribution. |
-| **Jul 3, 2022**  | [Release 7.7](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.7)   | Merged PR [#266](https://github.com/bsorrentino/maven-confluence-plugin/pull/266) "**Adding JSON Support**". Thanks to [jksevend](https://github.com/jksevend) for contribution.                                                                                                                                                    |
-| **Jun 3, 2022**  | [Release 7.6](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.6)   | Merged PR [#267](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/                                                                                                                                                                                                           |
-| **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).                                                                                                                                                                                                                  |
+| Date             | Release                                                                                   | Info                                                                                                                                                                                                                                                                                                                                                     |
+|------------------|-------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Jun 23, 2023** | [Release 7.12](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.12) | Merged PR [#288](https://github.com/bsorrentino/maven-confluence-plugin/pull/288) that fix [#287](https://github.com/bsorrentino/maven-confluence-plugin/issue/287) "**Maven report generation breaks, if a new page was added with new attachments and references to it**". Thanks to [williamschey](https://github.com/williamschey) for contribution. |
+| **Mar 23, 2023** | [Release 7.11](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.11) | Support of Confluence `Excerpt` macro. Refer to [#285](https://github.com/bsorrentino/maven-confluence-plugin/issues/285)                                                                                                                                                                                                                                |
+| **Mar 4, 2023**  | [Release 7.10](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.10) | Allow to skip html tags in markdown processing. Refer to [#284](https://github.com/bsorrentino/maven-confluence-plugin/issues/284)                                                                                                                                                                                                                       |
+| **Jan 4, 2023**  | [Release 7.9](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.9)   | Fix problem Problem parsing `%` character from markdown to wiki. Refer to [#282](https://github.com/bsorrentino/maven-confluence-plugin/issues/282)                                                                                                                                                                                                      |
+| **Dec 9, 2022**  | [Release 7.8](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.8)   | Merged PR [#281](https://github.com/bsorrentino/maven-confluence-plugin/pull/281) that fix [#280](https://github.com/bsorrentino/maven-confluence-plugin/issue/280) "**allows specifying additional HTTP headers in the servers section of settings.xml**". Thanks to [DirkMahler](https://github.com/DirkMahler) for contribution.                      |
+| **Jul 3, 2022**  | [Release 7.7](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.7)   | Merged PR [#266](https://github.com/bsorrentino/maven-confluence-plugin/pull/266) "**Adding JSON Support**". Thanks to [jksevend](https://github.com/jksevend) for contribution.                                                                                                                                                                         |
+| **Jun 3, 2022**  | [Release 7.6](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.6)   | Merged PR [#267](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/                                                                                                                                                                                                                                |
+| **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).                                                                                                                                                                                                                                       |
 
 ### [Release History](HISTORY.md)
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.11</version>
+        <version>7.12</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.11</version>
+        <version>7.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/core/src/main/java/org/bsc/confluence/model/SiteProcessor.java b/core/src/main/java/org/bsc/confluence/model/SiteProcessor.java
@@ -300,24 +300,24 @@ public boolean isSkipHtml() {
 
             @Override
             public Optional<Site> getSite() {
-                return Optional.of(site);
+                return Optional.ofNullable(site);
             }
 
             @Override
             public Optional<Site.Page> getPage() {
-                return Optional.of(child);
+                return Optional.ofNullable(child);
             }
 
             @Override
             public Optional<String> getPagePrefixToApply() {
-                return Optional.of(pagePrefixToApply);
+                return Optional.ofNullable(pagePrefixToApply);
             }
 
             @Override
             public boolean isLinkPrefixEnabled() {
                 if( child.isIgnoreVariables() ) return false;
 
-                return Optional.of(page).map( p -> !p.getTitle().contains("[") ).orElse(true);
+                return Optional.ofNullable(page).map( p -> !p.getTitle().contains("[") ).orElse(true);
 
             }
         }, content);

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.11</version>
+        <version>7.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.11</version>
+        <version>7.12</version>
     </parent>
 
     <prerequisites>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.bsc.maven</groupId>
     <artifactId>maven-confluence-parent</artifactId>
     <packaging>pom</packaging>
-    <version>7.11</version>
+    <version>7.12</version>
     <name>CONFLUENCE-REPORTING::Parent</name>
     <description>Maven's plugin that allow to generate "project's documentation" directly to confluence allowing, in the
         same time, to keep in-sync both project &amp; documentation

diff --git a/processor-commonmark/pom.xml b/processor-commonmark/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.11</version>
+        <version>7.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/processor-freemarker/pom.xml b/processor-freemarker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-confluence-parent</artifactId>
-        <version>7.11</version>
+        <version>7.12</version>
     </parent>
     <artifactId>maven-confluence-processor-freemarker</artifactId>
     <name>CONFLUENCE-REPORTING::Freemaker::Processor</name>

diff --git a/service-rest-api/pom.xml b/service-rest-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.11</version>
+        <version>7.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/service-xmlrpc-api/pom.xml b/service-xmlrpc-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.11</version>
+        <version>7.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-plugin/pom.xml b/test-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.11</version>
+        <version>7.12</version>
     </parent>
 
     <!-- TEST ISSUE 263 -->

diff --git a/test-publishing/pom.xml b/test-publishing/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.11</version>
+        <version>7.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>