Author: hboutemy
Date: Sun Apr 15 13:25:40 2012
New Revision: 1326326
URL: http://svn.apache.org/viewvc?rev=1326326&view=rev
Log:
activated ITs by making them independant from remote svn
Added:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/setup.bsh
(with props)
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties
(with props)
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/setup.bsh
(with props)
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties
(with props)
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/setup.bsh
(with props)
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/pom.xml
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/pom.xml
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml
Modified: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/pom.xml?rev=1326326&r1=1326325&r2=1326326&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/pom.xml Sun Apr
15 13:25:40 2012
@@ -82,6 +82,12 @@ under the License.
<version>${scmVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svntest</artifactId>
+ <version>${scmVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.4</version>
@@ -142,6 +148,7 @@ under the License.
</goals>
<settingsFile>src/it/settings.xml</settingsFile>
<debug>true</debug>
+ <addTestClassPath>true</addTestClassPath>
</configuration>
<executions>
<execution>
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/pom.xml?rev=1326326&r1=1326325&r2=1326326&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/pom.xml
(original)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/pom.xml
Sun Apr 15 13:25:40 2012
@@ -38,7 +38,7 @@
<phase>pre-site</phase>
<goals><goal>prepare</goal></goals>
<configuration>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test</pubScmUrl>
+ <pubScmUrl>scm:svn:file://${basedir}/target/svn-root</pubScmUrl>
</configuration>
</execution>
</executions>
Added:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/setup.bsh?rev=1326326&view=auto
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/setup.bsh
(added)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/setup.bsh
Sun Apr 15 13:25:40 2012
@@ -0,0 +1,6 @@
+import java.io.*;
+import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
+
+SvnScmTestUtils.initializeRepository( new File( basedir, "target/svn-root" ) );
+
+return true;
\ No newline at end of file
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/setup.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/001-prepare/setup.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties?rev=1326326&view=auto
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties
(added)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties
Sun Apr 15 13:25:40 2012
@@ -0,0 +1 @@
+invoker.goals = post-site
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/invoker.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml?rev=1326326&r1=1326325&r2=1326326&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml
(original)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/pom.xml
Sun Apr 15 13:25:40 2012
@@ -47,29 +47,45 @@
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId> maven-site-scm-publish-plugin</artifactId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>stage-for-pub</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-scm-publish-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test</pubScmUrl>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
+ <pubScmUrl>scm:svn:file://${basedir}/target/svn-root</pubScmUrl>
+ <!--providerImplementations>
+ <svn>javasvn</svn> TODO: fix this provider because delete doesn't
work
+ </providerImplementations-->
</configuration>
- <dependencies>
+ <!--dependencies>
<dependency>
<groupId>com.google.code.maven-scm-provider-svnjava</groupId>
<artifactId>maven-scm-provider-svnjava</artifactId>
<version>1.15</version>
</dependency>
- </dependencies>
+ </dependencies-->
<executions>
<execution>
<id>prepare</id>
<phase>pre-site</phase>
- <goals><goal>prepare</goal></goals>
+ <goals>
+ <goal>prepare</goal>
+ </goals>
</execution>
<execution>
<id>perform</id>
@@ -77,9 +93,6 @@
<goals>
<goal>publish</goal>
</goals>
- <configuration>
- <dryRun>true</dryRun>
- </configuration>
</execution>
</executions>
</plugin>
Added:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/setup.bsh?rev=1326326&view=auto
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/setup.bsh
(added)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/setup.bsh
Sun Apr 15 13:25:40 2012
@@ -0,0 +1,6 @@
+import java.io.*;
+import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
+
+SvnScmTestUtils.initializeRepository( new File( basedir, "target/svn-root" ) );
+
+return true;
\ No newline at end of file
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/setup.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/002-perform/setup.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties?rev=1326326&view=auto
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties
(added)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties
Sun Apr 15 13:25:40 2012
@@ -0,0 +1 @@
+invoker.goals = site-deploy
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/invoker.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml?rev=1326326&r1=1326325&r2=1326326&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml
(original)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/pom.xml
Sun Apr 15 13:25:40 2012
@@ -54,7 +54,7 @@
<version>@pom.version@</version>
<extensions>true</extensions>
<configuration>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test-003</pubScmUrl>
+ <pubScmUrl>scm:svn:file://${basedir}/target/svn-root</pubScmUrl>
<providerImplementations>
<svn>javasvn</svn>
</providerImplementations>
Added:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/setup.bsh?rev=1326326&view=auto
==============================================================================
---
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/setup.bsh
(added)
+++
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/setup.bsh
Sun Apr 15 13:25:40 2012
@@ -0,0 +1,6 @@
+import java.io.*;
+import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
+
+SvnScmTestUtils.initializeRepository( new File( basedir, "target/svn-root" ) );
+
+return true;
\ No newline at end of file
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/setup.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/it/003-lifecycle/setup.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision