You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/10/12 09:49:24 UTC
[1/2] git commit: simpify site deploy
Updated Branches:
refs/heads/master 9b5734280 -> d186b2e55
simpify site deploy
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/6cb19d5a
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/6cb19d5a
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/6cb19d5a
Branch: refs/heads/master
Commit: 6cb19d5ac9c4909c1cb48aafbe66db05935ebbe3
Parents: 9b57342
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Oct 11 14:55:07 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Oct 11 14:55:07 2013 +1100
----------------------------------------------------------------------
pom.xml | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6cb19d5a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c15526..d7182ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,15 +129,13 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>${maven.scm.siteUrlDeployment}</url>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
</site>
</distributionManagement>
<properties>
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
- <maven.scm.siteFilePath>${maven.site.cache}/maven-scm-${project.version}</maven.scm.siteFilePath>
- <maven.scm.siteUrlDeployment>file://${maven.scm.siteFilePath}</maven.scm.siteUrlDeployment>
- <maven.scm.scmPubCheckoutDirectory>${maven.site.cache}/maven-scm-site-content-${project.version}</maven.scm.scmPubCheckoutDirectory>
+ <maven.site.path>scm-archives/scm-LATEST</maven.site.path>
<maven.scm.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/scm-archives/scm-latest</maven.scm.scmPubUrl>
<maven.scm.url>http://maven.apache.org/scm-archives/scm-latest/</maven.scm.url>
</properties>
@@ -318,6 +316,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/maven/scm/tags</tagBase>
@@ -328,10 +331,10 @@
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0-beta-2</version>
<configuration>
- <checkoutDirectory>${maven.scm.scmPubCheckoutDirectory}</checkoutDirectory>
<pubScmUrl>scm:svn:${maven.scm.scmPubUrl}</pubScmUrl>
<checkinComment>Apache Maven Scm site deployment</checkinComment>
- <content>${maven.scm.siteFilePath}</content>
+ <content>${project.build.directory}/staging/${maven.site.path}</content>
+ <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
<tryUpdate>true</tryUpdate>
</configuration>
</plugin>
@@ -405,6 +408,16 @@
</contributor>
</contributors>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
@@ -606,14 +619,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>site-release</id>
- <properties>
- <maven.scm.scmPubCheckoutDirectory>${maven.site.cache}/maven-scm-site-content</maven.scm.scmPubCheckoutDirectory>
- <maven.scm.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/scm</maven.scm.scmPubUrl>
- <maven.scm.url>http://maven.apache.org/scm/</maven.scm.url>
- </properties>
- </profile>
</profiles>
[2/2] git commit: cleanup wrong encoded characters
Posted by ol...@apache.org.
cleanup wrong encoded characters
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/d186b2e5
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/d186b2e5
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/d186b2e5
Branch: refs/heads/master
Commit: d186b2e55c3215166e41940274b96360922e68b3
Parents: 6cb19d5
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Oct 12 18:49:04 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Oct 12 18:49:04 2013 +1100
----------------------------------------------------------------------
deploySite.sh | 3 ++-
.../java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java | 2 +-
.../org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java | 2 +-
.../java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java | 2 +-
.../org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java | 2 +-
.../bazaar/command/checkin/BazaarCheckInCommandTckTest.java | 2 +-
.../bazaar/command/checkout/BazaarCheckOutCommandTckTest.java | 2 +-
.../bazaar/command/status/BazaarStatusCommandTckTest.java | 2 +-
.../bazaar/command/update/BazaarUpdateCommandTckTest.java | 2 +-
9 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/deploySite.sh
----------------------------------------------------------------------
diff --git a/deploySite.sh b/deploySite.sh
index b6517a2..7501d5e 100644
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -19,4 +19,5 @@
# under the License.
#
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn clean site site:stage $@
+mvn scm-publish:publish-scm $@
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java
index 6a06863..590e152 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
/**
* Check bazaar installation.
*
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*
*/
public class BazaarConfig
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
index c1f8fed..a4fe1e4 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
@@ -57,7 +57,7 @@ import java.util.List;
/**
* Bazaar NG http://bazaar-vcs.org/ is a decentralized revision control system. <br>
*
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*
* @plexus.component role="org.apache.maven.scm.provider.ScmProvider" role-hint="bazaar"
*/
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
index c733e10..f718011 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
@@ -40,7 +40,7 @@ import java.util.Map;
/**
* Common code for executing bazaar commands.
*
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*
*/
public final class BazaarUtils
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
index 08d1a89..4f2b319 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
@@ -33,7 +33,7 @@ import java.util.List;
/**
* Common code used in all tests.
*
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*/
public class BazaarRepoUtils
extends PlexusTestCase
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommandTckTest.java
index b0a04c8..e4d3b2e 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommandTckTest.java
@@ -23,7 +23,7 @@ import org.apache.maven.scm.provider.bazaar.BazaarRepoUtils;
import org.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest;
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*/
public class BazaarCheckInCommandTckTest
extends CheckInCommandTckTest
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommandTckTest.java
index 71714e5..42cea5c 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommandTckTest.java
@@ -23,7 +23,7 @@ import org.apache.maven.scm.provider.bazaar.BazaarRepoUtils;
import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*/
public class BazaarCheckOutCommandTckTest
extends CheckOutCommandTckTest
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommandTckTest.java b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommandTckTest.java
index 7ba1742..d732278 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommandTckTest.java
@@ -23,7 +23,7 @@ import org.apache.maven.scm.provider.bazaar.BazaarRepoUtils;
import org.apache.maven.scm.tck.command.status.StatusCommandTckTest;
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*/
public class BazaarStatusCommandTckTest
extends StatusCommandTckTest
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d186b2e5/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommandTckTest.java
index 3dba949..5022a5a 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommandTckTest.java
@@ -23,7 +23,7 @@ import org.apache.maven.scm.provider.bazaar.BazaarRepoUtils;
import org.apache.maven.scm.tck.command.update.UpdateCommandTckTest;
/**
- * @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
+ * @author <a href="mailto:torbjorn@smorgrav.org">Torbjorn Eikli Smorgrav</a>
*/
public class BazaarUpdateCommandTckTest
extends UpdateCommandTckTest