maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1421222 - in /maven/shared/trunk: maven-shared-components/pom.xml maven-shared-incremental/pom.xml
Date Thu, 13 Dec 2012 10:58:38 GMT
Author: olamy
Date: Thu Dec 13 10:58:37 2012
New Revision: 1421222

URL: http://svn.apache.org/viewvc?rev=1421222&view=rev
Log:
configure site deployment via svnpubsub

Modified:
    maven/shared/trunk/maven-shared-components/pom.xml
    maven/shared/trunk/maven-shared-incremental/pom.xml

Modified: maven/shared/trunk/maven-shared-components/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/pom.xml?rev=1421222&r1=1421221&r2=1421222&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-components/pom.xml (original)
+++ maven/shared/trunk/maven-shared-components/pom.xml Thu Dec 13 10:58:37 2012
@@ -51,12 +51,22 @@ under the License.
     <system>Jenkins</system>
     <url>https://builds.apache.org/job/maven-shared/</url>
   </ciManagement>
-  <distributionManagement>
+
+  <!--distributionManagement>
     <site>
-      <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/shared/</url>
+      <id>apache.website.svnpub</id>
+      <url>scm:svn:${svnUrl}</url>
     </site>
-  </distributionManagement>
+  </distributionManagement-->
+
+  <properties>
+
+    <maven.sites.cache>${user.home}/maven-sites</maven.sites.cache>
+    <siteFilePath>${maven.sites.cache}/shared/${project.artifactId}-${project.version}</siteFilePath>
+    <scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
+    <svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/${project.artifactId}-${project.version}</svnUrl>
+
+  </properties>
 
   <repositories>
     <repository>
@@ -121,5 +131,70 @@ under the License.
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <skipDeploy>true</skipDeploy>
+        </configuration>
+        <executions>
+          <execution>
+            <id>stage-for-scm-publish</id>
+            <phase>post-site</phase>
+            <goals>
+              <goal>stage</goal>
+            </goals>
+            <configuration>
+              <skipDeploy>false</skipDeploy>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <version>1.0-beta-2</version>
+        <configuration>
+          <checkinComment>${project.name} site deployment</checkinComment>
+          <pubScmUrl>scm:svn:${svnUrl}</pubScmUrl>
+          <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
+          <content>${project.reporting.outputDirectory}</content>
+        </configuration>
+        <executions>
+          <execution>
+            <id>scm-publish</id>
+            <phase>site-deploy</phase>
+            <goals>
+              <goal>publish-scm</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.6</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>site-release</id>
+      <properties>
+
+        <siteFilePath>${maven.sites.cache}/shared/${project.artifactId}</siteFilePath>
+        <scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
+        <svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/shared/${project.artifactId}</svnUrl>
+
+      </properties>
+    </profile>
+  </profiles>
+
 </project>

Modified: maven/shared/trunk/maven-shared-incremental/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-incremental/pom.xml?rev=1421222&r1=1421221&r2=1421222&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-incremental/pom.xml (original)
+++ maven/shared/trunk/maven-shared-incremental/pom.xml Thu Dec 13 10:58:37 2012
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>18</version>
+    <version>19-SNAPSHOT</version>
     <relativePath>../maven-shared-components/pom.xml</relativePath>
   </parent>
 
@@ -40,13 +40,6 @@
     <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-incremental</url>
   </scm>
 
-  <distributionManagement>
-    <site>
-      <id>apache.website.svnpub</id>
-      <url>scm:svn:${svnUrl}</url>
-    </site>
-  </distributionManagement>
-
   <issueManagement>
     <system>jira</system>
     <url>https://jira.codehaus.org/browse/MSHARED/component/15650</url>
@@ -54,12 +47,6 @@
 
   <properties>
     <mavenVersion>2.2.1</mavenVersion>
-
-    <maven.sites.cache>${user.home}/maven-sites</maven.sites.cache>
-    <siteFilePath>${maven.sites.cache}/shared/${project.artifactId}-${project.version}</siteFilePath>
-    <scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
-    <svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/${project.artifactId}-${project.version}</svnUrl>
-
   </properties>
 
   <dependencies>
@@ -143,58 +130,7 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-        <executions>
-          <execution>
-            <id>stage-for-scm-publish</id>
-            <phase>post-site</phase>
-            <goals>
-              <goal>stage</goal>
-            </goals>
-            <configuration>
-              <skipDeploy>false</skipDeploy>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-scm-publish-plugin</artifactId>
-        <version>1.0-beta-2</version>
-        <configuration>
-          <checkinComment>Apache ${project.name} site deployment</checkinComment>
-        </configuration>
-        <executions>
-          <execution>
-            <id>scm-publish</id>
-            <phase>site-deploy</phase>
-            <goals>
-              <goal>publish-scm</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>site-release</id>
-      <properties>
-
-        <siteFilePath>${maven.sites.cache}/shared/${project.artifactId}</siteFilePath>
-        <scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
-        <svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/shared/${project.artifactId}</svnUrl>
-
-      </properties>
-    </profile>
-  </profiles>
-
 </project>



Mime
View raw message