You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2018/11/04 14:31:26 UTC
[archiva] branch feature/site-git-migration created (now d712278)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch feature/site-git-migration
in repository https://gitbox.apache.org/repos/asf/archiva.git.
at d712278 Fixing paths and plugin execution
This branch includes the following new commits:
new d29ac49 Adding git site build changes for archiva-docs
new 586f3c3 Adding archiva-modules site build changes for git migration
new faafb66 For consistent config using inherited=false
new d712278 Fixing paths and plugin execution
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[archiva] 04/04: Fixing paths and plugin execution
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/site-git-migration
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit d712278c12308e346ab01ce7677d1e23c71607b7
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Nov 4 15:31:11 2018 +0100
Fixing paths and plugin execution
---
archiva-modules/deploySite.sh | 6 +-
archiva-modules/git-sparse-checkout-pattern | 2 +-
archiva-modules/pom.xml | 113 ++++++++++++++++++++++------
3 files changed, 94 insertions(+), 27 deletions(-)
diff --git a/archiva-modules/deploySite.sh b/archiva-modules/deploySite.sh
old mode 100644
new mode 100755
index 44a13e0..387856b
--- a/archiva-modules/deploySite.sh
+++ b/archiva-modules/deploySite.sh
@@ -1 +1,5 @@
-mvn clean site site:stage -Preporting scm-publish:publish-scm $@
+#!/bin/bash
+
+mvn clean site site:stage -Preporting "$@"
+mvn scm-publish:publish-scm "$@"
+
diff --git a/archiva-modules/git-sparse-checkout-pattern b/archiva-modules/git-sparse-checkout-pattern
index d1e3efa..db843b2 100644
--- a/archiva-modules/git-sparse-checkout-pattern
+++ b/archiva-modules/git-sparse-checkout-pattern
@@ -1 +1 @@
-/refs
+/ref
\ No newline at end of file
diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 5296425..b8b9242 100644
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -48,34 +48,39 @@
</modules>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <checkinComment>Apache Archiva versioned module docs for ${project.version}</checkinComment>
- <skipDeletedFiles>true</skipDeletedFiles>
- <content>${project.build.directory}/staging</content>
- <tryUpdate>true</tryUpdate>
- <!--
- <ignorePathsToDelete>
- <path>%regex[^(?!docs/).*$]</path>
- </ignorePathsToDelete>
- -->
- </configuration>
-
- </plugin>
-
-
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <checkinComment>Apache Archiva versioned module docs for ${project.version}</checkinComment>
+ <skipDeletedFiles>true</skipDeletedFiles>
+ <content>${project.build.directory}/staging</content>
+ <tryUpdate>true</tryUpdate>
+ <!--
+ <ignorePathsToDelete>
+ <path>%regex[^(?!docs/).*$]</path>
+ </ignorePathsToDelete>
+ -->
+ </configuration>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <stagingDirectory>${site.staging.base}/target/staging/refs/${project.version}/</stagingDirectory>
+ <skipDeploy>true</skipDeploy>
+ <stagingDirectory>${site.staging.base}/target/staging/ref/${project.version}/</stagingDirectory>
</configuration>
<executions>
<execution>
@@ -84,9 +89,24 @@
<goal>attach-descriptor</goal>
</goals>
</execution>
- </executions>
+ <execution>
+ <id>site-generate-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stage-for-scm-publish</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ <configuration>
+ <skipDeploy>false</skipDeploy>
+ </configuration>
+ </execution> </executions>
</plugin>
-
</plugins>
</build>
@@ -206,6 +226,48 @@
</plugins>
</reporting>
</profile>
+ <!--
+ This runs a sparse git checkout for the web site content repository that contains only the doc directory.
+ The profile is activated only, if the checkout directory does not exist.
+ The executor runs a shell script.
+ -->
+ <profile>
+ <id>site-checkout</id>
+ <activation>
+ <file>
+ <missing>${scmPubCheckoutDirectory}</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>prepare-checkout</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>checkoutSite.sh</executable>
+ <workingDirectory>${project.basedir}</workingDirectory>
+ <arguments>
+ <argument>-d</argument>
+ <argument>${scmPubCheckoutDirectory}</argument>
+ <argument>${siteRepositoryUrl}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
@@ -215,4 +277,5 @@
<url>${siteRepositoryUrl}</url>
</site>
</distributionManagement>
+
</project>
[archiva] 01/04: Adding git site build changes for archiva-docs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/site-git-migration
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit d29ac49e8068689b5f8458f7886167d9e8fa179c
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Nov 4 13:33:23 2018 +0100
Adding git site build changes for archiva-docs
---
archiva-docs/checkoutSite.sh | 135 +++++++++++++++++++++++++++++++
archiva-docs/git-sparse-checkout-pattern | 1 +
archiva-docs/pom.xml | 66 ++++++++++++++-
3 files changed, 200 insertions(+), 2 deletions(-)
diff --git a/archiva-docs/checkoutSite.sh b/archiva-docs/checkoutSite.sh
new file mode 100755
index 0000000..5e582bd
--- /dev/null
+++ b/archiva-docs/checkoutSite.sh
@@ -0,0 +1,135 @@
+#!/bin/bash
+#
+# 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.
+#
+# Author: Martin Stockhammer <ma...@apache.org>
+# Date: 2018-11-03
+#
+# This script runs a sparse git clone of a remote repository and
+# initializes the git configuration.
+#
+# It is mainly used for site content creation, because the main archiva-web-content repository
+# is rather large and we don't want to checkout the complete data.
+#
+
+SITE_DIR=".site-content"
+GIT_REMOTE=""
+
+GIT_USER=$(git config user.name)
+GIT_EMAIL=$(git config user.email)
+
+GIT_PATTERN_FILE="git-sparse-checkout-pattern"
+GIT_PATTERN_DEST=".git/info/sparse-checkout"
+
+MY_PWD=$(pwd)
+
+CLONE=1
+FORCE=1
+MODULE_DIR="${MY_PWD}"
+PATTERN=""
+while [ ! -z "$1" ]; do
+ case "$1" in
+ -f)
+ FORCE=0
+ shift
+ ;;
+ -d)
+ shift
+ SITE_DIR="$1"
+ shift
+ ;;
+ -p)
+ shift
+ if [ -z "${PATTERN}" ]; then
+ PATTERN="${1}"
+ else
+ PATTERN="${PATTERN}\n${1}"
+ fi
+ shift
+ ;;
+ -m)
+ shift
+ MODULE_DIR="$1"
+ shift
+ ;;
+ *)
+ GIT_REMOTE="$1"
+ shift
+ ;;
+ esac
+done
+
+print_usage() {
+ echo "checkoutRepo [-m MODULE_DIR] [-d SITE_DIR] [-f] GIT_URL"
+ echo " -m: The module directory where the pattern file can be found and the site dir will be created."
+ echo " -d SITE_DIR: Use the given directory for checkout"
+ echo " -f: Force clone, even if directory exists"
+}
+
+if [ ! -f "${MODULE_DIR}/pom.xml" ]; then
+ echo "Looks like the working directory is not a valid dir. No pom.xml found."
+ exit 1
+fi
+
+cd "${MODULE_DIR}" || { echo "Could not change to module directory ${MODULE_DIR}"; exit 1; }
+
+if [ -z "$GIT_REMOTE" ]; then
+ print_usage
+ exit 1
+fi
+
+if [ "${GIT_REMOTE:0:8}" == "scm:git:" ]; then
+ GIT_REMOTE="${GIT_REMOTE:8}"
+fi
+
+
+if [ -d "${SITE_DIR}" ]; then
+ if [ ! -d "${SITE_DIR}/.git" ]; then
+ echo "Directory ${SITE_DIR} exist already, but is not a git clone. Aborting."
+ exit 1
+ elif [ "$FORCE" -eq 0 ]; then
+ CLONE=0
+ fi
+else
+ CLONE=0
+fi
+
+if [ $CLONE -eq 0 ]; then
+ git clone "${GIT_REMOTE}" "${SITE_DIR}" --no-checkout
+ if [ $? -ne 0 ]; then
+ echo "Git clone failed"
+ exit 1
+ fi
+fi
+
+cd "${SITE_DIR}" || { echo "Could not change to site dir ${SITE_DIR}"; exit 1; }
+
+git config core.sparsecheckout true
+git config user.name "${GIT_USER}"
+git config user.email "${GIT_EMAIL}"
+
+if [ ! -z "${PATTERN}" ]; then
+ echo -e "${PATTERN}" >"${GIT_PATTERN_DEST}"
+elif [ -f "../${GIT_PATTERN_FILE}" ]; then
+ cp "../${GIT_PATTERN_FILE}" "${GIT_PATTERN_DEST}"
+fi
+
+git checkout --
+
+cd "${MY_PWD}"
+
diff --git a/archiva-docs/git-sparse-checkout-pattern b/archiva-docs/git-sparse-checkout-pattern
new file mode 100644
index 0000000..2f88269
--- /dev/null
+++ b/archiva-docs/git-sparse-checkout-pattern
@@ -0,0 +1 @@
+/docs
diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index 59d935b..f7d70cf 100644
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -34,6 +34,8 @@
<scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<releaseDate>${maven.build.timestamp}</releaseDate>
+ <!-- The git repository, where the site content is placed -->
+ <siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content-INVALID.git</siteRepositoryUrl>
</properties>
<build>
@@ -55,10 +57,25 @@
</pluginManagement>
<plugins>
<plugin>
+ <!--
+ SCM Publish plugin.
+ We deactivated the deletion, because the patterns for ignorePathsToDelete does only use the file/directory names
+ not the relative paths.
+ Site plugin is deploying into the subdirectory docs/${project.version} the publish plugin is copying from
+ target directly.
+ -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <checkinComment>Apache Archiva Versionned docs for ${project.version}</checkinComment>
+ <checkinComment>Apache Archiva Versioned docs for ${project.version}</checkinComment>
+ <skipDeletedFiles>true</skipDeletedFiles>
+ <content>${project.build.directory}/staging</content>
+ <tryUpdate>true</tryUpdate>
+<!--
+ <ignorePathsToDelete>
+ <path>%regex[^(?!docs/).*$]</path>
+ </ignorePathsToDelete>
+-->
</configuration>
<executions>
<execution>
@@ -75,6 +92,7 @@
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
+ <stagingDirectory>${project.build.directory}/staging/docs/${project.version}/</stagingDirectory>
</configuration>
<executions>
<execution>
@@ -155,8 +173,52 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</url>
+ <url>${siteRepositoryUrl}</url>
</site>
</distributionManagement>
+ <profiles>
+ <!--
+ This runs a sparse git checkout for the web site content repository that contains only the doc directory.
+ The profile is activated only, if the checkout directory does not exist.
+ The executor runs a shell script.
+ -->
+ <profile>
+ <id>site-checkout</id>
+ <activation>
+ <file>
+ <missing>${scmPubCheckoutDirectory}</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <executions>
+ <execution>
+ <id>prepare-checkout</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>checkoutSite.sh</executable>
+ <workingDirectory>${project.basedir}</workingDirectory>
+ <arguments>
+ <argument>-d</argument>
+ <argument>${scmPubCheckoutDirectory}</argument>
+ <argument>${siteRepositoryUrl}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
</project>
[archiva] 02/04: Adding archiva-modules site build changes for git
migration
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/site-git-migration
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 586f3c3c2bcab707d1a5d3a43aa409dcee129393
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Nov 4 13:34:47 2018 +0100
Adding archiva-modules site build changes for git migration
---
.../archiva-base/archiva-checksum/pom.xml | 4 +
.../archiva-base/archiva-common/pom.xml | 6 +
.../archiva-base/archiva-configuration/pom.xml | 5 +
.../archiva-consumers/archiva-consumer-api/pom.xml | 5 +
.../archiva-consumer-archetype/pom.xml | 2 +
.../archiva-core-consumers/pom.xml | 5 +
.../archiva-lucene-consumers/pom.xml | 5 +
.../archiva-metadata-consumer/pom.xml | 5 +
.../archiva-signature-consumers/pom.xml | 6 +
.../archiva-base/archiva-consumers/pom.xml | 4 +
.../archiva-base/archiva-converter/pom.xml | 5 +
.../archiva-base/archiva-filelock/pom.xml | 5 +
.../archiva-base/archiva-maven2-indexer/pom.xml | 5 +
.../archiva-base/archiva-maven2-metadata/pom.xml | 4 +
.../archiva-base/archiva-maven2-model/pom.xml | 5 +
archiva-modules/archiva-base/archiva-mock/pom.xml | 5 +
archiva-modules/archiva-base/archiva-model/pom.xml | 5 +
.../archiva-base/archiva-plexus-bridge/pom.xml | 5 +
.../archiva-base/archiva-policies/pom.xml | 5 +
.../archiva-base/archiva-proxy-api/pom.xml | 5 +
.../archiva-base/archiva-proxy-common/pom.xml | 5 +
archiva-modules/archiva-base/archiva-proxy/pom.xml | 5 +
.../archiva-repository-admin-api/pom.xml | 5 +
.../archiva-repository-admin-default/pom.xml | 5 +
.../archiva-base/archiva-repository-admin/pom.xml | 5 +
.../archiva-base/archiva-repository-api/pom.xml | 5 +
.../archiva-base/archiva-repository-layer/pom.xml | 5 +
.../archiva-repository-scanner/pom.xml | 5 +
.../archiva-base/archiva-security-common/pom.xml | 5 +
.../archiva-base/archiva-test-utils/pom.xml | 5 +
.../archiva-base/archiva-transaction/pom.xml | 5 +
.../archiva-base/archiva-xml-tools/pom.xml | 5 +
archiva-modules/archiva-base/pom.xml | 3 +
.../archiva-karaf/archiva-features/pom.xml | 2 +
archiva-modules/archiva-karaf/pom.xml | 5 +
.../archiva-scheduler-api/pom.xml | 5 +
.../archiva-scheduler-indexing-maven2/pom.xml | 5 +
.../archiva-scheduler-indexing/pom.xml | 4 +
.../archiva-scheduler-repository-api/pom.xml | 5 +
.../archiva-scheduler-repository/pom.xml | 5 +
archiva-modules/archiva-scheduler/pom.xml | 5 +
.../archiva-rest/archiva-rest-api/pom.xml | 1 +
.../archiva-rest/archiva-rest-services/pom.xml | 1 +
archiva-modules/archiva-web/archiva-rest/pom.xml | 23 +++-
archiva-modules/archiva-web/archiva-rss/pom.xml | 5 +
.../archiva-web/archiva-security/pom.xml | 4 +
.../archiva-web/archiva-test-mocks/pom.xml | 3 +
.../archiva-web/archiva-web-common/pom.xml | 1 +
.../archiva-web/archiva-webapp-test/pom.xml | 2 +
archiva-modules/archiva-web/archiva-webapp/pom.xml | 1 +
archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +
archiva-modules/archiva-web/pom.xml | 4 +
archiva-modules/checkoutSite.sh | 135 +++++++++++++++++++++
archiva-modules/git-sparse-checkout-pattern | 1 +
.../metadata/metadata-model-maven2/pom.xml | 4 +
archiva-modules/metadata/metadata-model/pom.xml | 4 +
.../metadata/metadata-repository-api/pom.xml | 5 +
.../metadata/metadata-statistics-api/pom.xml | 5 +
archiva-modules/metadata/pom.xml | 5 +
archiva-modules/metadata/test-repository/pom.xml | 5 +
archiva-modules/plugins/audit/pom.xml | 5 +
.../plugins/generic-metadata-support/pom.xml | 5 +
archiva-modules/plugins/maven2-repository/pom.xml | 5 +
.../plugins/metadata-store-cassandra/pom.xml | 3 +-
.../plugins/metadata-store-file/pom.xml | 5 +
archiva-modules/plugins/metadata-store-jcr/pom.xml | 5 +
archiva-modules/plugins/pom.xml | 5 +
archiva-modules/plugins/problem-reports/pom.xml | 5 +
.../plugins/repository-statistics/pom.xml | 5 +
.../plugins/stage-repository-merge/pom.xml | 4 +
archiva-modules/pom.xml | 73 +++++++++--
71 files changed, 510 insertions(+), 16 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml
index 8f5ab0b..95a20f4 100644
--- a/archiva-modules/archiva-base/archiva-checksum/pom.xml
+++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml
@@ -28,6 +28,10 @@
<packaging>bundle</packaging>
<name>Archiva Base :: Checksum</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml
index a81e4c6..e0458d4 100644
--- a/archiva-modules/archiva-base/archiva-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-common/pom.xml
@@ -28,6 +28,12 @@
<artifactId>archiva-common</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Common</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
+
<dependencies>
<!-- TO OTHER DEVELOPERS:
This module should depend on NO OTHER ARCHIVA MODULES.
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 044310f..11d2270 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-configuration</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Configuration</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva.redback.components.registry</groupId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index abe893b..deb832d 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-consumer-api</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Consumers :: API</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
index 628ec47..3847806 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
@@ -29,10 +29,12 @@
<packaging>maven-archetype</packaging>
<name>Archiva Consumers :: Consumers Archetype</name>
<description>Simple archetype to create archiva consumers</description>
+
<properties>
<archivaVersion>${project.version}</archivaVersion>
<archetypeVersion>2.4</archetypeVersion>
<mavenInvokerVersion>2.2</mavenInvokerVersion>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties>
<dependencies>
<!-- Used by the archetype, so needed to be built before integration
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index b0cfb03..4f2e3a0 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-core-consumers</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Consumers :: Core Consumers</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<!-- TODO: remove this hard dependency by using an event mechanism -->
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 8cee773..24e3e9b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-lucene-consumers</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Consumers :: Lucene</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
index 099d2b8..b56bf1b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-metadata-consumer</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Consumers :: Metadata</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
index 88ffcaf..d1c715f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
@@ -25,4 +25,10 @@
<artifactId>archiva-signature-consumers</artifactId>
<name>Archiva Base :: Consumers :: GPG Signature</name>
+
+
+ <properties>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
+ </properties>
+
</project>
diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml
index f4cfc90..9ac6aef 100644
--- a/archiva-modules/archiva-base/archiva-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml
@@ -26,6 +26,10 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<artifactId>archiva-consumers</artifactId>
<name>Archiva Base :: Consumers</name>
<packaging>pom</packaging>
diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index e952313..8186e6b 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-converter</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Repository Converter</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml
index 5829da2..c889119 100644
--- a/archiva-modules/archiva-base/archiva-filelock/pom.xml
+++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-filelock</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: FileLock</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
index b68dacb..1cc6b0f 100644
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-maven2-indexer</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Maven2 Indexer</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
index 84edf97..fbf7f1e 100644
--- a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
@@ -31,6 +31,10 @@
<name>Archiva Base :: Maven 2 Metadata</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
index 0198eb4..2a3a015 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
@@ -30,6 +30,11 @@
<name>Archiva Base :: Maven 2 Model</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/archiva-modules/archiva-base/archiva-mock/pom.xml b/archiva-modules/archiva-base/archiva-mock/pom.xml
index 229eab4..8af55e2 100644
--- a/archiva-modules/archiva-base/archiva-mock/pom.xml
+++ b/archiva-modules/archiva-base/archiva-mock/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-mock</artifactId>
<packaging>jar</packaging>
<name>Archiva Base :: Mocks</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index 071268c..49bb61d 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-model</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Model</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index 4eb1eac..eaee920 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-plexus-bridge</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Plexus Bridge</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 7da80fc..267c001 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-policies</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Policies</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
index f0d8ab0..15e70cb 100644
--- a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
@@ -28,6 +28,11 @@
<packaging>bundle</packaging>
<name>Archiva Base :: Proxy Api</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
index c22109c..733c599 100644
--- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
@@ -27,6 +27,11 @@
<artifactId>archiva-proxy-common</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Proxy Common</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 23c0e6c..a27897d 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-proxy</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Proxy</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
index 33ee7b1..c912c18 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-repository-admin-api</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Repository Admin Api</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 5e99f6d..b752f28 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-repository-admin-default</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Repository Admin Default</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
index f704734..9d4865a 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-repository-admin</artifactId>
<name>Archiva Base :: Repository Admin</name>
<packaging>pom</packaging>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<modules>
<module>archiva-repository-admin-api</module>
<module>archiva-repository-admin-default</module>
diff --git a/archiva-modules/archiva-base/archiva-repository-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-api/pom.xml
index 168426c..6aa2d76 100644
--- a/archiva-modules/archiva-base/archiva-repository-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-api/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-repository-api</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Repository API</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index e9d60bd..1af1ab0 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-repository-layer</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Repository Interface Layer</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 7b76e7b..7136844 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-repository-scanner</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Repository Scanner</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-security-common/pom.xml b/archiva-modules/archiva-base/archiva-security-common/pom.xml
index 00823b5..f9ebb9e 100644
--- a/archiva-modules/archiva-base/archiva-security-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-security-common/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-security-common</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: Security Common</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/archiva-modules/archiva-base/archiva-test-utils/pom.xml b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
index bde3e5c..0c81176 100644
--- a/archiva-modules/archiva-base/archiva-test-utils/pom.xml
+++ b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
@@ -27,6 +27,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-test-utils</artifactId>
<name>Archiva Base :: Test Utility</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index 4c3ba02..a9eee95 100644
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -28,6 +28,11 @@
<packaging>bundle</packaging>
<name>Archiva Base :: Transactions</name>
<description>API for managing transaction.</description>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
index 190beb8..f962aed 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
+++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-xml-tools</artifactId>
<packaging>bundle</packaging>
<name>Archiva Base :: XML Tools</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml
index 54bd4aa..4b20b63 100644
--- a/archiva-modules/archiva-base/pom.xml
+++ b/archiva-modules/archiva-base/pom.xml
@@ -29,6 +29,9 @@
<name>Archiva :: Base</name>
<packaging>pom</packaging>
+ <properties>
+ <site.staging.base>${project.parent.basedir}</site.staging.base>
+ </properties>
<modules>
<module>archiva-test-utils</module>
<module>archiva-common</module>
diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml
index aadfb36..3223f88 100644
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -30,6 +30,8 @@
<name>Archiva :: Karaf Features</name>
<properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+
<aopalliance.bundle.version>1.0_5</aopalliance.bundle.version>
<beanlib.bundle.version>5.0.2beta_1-SNAPSHOT</beanlib.bundle.version>
<cglib.bundle.version>2.2_2</cglib.bundle.version>
diff --git a/archiva-modules/archiva-karaf/pom.xml b/archiva-modules/archiva-karaf/pom.xml
index ff50a8d..167e825 100644
--- a/archiva-modules/archiva-karaf/pom.xml
+++ b/archiva-modules/archiva-karaf/pom.xml
@@ -28,6 +28,11 @@
<packaging>pom</packaging>
<name>Archiva :: Karaf</name>
+
+ <properties>
+ <site.staging.base>${project.parent.basedir}</site.staging.base>
+ </properties>
+
<modules>
<module>archiva-features</module>
<!-- <module>archiva-commands</module> -->
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
index 38b1af3..1dd81b4 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
@@ -27,6 +27,11 @@
<artifactId>archiva-scheduler-api</artifactId>
<packaging>bundle</packaging>
<name>Archiva Scheduler :: API</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
index b55a421..b919145 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
@@ -29,6 +29,11 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<artifactId>archiva-scheduler-indexing-maven2</artifactId>
<name>Archiva Scheduler :: Maven Indexing</name>
<packaging>bundle</packaging>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index 26825f4..a56a57f 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -28,6 +28,10 @@
<packaging>bundle</packaging>
<name>Archiva Scheduler :: Indexing</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
index 3ff1e10..46bdc47 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
@@ -27,6 +27,11 @@
<artifactId>archiva-scheduler-repository-api</artifactId>
<packaging>bundle</packaging>
<name>Archiva Scheduler :: Repository Scanning Api</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 0d12655..4dbe2af 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -27,6 +27,11 @@
<artifactId>archiva-scheduler-repository</artifactId>
<packaging>bundle</packaging>
<name>Archiva Scheduler :: Repository Scanning</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-scheduler/pom.xml b/archiva-modules/archiva-scheduler/pom.xml
index 94f7177..89d5e79 100644
--- a/archiva-modules/archiva-scheduler/pom.xml
+++ b/archiva-modules/archiva-scheduler/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-scheduler</artifactId>
<packaging>pom</packaging>
<name>Archiva :: Scheduler</name>
+
+ <properties>
+ <site.staging.base>${project.parent.basedir}</site.staging.base>
+ </properties>
+
<modules>
<module>archiva-scheduler-api</module>
<module>archiva-scheduler-indexing</module>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index cdbae65..ccbbd37 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -31,6 +31,7 @@
<properties>
<enunciate.docsDir>${project.build.outputDirectory}/rest-docs-archiva-rest-api</enunciate.docsDir>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties>
<dependencies>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 97270b0..3b515e4 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -37,6 +37,7 @@
-->
<redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver>
+ <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties>
<dependencies>
diff --git a/archiva-modules/archiva-web/archiva-rest/pom.xml b/archiva-modules/archiva-web/archiva-rest/pom.xml
index f1f4a59..3f096d9 100644
--- a/archiva-modules/archiva-web/archiva-rest/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/pom.xml
@@ -17,7 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
@@ -27,8 +28,28 @@
<artifactId>archiva-rest</artifactId>
<name>Archiva Web :: REST support</name>
<packaging>pom</packaging>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<modules>
<module>archiva-rest-api</module>
<module>archiva-rest-services</module>
</modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <stagingDirectory>${project.parent.parent.parent.basedir}/target/staging/refs/${project.version}/
+ </stagingDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml
index f167712..96046a4 100644
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -28,6 +28,11 @@
<artifactId>archiva-rss</artifactId>
<packaging>bundle</packaging>
<name>Archiva Web :: RSS</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml
index 673facf..e6fe99f 100644
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -28,6 +28,10 @@
<artifactId>archiva-security</artifactId>
<packaging>bundle</packaging>
<name>Archiva Web :: Security Configuration</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-web/archiva-test-mocks/pom.xml b/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
index b25a684..845cb19 100644
--- a/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
+++ b/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
@@ -28,6 +28,9 @@
<artifactId>archiva-test-mocks</artifactId>
<name>Archiva Web :: Tests Mocks</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
<dependencies>
<dependency>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index a7765ec..3d70a48 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -32,6 +32,7 @@
<properties>
<enunciate.docsDir>${project.build.outputDirectory}/rest-docs-archiva-ui</enunciate.docsDir>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties>
<dependencies>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 913229f..5b7d47f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -38,6 +38,8 @@
<fluentlenium.version>3.2.0</fluentlenium.version>
<fluentlenium.festassert.version>0.13.2</fluentlenium.festassert.version>
<browserPath/>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+
</properties>
<dependencies>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 7303312..3fd8427 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -41,6 +41,7 @@
<archiva.repositorySessionFactory.id>jcr</archiva.repositorySessionFactory.id>
<cassandra.host>localhost</cassandra.host>
<cassandra.port>9160</cassandra.port>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties>
<dependencies>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 931b2f9..4252ef0 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -39,6 +39,8 @@
<redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver>
<webdav.argLine>-Xmx512m -Xms512m -client</webdav.argLine>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+
</properties>
<dependencies>
diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml
index 0df3ad6..c55c6f8 100644
--- a/archiva-modules/archiva-web/pom.xml
+++ b/archiva-modules/archiva-web/pom.xml
@@ -26,6 +26,10 @@
<name>Archiva :: Web</name>
<packaging>pom</packaging>
+ <properties>
+ <site.staging.base>${project.parent.basedir}</site.staging.base>
+ </properties>
+
<modules>
<module>archiva-security</module>
<module>archiva-webdav</module>
diff --git a/archiva-modules/checkoutSite.sh b/archiva-modules/checkoutSite.sh
new file mode 100755
index 0000000..5e582bd
--- /dev/null
+++ b/archiva-modules/checkoutSite.sh
@@ -0,0 +1,135 @@
+#!/bin/bash
+#
+# 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.
+#
+# Author: Martin Stockhammer <ma...@apache.org>
+# Date: 2018-11-03
+#
+# This script runs a sparse git clone of a remote repository and
+# initializes the git configuration.
+#
+# It is mainly used for site content creation, because the main archiva-web-content repository
+# is rather large and we don't want to checkout the complete data.
+#
+
+SITE_DIR=".site-content"
+GIT_REMOTE=""
+
+GIT_USER=$(git config user.name)
+GIT_EMAIL=$(git config user.email)
+
+GIT_PATTERN_FILE="git-sparse-checkout-pattern"
+GIT_PATTERN_DEST=".git/info/sparse-checkout"
+
+MY_PWD=$(pwd)
+
+CLONE=1
+FORCE=1
+MODULE_DIR="${MY_PWD}"
+PATTERN=""
+while [ ! -z "$1" ]; do
+ case "$1" in
+ -f)
+ FORCE=0
+ shift
+ ;;
+ -d)
+ shift
+ SITE_DIR="$1"
+ shift
+ ;;
+ -p)
+ shift
+ if [ -z "${PATTERN}" ]; then
+ PATTERN="${1}"
+ else
+ PATTERN="${PATTERN}\n${1}"
+ fi
+ shift
+ ;;
+ -m)
+ shift
+ MODULE_DIR="$1"
+ shift
+ ;;
+ *)
+ GIT_REMOTE="$1"
+ shift
+ ;;
+ esac
+done
+
+print_usage() {
+ echo "checkoutRepo [-m MODULE_DIR] [-d SITE_DIR] [-f] GIT_URL"
+ echo " -m: The module directory where the pattern file can be found and the site dir will be created."
+ echo " -d SITE_DIR: Use the given directory for checkout"
+ echo " -f: Force clone, even if directory exists"
+}
+
+if [ ! -f "${MODULE_DIR}/pom.xml" ]; then
+ echo "Looks like the working directory is not a valid dir. No pom.xml found."
+ exit 1
+fi
+
+cd "${MODULE_DIR}" || { echo "Could not change to module directory ${MODULE_DIR}"; exit 1; }
+
+if [ -z "$GIT_REMOTE" ]; then
+ print_usage
+ exit 1
+fi
+
+if [ "${GIT_REMOTE:0:8}" == "scm:git:" ]; then
+ GIT_REMOTE="${GIT_REMOTE:8}"
+fi
+
+
+if [ -d "${SITE_DIR}" ]; then
+ if [ ! -d "${SITE_DIR}/.git" ]; then
+ echo "Directory ${SITE_DIR} exist already, but is not a git clone. Aborting."
+ exit 1
+ elif [ "$FORCE" -eq 0 ]; then
+ CLONE=0
+ fi
+else
+ CLONE=0
+fi
+
+if [ $CLONE -eq 0 ]; then
+ git clone "${GIT_REMOTE}" "${SITE_DIR}" --no-checkout
+ if [ $? -ne 0 ]; then
+ echo "Git clone failed"
+ exit 1
+ fi
+fi
+
+cd "${SITE_DIR}" || { echo "Could not change to site dir ${SITE_DIR}"; exit 1; }
+
+git config core.sparsecheckout true
+git config user.name "${GIT_USER}"
+git config user.email "${GIT_EMAIL}"
+
+if [ ! -z "${PATTERN}" ]; then
+ echo -e "${PATTERN}" >"${GIT_PATTERN_DEST}"
+elif [ -f "../${GIT_PATTERN_FILE}" ]; then
+ cp "../${GIT_PATTERN_FILE}" "${GIT_PATTERN_DEST}"
+fi
+
+git checkout --
+
+cd "${MY_PWD}"
+
diff --git a/archiva-modules/git-sparse-checkout-pattern b/archiva-modules/git-sparse-checkout-pattern
new file mode 100644
index 0000000..d1e3efa
--- /dev/null
+++ b/archiva-modules/git-sparse-checkout-pattern
@@ -0,0 +1 @@
+/refs
diff --git a/archiva-modules/metadata/metadata-model-maven2/pom.xml b/archiva-modules/metadata/metadata-model-maven2/pom.xml
index ad10ffb..1bb4a8a 100644
--- a/archiva-modules/metadata/metadata-model-maven2/pom.xml
+++ b/archiva-modules/metadata/metadata-model-maven2/pom.xml
@@ -28,6 +28,10 @@
<packaging>bundle</packaging>
<name>Archiva Metadata :: Maven 2 Model</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/metadata/metadata-model/pom.xml b/archiva-modules/metadata/metadata-model/pom.xml
index 3ddf056..399198e 100644
--- a/archiva-modules/metadata/metadata-model/pom.xml
+++ b/archiva-modules/metadata/metadata-model/pom.xml
@@ -28,6 +28,10 @@
<packaging>bundle</packaging>
<name>Archiva Metadata :: Model</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml
index 5cc5078..290f6f6 100644
--- a/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -27,6 +27,11 @@
<artifactId>metadata-repository-api</artifactId>
<packaging>bundle</packaging>
<name>Archiva Metadata :: Repository API</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/archiva-modules/metadata/metadata-statistics-api/pom.xml b/archiva-modules/metadata/metadata-statistics-api/pom.xml
index 251f2a7..61bbfbf 100644
--- a/archiva-modules/metadata/metadata-statistics-api/pom.xml
+++ b/archiva-modules/metadata/metadata-statistics-api/pom.xml
@@ -27,6 +27,11 @@
<artifactId>metadata-statistics-api</artifactId>
<packaging>bundle</packaging>
<name>Archiva Metadata :: Statistics API</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/metadata/pom.xml b/archiva-modules/metadata/pom.xml
index 1c1ba69..b86b875 100644
--- a/archiva-modules/metadata/pom.xml
+++ b/archiva-modules/metadata/pom.xml
@@ -27,6 +27,11 @@
<artifactId>metadata</artifactId>
<name>Archiva :: Metadata</name>
<packaging>pom</packaging>
+
+ <properties>
+ <site.staging.base>${project.parent.basedir}</site.staging.base>
+ </properties>
+
<modules>
<module>metadata-model</module>
<module>metadata-repository-api</module>
diff --git a/archiva-modules/metadata/test-repository/pom.xml b/archiva-modules/metadata/test-repository/pom.xml
index 7313a1c..1ebe300 100644
--- a/archiva-modules/metadata/test-repository/pom.xml
+++ b/archiva-modules/metadata/test-repository/pom.xml
@@ -26,6 +26,11 @@
</parent>
<artifactId>test-repository</artifactId>
<name>Archiva Metadata :: Repository for Testing</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
diff --git a/archiva-modules/plugins/audit/pom.xml b/archiva-modules/plugins/audit/pom.xml
index cf37c0d..be02683 100644
--- a/archiva-modules/plugins/audit/pom.xml
+++ b/archiva-modules/plugins/audit/pom.xml
@@ -27,6 +27,11 @@
<artifactId>audit</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: Audit Logging</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/generic-metadata-support/pom.xml b/archiva-modules/plugins/generic-metadata-support/pom.xml
index 64120b4..68bd5cd 100644
--- a/archiva-modules/plugins/generic-metadata-support/pom.xml
+++ b/archiva-modules/plugins/generic-metadata-support/pom.xml
@@ -27,6 +27,11 @@
<artifactId>generic-metadata-support</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: Generic Metadata Support</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 8d5a04c..270dd7e 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -27,6 +27,11 @@
<artifactId>maven2-repository</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: Maven 2.x Repository Support</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index e1650b1..3f2cafe 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -30,9 +30,8 @@
<name>Archiva Core Plugins :: Cassandra Storage for Metadata</name>
<properties>
-
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
<cassandraVersion>3.11.2</cassandraVersion>
-
</properties>
<dependencies>
diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml
index 2fcf7eb..4e85c63 100644
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++ b/archiva-modules/plugins/metadata-store-file/pom.xml
@@ -27,6 +27,11 @@
<artifactId>metadata-store-file</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: File System Backed Metadata Repository</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index a7df77f..114bcb7 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -28,6 +28,11 @@
<artifactId>metadata-store-jcr</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: JCR Storage for Metadata</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/pom.xml b/archiva-modules/plugins/pom.xml
index 039d7e1..e8242b3 100644
--- a/archiva-modules/plugins/pom.xml
+++ b/archiva-modules/plugins/pom.xml
@@ -27,6 +27,11 @@
<artifactId>plugins</artifactId>
<name>Archiva :: Core Plugins</name>
<packaging>pom</packaging>
+
+ <properties>
+ <site.staging.base>${project.parent.basedir}</site.staging.base>
+ </properties>
+
<modules>
<module>metadata-store-file</module>
<module>maven2-repository</module>
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index 69c7f3c..ad15973 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -27,6 +27,11 @@
<artifactId>problem-reports</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: Problem Reporting Plugin</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml
index 38f83fd..4fe10de 100644
--- a/archiva-modules/plugins/repository-statistics/pom.xml
+++ b/archiva-modules/plugins/repository-statistics/pom.xml
@@ -27,6 +27,11 @@
<artifactId>repository-statistics</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: Repository Statistics</name>
+
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index d8719f8..d771428 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -29,6 +29,10 @@
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: Stage Repository Merge</name>
+ <properties>
+ <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index ccbc059..5296425 100644
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -17,7 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>archiva</artifactId>
<groupId>org.apache.archiva</groupId>
@@ -30,13 +31,15 @@
<url>http://archiva.apache.org/ref/${project.version}</url>
<properties>
- <siteFilePath>${user.home}/archiva-sites/archiva-ref-${project.version}/</siteFilePath>
- <siteUrlDeployment>file://${siteFilePath}</siteUrlDeployment>
<scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
+ <!-- The git repository, where the site content is placed -->
+ <siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content-INVALID.git</siteRepositoryUrl>
+ <site.staging.base>${project.basedir}</site.staging.base>
</properties>
<modules>
<module>archiva-base</module>
+
<module>archiva-scheduler</module>
<module>archiva-web</module>
<module>archiva-karaf</module>
@@ -51,27 +54,63 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/ref/${project.version}</pubScmUrl>
- <checkinComment>Apache Archiva Versionned ref for ${project.version}</checkinComment>
+ <checkinComment>Apache Archiva versioned module docs for ${project.version}</checkinComment>
+ <skipDeletedFiles>true</skipDeletedFiles>
<content>${project.build.directory}/staging</content>
+ <tryUpdate>true</tryUpdate>
+ <!--
+ <ignorePathsToDelete>
+ <path>%regex[^(?!docs/).*$]</path>
+ </ignorePathsToDelete>
+ -->
</configuration>
+
</plugin>
+
+
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <stagingDirectory>${site.staging.base}/target/staging/refs/${project.version}/</stagingDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
</build>
<reporting>
<plugins>
-
+
+
<!-- jxr first -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${jxrVersion}</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -89,6 +128,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin.version}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
@@ -101,8 +147,7 @@
<javadocVersion>1.8</javadocVersion>
<source>1.8</source>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://docs.oracle.com/javase/8/docs/api</link>
+ <link>https://docs.oracle.com/javase/8/docs/api</link>
<link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
<link>http://commons.apache.org/dbcp/apidocs/</link>
<link>http://commons.apache.org/fileupload/apidocs/</link>
@@ -114,6 +159,7 @@
<link>http://jakarta.apache.org/regexp/apidocs/</link>
<link>http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/</link>
</links>
+
<linksource>true</linksource>
<show>private</show>
<tags>
@@ -134,6 +180,8 @@
</reportSets>
</plugin>
+
+
</plugins>
</reporting>
@@ -161,11 +209,10 @@
</profiles>
-
<distributionManagement>
<site>
<id>apache.website</id>
- <url>${siteUrlDeployment}</url>
+ <url>${siteRepositoryUrl}</url>
</site>
</distributionManagement>
</project>
[archiva] 03/04: For consistent config using inherited=false
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/site-git-migration
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit faafb6625833ac96d7c38b55ddc64eaad76d977d
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Nov 4 15:30:17 2018 +0100
For consistent config using inherited=false
---
archiva-docs/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index f7d70cf..1672a6a 100644
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -196,6 +196,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
+ <inherited>false</inherited>
<executions>
<execution>
<id>prepare-checkout</id>