Skip to content

Commit

Permalink
Merge branch 'release/7.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsorrentino
bsorrentino committed Oct 12, 2023
2 parents e3810ee + 641992e commit c754332
Show file tree
Hide file tree
Showing 24 changed files with 251 additions and 70 deletions.
83 changes: 83 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,89 @@

<!-- Changelog for bsorrentino maven-confluence-plugin. -->

## Next release
### Generic changes

**Merge branch 'bugfix/curly_braces_in_table_#295' into develop**


[761397a935fbc5b](https://github.com/bsorrentino/maven-confluence-plugin/commit/761397a935fbc5b) bsorrentino *2023-10-12 17:19:03*

**feat: enhance escapeMarkdownText method**

* enable fine grained escaping on markdown text
* resolve #295

[1157223261d86b6](https://github.com/bsorrentino/maven-confluence-plugin/commit/1157223261d86b6) bsorrentino *2023-10-12 17:17:40*

**fix: enable escaping on TableCell**

* working on #295

[ee97f605962a828](https://github.com/bsorrentino/maven-confluence-plugin/commit/ee97f605962a828) bsorrentino *2023-10-12 17:16:46*

**test: add unit test**

* working on #295

[a65b74a001e9bb5](https://github.com/bsorrentino/maven-confluence-plugin/commit/a65b74a001e9bb5) bsorrentino *2023-10-12 17:16:07*

**Merge branch 'bugfix/relative_link_#294' into develop**


[3019d28e99fceff](https://github.com/bsorrentino/maven-confluence-plugin/commit/3019d28e99fceff) bsorrentino *2023-10-11 16:49:16*

**fix: check prefix before apply**

* check link prefix before apply it
* resolve #294

[c8d619ed504b8f7](https://github.com/bsorrentino/maven-confluence-plugin/commit/c8d619ed504b8f7) bsorrentino *2023-10-11 14:56:15*

**test: add test data**

* prepare for reproduce issue
* working #294

[c6550ce83a6b3d7](https://github.com/bsorrentino/maven-confluence-plugin/commit/c6550ce83a6b3d7) bsorrentino *2023-10-11 14:55:23*

**build: move to next development version**


[e102f99740d02ab](https://github.com/bsorrentino/maven-confluence-plugin/commit/e102f99740d02ab) bsorrentino *2023-10-11 08:29:13*

**refactor: remove lombok usage**


[5786d8cff33c956](https://github.com/bsorrentino/maven-confluence-plugin/commit/5786d8cff33c956) bsorrentino *2023-10-11 08:02:47*

**build: move to maven 3.6.0 compatibility**


[14ccb9769202ef8](https://github.com/bsorrentino/maven-confluence-plugin/commit/14ccb9769202ef8) bsorrentino *2023-10-11 07:56:27*

**Merge branch 'master' into develop**


[1158634c0129498](https://github.com/bsorrentino/maven-confluence-plugin/commit/1158634c0129498) bsorrentino *2023-06-26 09:07:59*

**Merge branch 'hotfix/changelog'**


[e3810ee009337d4](https://github.com/bsorrentino/maven-confluence-plugin/commit/e3810ee009337d4) bsorrentino *2023-06-26 09:07:57*

**docs(changelog.md): update**


[e69cb1d0ab22f21](https://github.com/bsorrentino/maven-confluence-plugin/commit/e69cb1d0ab22f21) bsorrentino *2023-06-26 09:07:31*

**Merge tag 'v7.12' into develop**

* new release

[8736e5277f5d031](https://github.com/bsorrentino/maven-confluence-plugin/commit/8736e5277f5d031) bsorrentino *2023-06-26 09:05:20*


## v7.12
### Generic changes

Expand Down
23 changes: 12 additions & 11 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,17 @@ For practical samples refer to folder/module [test-publishing](https://github.co

## News

| 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). |
| Date | Release | Info |
|------------------|-------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Cct 12, 2023** | [Release 7.13](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v7.13) | fix some links between markdown files point to non-existing pages [#294](https://github.com/bsorrentino/maven-confluence-plugin/issues/294). fix curly braces in table recognized as macro [#295](https://github.com/bsorrentino/maven-confluence-plugin/issues/295). |
| **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)
2 changes: 1 addition & 1 deletion addon-scrollversions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maven-confluence-parent</artifactId>
<groupId>org.bsc.maven</groupId>
<version>7.12</version>
<version>7.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maven-confluence-parent</artifactId>
<groupId>org.bsc.maven</groupId>
<version>7.12</version>
<version>7.13</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
Loading

0 comments on commit c754332

Please sign in to comment.