Skip to content

Commit

Permalink
Merge branch 'release/6.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsorrentino
bsorrentino committed Nov 2, 2020
2 parents 6c553d1 + 7f3eca2 commit 961c57c
Show file tree
Hide file tree
Showing 18 changed files with 152 additions and 142 deletions.
2 changes: 1 addition & 1 deletion markdown-processor-commonmark/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>6.10</version>
<version>6.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion markdown-processor-flexmark/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>6.10</version>
<version>6.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion markdown-processor-pegdown/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>6.10</version>
<version>6.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion maven-confluence-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>6.10</version>
<version>6.11</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion maven-confluence-itest/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>6.10</version>
<version>6.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion maven-confluence-itest/src/test/resources/plugin-project-goals-in-subpage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-confluence-itest/src/test/resources/simple-plugin-project/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-confluence-plugin-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>maven-confluence-parent</artifactId>
<groupId>org.bsc.maven</groupId>
<version>6.10</version>
<version>6.11</version>
</parent>

<artifactId>maven-confluence-plugin-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion maven-confluence-reporting-plugin/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>6.10</version>
<version>6.11</version>
</parent>

<prerequisites>
Expand Down
240 changes: 111 additions & 129 deletions maven-confluence-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>maven-confluence-parent</artifactId>
<groupId>org.bsc.maven</groupId>
<version>6.10</version>
<version>6.11</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -70,6 +70,13 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>confluence-markdown-processor-commonmark</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>

<configuration>
Expand Down Expand Up @@ -317,6 +324,89 @@
</configuration>
</execution>
<!--
mvn confluence-reporting:blogpost@issue219
-->
<execution>
<id>issue219</id>
<goals>
<goal>blogpost</goal>
</goals>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<title>${blog.title}</title>
<content>${project.basedir}/src/site/confluence/issue219/blog.md</content>
<failOnError>true</failOnError>
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@issue223
mvn confluence-reporting:delete@issue223
-->
<execution>
<id>issue223</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<siteDescriptor>${basedir}/src/site/confluence/issue223/site.yml</siteDescriptor>
<failOnError>true</failOnError>
<spaceKey>SVTS</spaceKey>
<parentPageTitle>Topic 1</parentPageTitle>
<scrollVersions>
<version>beta</version>
<skip>${scrollversions.skip}</skip>
</scrollVersions>
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@commonmark
mvn confluence-reporting:delete@commonmark
-->
<execution>
<id>commonmark</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<siteDescriptor>${basedir}/src/site/confluence/issue154/site-commonmark.yaml
</siteDescriptor>
<failOnError>true</failOnError>
<markdownProcessor>
<name>commonmark</name>
</markdownProcessor>
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@pegdown
mvn confluence-reporting:delete@pegdown
-->
<execution>
<id>pegdown</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<siteDescriptor>
${basedir}/src/site/confluence/issue154/site-pegdown.yaml
</siteDescriptor>
<failOnError>true</failOnError>

<!--
<spaceKey>SVTS</spaceKey>
<parentPageTitle>Topic 1</parentPageTitle>
<scrollVersions>
<version>alpha</version>
</scrollVersions>
-->
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@issue215 -Dconfluence.childrenTitlesPrefixed=false
mvn confluence-reporting:delete@issue215 -Dconfluence.childrenTitlesPrefixed=false
Expand All @@ -332,44 +422,47 @@
<wikiFilesExt>.confluence</wikiFilesExt>
<failOnError>true</failOnError>
<siteDescriptor>${basedir}/src/site/confluence/issue215/confluence/site.xml</siteDescriptor>
<markdownProcessor>
<name>commonmark</name>
</markdownProcessor>
</configuration>
</execution>

