Merge branch 'release/5.1.1'

bsorrentino · Jan 4, 2018 · 9fbe606 · 9fbe606
2 parents e95a4a8 + b8e97d0
commit 9fbe606
Show file tree

Hide file tree

Showing 10 changed files with 684 additions and 12 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/maven-confluence-core/pom.xml b/maven-confluence-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>5.1</version>
+        <version>5.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...fluence-core/src/main/java/org/codehaus/swizzle/confluence/ConfluenceExportDecorator.java b/...fluence-core/src/main/java/org/codehaus/swizzle/confluence/ConfluenceExportDecorator.java
@@ -100,8 +100,13 @@ public final void exportPage( String space, String pageTitle, ExportFormat forma
                 new RedirectTask() {
 
                     @Override
-                    public void exec(String location) throws Exception {                        
-                        exportpdf(client, location, outputFile);
+                    public void exec(String location) throws Exception {     
+
+						final java.net.URI uri = java.net.URI.create( url ).resolve(location).normalize();
+
+						System.out.printf( "==> EXPORT URL [%s]\n", uri.toString());
+
+						exportpdf(client, uri.toURL(), outputFile);
                     }
                 }
             );
@@ -173,15 +178,15 @@ private void login( HttpClient client,
      * @throws Exception 
      */
     private void exportpdf( HttpClient client, 
-                            String url, 
+                            java.net.URL url, 
                             java.io.File outputFile ) throws IOException  
     {
         java.io.InputStream is = null;
         java.io.FileOutputStream fos = null;
         GetMethod get = null;
         try {
 
-            get = new GetMethod(url);
+            get = new GetMethod(url.toString());
             get.setRequestHeader("X-Atlassian-Token", "no-check");
 
 

diff --git a/maven-confluence-itest/pom.xml b/maven-confluence-itest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>5.1</version>
+        <version>5.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/maven-confluence-plugin.forge b/maven-confluence-plugin.forge
diff --git a/maven-confluence-reporting-plugin/pom.xml b/maven-confluence-reporting-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <artifactId>maven-confluence-parent</artifactId>
       <groupId>org.bsc.maven</groupId>
-      <version>5.1</version>
+      <version>5.1.1</version>
   </parent>
 
 

diff --git a/...-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/ConfluenceExportMojo.java b/...-reporting-plugin/src/main/java/org/bsc/maven/confluence/plugin/ConfluenceExportMojo.java
@@ -76,9 +76,10 @@ private void exportPage( ConfluenceService confluence ) throws Exception  {
 
         final String url = ConfluenceService.Protocol.XMLRPC.removeFrom(ConfluenceExportMojo.super.getEndPoint()); 
 
+
         confluence.exportPage(  url, 
                                 parentPage.getSpace(), 
-                                parentPage.getTitle(), 
+                                pageTitle, //parentPage.getTitle(), 
                                 exfmt, 
                                 outputFile);
 

diff --git a/maven-confluence-test/plugin-test/pom.xml b/maven-confluence-test/plugin-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>5.1</version>
+        <version>5.1.1</version>
         <relativePath>../..</relativePath>
     </parent>
 

diff --git a/maven-confluence-test/pom.xml b/maven-confluence-test/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>5.1</version>
+        <version>5.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -74,6 +74,22 @@
 
                 </configuration>
                 <executions>
+                    <!--
+                    mvn confluence-reporting:export@issue148
+                    -->
+                    <execution>
+                        <id>issue148</id>
+                        <goals>
+                            <goal>export</goal>
+                        </goals>
+                        <configuration>
+                            <endPoint>http://softwarefactory.softphone.it/confluence/${api}</endPoint>
+                            <spaceKey>~bsorrentino</spaceKey>
+                            <parentPageTitle>Home</parentPageTitle>
+                            <pageTitle>GIT EXPERIENCE</pageTitle>
+                            <serverId>softphone-server</serverId>
+                        </configuration>
+                    </execution>
                     <!--
                     mvn confluence-reporting:deploy@softphone
                     mvn confluence-reporting:delete@softphone

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.bsc.maven</groupId>
     <artifactId>maven-confluence-parent</artifactId>
     <packaging>pom</packaging>
-    <version>5.1</version>
+    <version>5.1.1</version>
     <name>CONFLUENCE-REPORTING::Parent - ${project.version}</name>
     <description><![CDATA[
     Maven's plugin that allow to generate "project's documentation" directly to confluence allowing, in the same time, to keep in-sync both project & documentation