1
0
mirror of https://github.com/apache/archiva.git synced 2025-02-13 13:36:15 +00:00

Adding archiva-modules site build changes for git migration

This commit is contained in:
Martin Stockhammer 2018-11-04 13:34:47 +01:00
parent d29ac49e80
commit 586f3c3c2b
71 changed files with 510 additions and 16 deletions
archiva-modules
archiva-base
archiva-checksum
archiva-common
archiva-configuration
archiva-consumers
archiva-consumer-api
archiva-consumer-archetype
archiva-core-consumers
archiva-lucene-consumers
archiva-metadata-consumer
archiva-signature-consumers
pom.xml
archiva-converter
archiva-filelock
archiva-maven2-indexer
archiva-maven2-metadata
archiva-maven2-model
archiva-mock
archiva-model
archiva-plexus-bridge
archiva-policies
archiva-proxy-api
archiva-proxy-common
archiva-proxy
archiva-repository-admin
archiva-repository-admin-api
archiva-repository-admin-default
pom.xml
archiva-repository-api
archiva-repository-layer
archiva-repository-scanner
archiva-security-common
archiva-test-utils
archiva-transaction
archiva-xml-tools
pom.xml
archiva-karaf
archiva-features
pom.xml
archiva-scheduler
archiva-scheduler-api
archiva-scheduler-indexing-maven2
archiva-scheduler-indexing
archiva-scheduler-repository-api
archiva-scheduler-repository
pom.xml
archiva-web
archiva-rest
archiva-rest-api
archiva-rest-services
pom.xml
archiva-rss
archiva-security
archiva-test-mocks
archiva-web-common
archiva-webapp-test
archiva-webapp
archiva-webdav
pom.xml
checkoutSite.shgit-sparse-checkout-pattern
metadata
metadata-model-maven2
metadata-model
metadata-repository-api
metadata-statistics-api
pom.xml
test-repository
plugins
audit
generic-metadata-support
maven2-repository
metadata-store-cassandra
metadata-store-file
metadata-store-jcr
pom.xml
problem-reports
repository-statistics
stage-repository-merge
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>

@ -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.

@ -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>

@ -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>

@ -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

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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> -->

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

135
archiva-modules/checkoutSite.sh Executable file

@ -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 <martin_s@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}"

@ -0,0 +1 @@
/refs

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>