This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 48e8f8d Cleaning up pom file
48e8f8d is described below
commit 48e8f8ddec081a0d6362bcfb61b6eacd198f55cc
Author: Martin Stockhammer <[email protected]>
AuthorDate: Mon Nov 25 00:06:59 2019 +0100
Cleaning up pom file
---
pom.xml | 62 +++++++++++++++++++++++++++++---------------------------------
1 file changed, 29 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index 83ad335..25e2a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,23 +67,14 @@
<surefireVersion>3.0.0-M3</surefireVersion>
<sonar.plugin.version>2.5</sonar.plugin.version>
- <!-- redback components versions -->
-
<redback.comp.spring-cache.version>2.3-SNAPSHOT</redback.comp.spring-cache.version>
-
<redback.comp.expression-evaluator.version>2.2-SNAPSHOT</redback.comp.expression-evaluator.version>
-
<redback.comp.spring-apacheds.version>2.2-SNAPSHOT</redback.comp.spring-apacheds.version>
-
<redback.comp.spring-registry.version>2.5-SNAPSHOT</redback.comp.spring-registry.version>
-
<!-- archiva components version -->
<archiva.comp.version>3.0-SNAPSHOT</archiva.comp.version>
<!-- svnsubpub configuration -->
- <scmPubCheckoutDirectory />
- <scmTryUpdate>true</scmTryUpdate>
- <scmPubscmsvnImpl>svn</scmPubscmsvnImpl>
- <scmSkipDeletedFiles>false</scmSkipDeletedFiles>
-
<maven-scm-provider-svnjava.version>2.1.2</maven-scm-provider-svnjava.version>
- <svnkit.version>1.8.9</svnkit.version>
+ <scmSkipDeletedFiles>true</scmSkipDeletedFiles>
+ <scmPublishBranch>asf-staging-3.0</scmPublishBranch>
+ <scmPubCheckoutDirectory>.site-content</scmPubCheckoutDirectory>
<jetty.version>9.4.14.v20181114</jetty.version>
<slf4j.version>1.7.28</slf4j.version>
@@ -133,9 +124,9 @@
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/parent</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/parent</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/parent/</url>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/archiva-parent.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/archiva-parent.git</developerConnection>
+ <url>https://github.com/apache/archiva-parent</url>
</scm>
<issueManagement>
@@ -757,6 +748,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ <quiet>true</quiet>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -822,26 +817,27 @@
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.0.0</version>
<configuration>
- <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
- <tryUpdate>${scmTryUpdate}</tryUpdate>
- <skipDeletedFiles>${scmSkipDeletedFiles}</skipDeletedFiles>
- <providerImplementations>
- <svn>${scmPubscmsvnImpl}</svn>
- </providerImplementations>
<checkinComment>Apache Archiva Main site
deployment</checkinComment>
+ <skipDeletedFiles>${scmSkipDeletedFiles}</skipDeletedFiles>
+ <content>${project.build.directory}/staging</content>
+ <tryUpdate>true</tryUpdate>
+ <scmBranch>${scmPublishBranch}</scmBranch>
+ <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
+ <!--
+ <ignorePathsToDelete>
+ <path>%regex[^(?!docs/).*$]</path>
+ </ignorePathsToDelete>
+ -->
</configuration>
- <dependencies>
- <dependency>
- <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
- <artifactId>maven-scm-provider-svnjava</artifactId>
- <version>${maven-scm-provider-svnjava.version}</version>
- </dependency>
- <dependency>
- <groupId>org.tmatesoft.svnkit</groupId>
- <artifactId>svnkit</artifactId>
- <version>${svnkit.version}</version>
- </dependency>
- </dependencies>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