<!--
mvn confluence-reporting:blogpost@issue219
mvn confluence-reporting:deploy@issue226
mvn confluence-reporting:delete@issue226
-->
<execution>
<id>issue219</id>
<id>issue226</id>
<goals>
<goal>blogpost</goal>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<title>${blog.title}</title>
<content>${project.basedir}/src/site/confluence/issue219/blog.md</content>
<wikiFilesExt>.confluence</wikiFilesExt>
<failOnError>true</failOnError>
<siteDescriptor>${basedir}/src/site/confluence/issue226/site.yml</siteDescriptor>
<markdownProcessor>
<name>commonmark</name>
</markdownProcessor>
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@issue223
mvn confluence-reporting:delete@issue223
mvn confluence-reporting:deploy@issue227
mvn confluence-reporting:delete@issue227
-->
<execution>
<id>issue223</id>
<id>issue227</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<siteDescriptor>${basedir}/src/site/confluence/issue223/site.yml</siteDescriptor>
<failOnError>true</failOnError>
<spaceKey>SVTS</spaceKey>
<parentPageTitle>Topic 1</parentPageTitle>
<scrollVersions>
<version>beta</version>
<skip>${scrollversions.skip}</skip>
</scrollVersions>
<siteDescriptor>${basedir}/src/site/confluence/issue227/site.yaml</siteDescriptor>
<markdownProcessor>
<name>commonmark</name>
</markdownProcessor>
</configuration>
</execution>

Expand All @@ -391,117 +484,6 @@

</profile>

<profile>
<id>markdown</id>

<build>

<plugins>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>confluence-reporting-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>confluence-markdown-processor-commonmark</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<executions>
<!--
mvn confluence-reporting:deploy@commonmark -Pmarkdown
mvn confluence-reporting:delete@commonmark -Pmarkdown
-->
<execution>
<id>commonmark</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<siteDescriptor>${basedir}/src/site/confluence/issue154/site-commonmark.yaml
</siteDescriptor>
<failOnError>true</failOnError>
<markdownProcessor>
<name>commonmark</name>
</markdownProcessor>
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@pegdown -Pmarkdown
mvn confluence-reporting:delete@pegdown -Pmarkdown
-->
<execution>
<id>pegdown</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<siteDescriptor>
${basedir}/src/site/confluence/issue154/site-pegdown.yaml
</siteDescriptor>
<failOnError>true</failOnError>

<!--
<spaceKey>SVTS</spaceKey>
<parentPageTitle>Topic 1</parentPageTitle>
<scrollVersions>
<version>alpha</version>
</scrollVersions>
-->
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@issue215 -Dconfluence.childrenTitlesPrefixed=false
mvn confluence-reporting:delete@issue215 -Dconfluence.childrenTitlesPrefixed=false
<childrenTitlesPrefixed>false</childrenTitlesPrefixed>
-->
<execution>
<id>issue215</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<failOnError>true</failOnError>
<siteDescriptor>${basedir}/src/site/confluence/issue215/confluence/site.xml</siteDescriptor>
<markdownProcessor>
<name>commonmark</name>
</markdownProcessor>
</configuration>
</execution>
<!--
mvn confluence-reporting:deploy@issue226
mvn confluence-reporting:delete@issue226
-->
<execution>
<id>issue226</id>
<goals>
<goal>deploy</goal>
<goal>delete</goal>
</goals>
<configuration>
<wikiFilesExt>.confluence</wikiFilesExt>
<failOnError>true</failOnError>
<siteDescriptor>${basedir}/src/site/confluence/issue226/site.yml</siteDescriptor>
<markdownProcessor>
<name>commonmark</name>
</markdownProcessor>
</configuration>
</execution>

</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>freemaker</id>

Expand Down
5 changes: 5 additions & 0 deletions maven-confluence-test/src/site/confluence/issue227/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# README - [issue 227](https://github.com/bsorrentino/maven-confluence-plugin/issues/227)

this is readme

* [Help](help/HELP.md)
1 change: 1 addition & 0 deletions maven-confluence-test/src/site/confluence/issue227/examples/payload.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
4 changes: 4 additions & 0 deletions maven-confluence-test/src/site/confluence/issue227/help/HELP.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# HELP - [issue 227](https://github.com/bsorrentino/maven-confluence-plugin/issues/227)


This is help
Binary file added maven-confluence-test/src/site/confluence/issue227/images/process.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 961c57c

Please sign in to comment.