Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bsorrentino/maven-confluence-plugin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.10
Choose a base ref
...
head repository: bsorrentino/maven-confluence-plugin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
3 contributors
Loading
Showing with 2,545 additions and 1,082 deletions.
  1. +4 −4 .github/workflows/deploy-pages.yaml
  2. +2 −2 .github/workflows/deploy-snapshot.yaml
  3. +2 −2 .github/workflows/deploy.yaml
  4. +576 −90 CHANGELOG.md
  5. +14 −10 README.md
  6. +27 −1 addon-scrollversions/pom.xml
  7. +165 −133 ...ersions/src/main/java/org/bsc/confluence/rest/scrollversions/ScrollVersionsConfluenceService.java
  8. +20 −4 addon-scrollversions/src/main/java/org/bsc/confluence/rest/scrollversions/model/ScrollVersions.java
  9. +11 −12 ...t/java/org/bsc/confluence/rest/scrollversions/ScrollVersionsConfluenceServiceIntegrationTest.java
  10. +8 −9 addon-scrollversions/src/test/java/org/bsc/confluence/rest/scrollversions/ScrollVersionsTest.java
  11. +2 −17 core/pom.xml
  12. +16 −7 core/src/main/java/org/bsc/confluence/ConfluenceProxy.java
  13. +20 −4 core/src/main/java/org/bsc/confluence/ParentChildTuple.java
  14. +2 −2 core/src/main/java/org/bsc/confluence/model/SiteFactory.java
  15. +44 −28 core/src/main/java/org/bsc/confluence/model/SiteProcessor.java
  16. +61 −25 core/src/main/java/org/bsc/markdown/MarkdownVisitorHelper.java
  17. +0 −1 core/src/main/java9/module-info.java
  18. +2 −2 core/src/test/kotlin/org/bsc/markdown/MacroParsingTest.kt
  19. +41 −19 deprecated/processor-flexmark/src/test/java/org/bsc/markdown/flexmark/SiteTest.java
  20. +35 −14 deprecated/processor-pegdown/src/test/java/org/bsc/markdown/pegdown/SiteTest.java
  21. +1 −1 gitlog+jira/pom.xml
  22. +46 −94 {plugin-reporting → mojo}/pom.xml
  23. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/confluence/ConfluenceServiceFactory.java
  24. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/AbstractBaseConfluenceMojo.java
  25. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/AbstractBaseConfluenceSiteMojo.java
  26. +10 −11 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/AbstractConfluenceDeployMojo.java
  27. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/ConfluenceBlogpostMojo.java
  28. +1 −2 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/ConfluenceDeleteMojo.java
  29. +38 −57 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/ConfluenceDeployMojo.java
  30. +5 −6 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/ConfluenceExportMojo.java
  31. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/DeployStateSupport.java
  32. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/configuration/DeployStateInfo.java
  33. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/configuration/MarkdownProcessorInfo.java
  34. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/mojo/configuration/ScrollVersionsInfo.java
  35. 0 {plugin-reporting → mojo}/src/main/java/org/bsc/reporting/model/Child.java
  36. 0 {plugin-reporting → mojo}/src/main/resources/commons-logging.properties
  37. 0 {plugin-reporting → mojo}/src/main/resources/defaultPluginTemplate.confluence
  38. 0 {plugin-reporting → mojo}/src/main/resources/defaultTemplate.confluence
  39. 0 {plugin-reporting → mojo}/src/main/resources/plugin-report.properties
  40. 0 {plugin-reporting → mojo}/src/main/resources/plugin-report_de.properties
  41. 0 {plugin-reporting → mojo}/src/main/resources/plugin-report_fr.properties
  42. 0 {plugin-reporting → mojo}/src/main/resources/plugin-report_sv.properties
  43. 0 {plugin-reporting → mojo}/src/main/resources/project-info-report.properties
  44. 0 {plugin-reporting → mojo}/src/site/apt/usage_deprecated.apt
  45. 0 {plugin-reporting → mojo}/src/site/confluence/dependencies.confluence
  46. 0 {plugin-reporting → mojo}/src/site/confluence/index.confluence
  47. 0 {plugin-reporting → mojo}/src/site/confluence/index.md
  48. 0 {plugin-reporting → mojo}/src/site/confluence/markdown_guide.confluence
  49. 0 {plugin-reporting → mojo}/src/site/confluence/site.xml
  50. 0 {plugin-reporting → mojo}/src/site/confluence/usage.confluence
  51. 0 {plugin-reporting → mojo}/src/site/markdown/markdown_guide.md
  52. 0 {plugin-reporting → mojo}/src/site/markdown/markdown_processor_guide.md
  53. 0 {plugin-reporting → mojo}/src/site/markdown/site_json_guide.md
  54. 0 {plugin-reporting → mojo}/src/site/markdown/site_processor_guide.md
  55. 0 {plugin-reporting → mojo}/src/site/markdown/site_xml_guide.md
  56. 0 {plugin-reporting → mojo}/src/site/markdown/site_yaml_guide.md
  57. 0 {plugin-reporting → mojo}/src/site/markdown/storageformat_guide.md
  58. 0 {plugin-reporting → mojo}/src/site/markdown/usage.md
  59. 0 {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence.html
  60. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/add.gif
  61. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/biggrin.gif
  62. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/blue-yes.gif
  63. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/check(1).gif
  64. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/check.gif
  65. 0 ...rting → mojo}/src/site/resources/Notation Guide - Confluence_files/com.atlassian.auiplugin-ajs.js
  66. 0 ...mojo}/src/site/resources/Notation Guide - Confluence_files/com.atlassian.auiplugin-jquery-base.js
  67. 0 ...ng → mojo}/src/site/resources/Notation Guide - Confluence_files/com.atlassian.auiplugin-jquery.js
  68. 0 {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/combined.css
  69. 0 ...rc/site/resources/Notation Guide - Confluence_files/confluence.web.resources-atlassian-effects.js
  70. 0 ...}/src/site/resources/Notation Guide - Confluence_files/confluence.web.resources-master-styles.css
  71. 0 ...o}/src/site/resources/Notation Guide - Confluence_files/confluence.web.resources-notation-help.js
  72. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/error(1).gif
  73. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/error.gif
  74. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/forbidden(1).gif
  75. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/forbidden.gif
  76. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/gray-yes.gif
  77. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/green-yes.gif
  78. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/help_16(1).gif
  79. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/help_16.gif
  80. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/home_16.gif
  81. 0 {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/indicator.html
  82. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/information(1).gif
  83. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/information.gif
  84. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/lightbulb.gif
  85. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/lightbulb_on.gif
  86. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/linkext7.gif
  87. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/mail_small.gif
  88. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/pdf.gif
  89. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/plus.gif
  90. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/rss.gif
  91. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/sad.gif
  92. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/smile.gif
  93. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/spacer.gif
  94. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/star_blue.gif
  95. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/star_green.gif
  96. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/star_red.gif
  97. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/star_yellow.gif
  98. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/tasklist.png
  99. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/thumbs_down.gif
  100. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/thumbs_up.gif
  101. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/tongue.gif
  102. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/user_12.gif
  103. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/user_16.gif
  104. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/warning(1).gif
  105. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/warning.gif
  106. BIN {plugin-reporting → mojo}/src/site/resources/Notation Guide - Confluence_files/wink.gif
  107. BIN {plugin-reporting → mojo}/src/site/resources/images/gitlog-sample02.png
  108. BIN {plugin-reporting → mojo}/src/site/resources/images/noticeblock.png
  109. 0 {plugin-reporting → mojo}/src/site/site.xml
  110. 0 {plugin-reporting → mojo}/src/test/kotlin/org/bsc/reporting/CharsetTest.kt
  111. 0 {plugin-reporting → mojo}/src/test/kotlin/org/bsc/reporting/FileIOTest.kt
  112. +42 −23 {plugin-reporting → mojo}/src/test/kotlin/org/bsc/reporting/Issue133Test.kt
  113. 0 {plugin-reporting → mojo}/src/test/kotlin/org/bsc/reporting/ParseTextTest.kt
  114. 0 {plugin-reporting → mojo}/src/test/kotlin/org/bsc/reporting/SiteTest.kt
  115. 0 {plugin-reporting → mojo}/src/test/kotlin/org/bsc/reporting/renderer/GitLogJiraIssuesRendererTest.kt
  116. BIN {plugin-reporting → mojo}/src/test/resources/conf-icon-64.png
  117. 0 {plugin-reporting → mojo}/src/test/resources/site.xml
  118. 0 {plugin-reporting → mojo}/src/test/resources/test-pom.xml
  119. +18 −0 package.json
  120. +51 −0 plugin-report/pom.xml
  121. +74 −47 ...rator.java → plugin-report/src/main/java/org/bsc/plugin/AbstractPluginConfluenceDocGenerator.java
  122. +2 −2 ...in/java/org/bsc/reporting → plugin-report/src/main/java/org/bsc}/plugin/ConfluenceWikiWriter.java
  123. +2 −1 ...rg/bsc/reporting → plugin-report/src/main/java/org/bsc/plugin}/renderer/DependenciesRenderer.java
  124. +2 −1 ...ava/org/bsc/reporting → plugin-report/src/main/java/org/bsc/plugin}/renderer/PluginsRenderer.java
  125. +2 −1 .../bsc/reporting → plugin-report/src/main/java/org/bsc/plugin}/renderer/ProjectSummaryRenderer.java
  126. +2 −1 ...org/bsc/reporting → plugin-report/src/main/java/org/bsc/plugin}/renderer/ProjectTeamRenderer.java
  127. +2 −1 ...reporting → plugin-report/src/main/java/org/bsc/plugin}/renderer/ReportingResolutionListener.java
  128. +2 −2 ...in/java/org/bsc/reporting → plugin-report/src/main/java/org/bsc/plugin}/renderer/ScmRenderer.java
  129. +2 −2 ...ain/java/org/bsc/reporting → plugin-report/src/main/java/org/bsc/plugin}/sink/ConfluenceSink.java
  130. +2 −1 .../main/java/org/bsc/reporting → plugin-report/src/main/java/org/bsc/plugin}/sink/SinkDelegate.java
  131. +10 −43 pom.xml
  132. +1 −1 processor-commonmark/pom.xml
  133. +43 −14 processor-commonmark/src/main/java/org/bsc/markdown/commonmark/CommonmarkConfluenceWikiVisitor.java
  134. +1 −8 processor-commonmark/src/main/java/org/bsc/markdown/commonmark/CommonmarkMarkdownProcessorImpl.java
  135. +0 −1 processor-commonmark/src/main/java9/module-info.java
  136. +158 −0 processor-commonmark/src/test/kotlin/org/bsc/makdown/commonmark/Issue285Test.kt
  137. +36 −0 processor-commonmark/src/test/kotlin/org/bsc/makdown/commonmark/Issue295Test.kt
  138. +10 −12 processor-commonmark/src/test/kotlin/org/bsc/makdown/commonmark/ParseHelpers.kt
  139. +7 −7 processor-commonmark/src/test/kotlin/org/bsc/makdown/commonmark/SiteTest.kt
  140. +3 −0 processor-commonmark/src/test/resources/issue295.md
  141. +1 −65 processor-freemarker/pom.xml
  142. +3 −4 ...rker/src/test/java/org/bsc/confluence/preprocessor/freemarker/FreemarkerPreprocessorImplTest.java
  143. +1 −6 service-rest-api/pom.xml
  144. +220 −209 service-rest-api/src/main/java/org/bsc/confluence/rest/AbstractRESTConfluenceService.java
  145. +41 −0 service-rest-api/src/main/java/org/bsc/confluence/rest/FormUrlEncodedBodyPublisher.java
  146. +444 −0 service-rest-api/src/main/java/org/bsc/confluence/rest/MultipartFormDataBodyPublisher.java
  147. +82 −35 service-rest-api/src/main/java/org/bsc/confluence/rest/RESTConfluenceService.java
  148. +17 −12 service-rest-api/src/main/test/java/org/bsc/confluence/rest/AbstractRestConfluence.java
  149. +8 −5 service-xmlrpc-api/pom.xml
  150. +2 −2 site-deploy.sh
  151. +1 −1 test-plugin/pom.xml
  152. +55 −18 test-publishing/pom.xml
  153. +5 −0 test-publishing/src/site/confluence/issue154/cheatsheet/tables.md
  154. +13 −0 test-publishing/src/site/confluence/issue285/issue285.md
  155. +4 −0 test-publishing/src/site/confluence/issue285/site.yml
  156. +3 −0 test-publishing/src/site/confluence/issue294/a.md
  157. +3 −0 test-publishing/src/site/confluence/issue294/b.md
  158. +3 −0 test-publishing/src/site/confluence/issue294/c.md
  159. +3 −0 test-publishing/src/site/confluence/issue294/home.md
  160. +11 −0 test-publishing/src/site/confluence/issue294/site.yaml
8 changes: 4 additions & 4 deletions .github/workflows/deploy-pages.yaml
View file
Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@ jobs:
java-version: 11
- name: Deploy site to Github pages
run: |
mvn -B install --file pom.xml -s settings-template.xml
mvn -B --projects plugin-reporting site --file pom.xml -s settings-template.xml
cp -R core/target/site plugin-reporting/target/site/core
mvn -B --projects core javadoc:javadoc --file pom.xml -s settings-template.xml
mvn -B --projects mojo site --file pom.xml -s settings-template.xml
cp -R core/target/site mojo/target/site/core
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./plugin-reporting/target/site
publish_dir: ./mojo/target/site
4 changes: 2 additions & 2 deletions .github/workflows/deploy-snapshot.yaml
View file
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@ jobs:
- uses: actions/checkout@v2
with:
ref: develop
- name: Set up JDK 9
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 9
java-version: 11

- name: Build with Maven
env:
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
View file
Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@ jobs:
- uses: actions/checkout@v2
with:
ref: master
- name: Set up JDK 9
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 9
java-version: 11
- name: GPG Setup
env:
GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }}
Loading