You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2013/06/04 23:53:48 UTC
svn commit: r1489645 - in /archiva: parent/pom.xml site/build.xml
site/pom.xml
Author: skygo
Date: Tue Jun 4 21:53:37 2013
New Revision: 1489645
URL: http://svn.apache.org/r1489645
Log:
update svnkit to 1.7.8
externalize ant task change svn cli with svnkit java
work on windoo
Added:
archiva/site/build.xml (with props)
Modified:
archiva/parent/pom.xml
archiva/site/pom.xml
Modified: archiva/parent/pom.xml
URL: http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=1489645&r1=1489644&r2=1489645&view=diff
==============================================================================
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Tue Jun 4 21:53:37 2013
@@ -73,7 +73,7 @@
<scmPubscmsvnImpl>javasvn</scmPubscmsvnImpl>
<scmSkipDeletedFiles>false</scmSkipDeletedFiles>
<maven-scm-provider-svnjava.version>2.0.5</maven-scm-provider-svnjava.version>
- <svnkit.version>1.7.5-v1</svnkit.version>
+ <svnkit.version>1.7.8</svnkit.version>
<!-- reporting plugins versions -->
Added: archiva/site/build.xml
URL: http://svn.apache.org/viewvc/archiva/site/build.xml?rev=1489645&view=auto
==============================================================================
--- archiva/site/build.xml (added)
+++ archiva/site/build.xml Tue Jun 4 21:53:37 2013
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project default="preparecheckout">
+ <target name="svn">
+ <java classpath="${plugin_classpath}" classname="org.tmatesoft.svn.cli.SVN" fork="true">
+ <arg line="${arg}"/>
+ </java>
+ </target>
+ <target name="preparecheckout">
+ <antcall target="svn">
+ <param name="arg" value="checkout --depth immediates ${svnUrl} ${scmPubCheckoutDirectory}"/>
+ </antcall>
+ <antcall target="svn">
+ <param name="arg" value="update --set-depth exclude ${scmPubCheckoutDirectory}/ref ${scmPubCheckoutDirectory}/docs ${scmPubCheckoutDirectory}/redback" />
+ </antcall>
+
+ <pathconvert pathsep=" " property="dirs">
+ <dirset dir="${scmPubCheckoutDirectory}" includes="*" />
+ </pathconvert>
+ <antcall target="svn">
+ <param name="arg" value="update --set-depth infinity ${dirs}" />
+ </antcall>
+ </target>
+</project>
\ No newline at end of file
Propchange: archiva/site/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: archiva/site/pom.xml
URL: http://svn.apache.org/viewvc/archiva/site/pom.xml?rev=1489645&r1=1489644&r2=1489645&view=diff
==============================================================================
--- archiva/site/pom.xml (original)
+++ archiva/site/pom.xml Tue Jun 4 21:53:37 2013
@@ -189,25 +189,20 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
- <exec executable="svn">
- <arg line="checkout --depth immediates ${svnUrl} ${scmPubCheckoutDirectory}" />
- </exec>
-
- <exec executable="svn">
- <arg line="update --set-depth exclude ${scmPubCheckoutDirectory}/ref ${scmPubCheckoutDirectory}/docs ${scmPubCheckoutDirectory}/redback" />
- </exec>
-
- <pathconvert pathsep=" " property="dirs">
- <dirset dir="${scmPubCheckoutDirectory}" includes="*" />
- </pathconvert>
- <exec executable="svn">
- <arg line="update --set-depth infinity ${dirs}" />
- </exec>
- </tasks>
+ <target>
+ <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <ant antfile="${basedir}/build.xml" />
+ </target>
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.tmatesoft.svnkit</groupId>
+ <artifactId>svnkit-cli</artifactId>
+ <version>${svnkit.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>