Merge remote-tracking branch 'upstream/master' into release/3.0

searls · Oct 5, 2016 · aa86066 · aa86066
2 parents f68247b + bacb338
commit aa86066
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -497,18 +497,21 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.github.github</groupId>
-        <artifactId>site-maven-plugin</artifactId>
-        <version>0.12</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <version>1.0</version>
         <configuration>
-          <message>Generating site for ${project.version}</message>
-          <server>github</server>
-          <noJekyll>true</noJekyll>
+          <checkoutDirectory>${project.build.directory}/scmpublish</checkoutDirectory>
+          <checkinComment>Generating site for ${project.version}</checkinComment>
+          <content>${project.reporting.outputDirectory}</content>
+          <skipDeletedFiles>true</skipDeletedFiles>
+          <pubScmUrl>scm:git:git@github.com:searls/jasmine-maven-plugin.git</pubScmUrl>
+          <scmBranch>gh-pages</scmBranch>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>site</goal>
+              <goal>publish-scm</goal>
             </goals>
             <phase>site-deploy</phase>
           </execution>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -4,7 +4,7 @@
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
   </skin>
   <custom>
     <fluidoSkin>
@@ -22,14 +22,14 @@
     </fluidoSkin>
   </custom>
   <body>
-    
+
    <menu name="Overview">
       <item name="Introduction" href="index.html"/>
       <item name="Goals" href="plugin-info.html"/>
       <item name="Usage" href="usage.html"/>
       <item name="Releases" href="http://github.com/searls/jasmine-maven-plugin/releases" />
    </menu>
-   
+
    <menu name="Examples">
       <item name="Spec Runner Templates" href="spec-runner-templates.html" />
       <item name="AMD Support" href="amd-support.html" />
@@ -39,7 +39,7 @@
       <item name="WebJars Support" href="webjars-support.html" />
       <item name="Override Jasmine Version" href="override-jasmine-version.html" />
    </menu>
-    
+
    <menu ref="reports"/>
 
    <menu name="External Links">