Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging publish changes from 'feature/site-git-migration'

This commit is contained in:
Martin Stockhammer 2018-12-11 21:03:24 +01:00
parent 76c17e2cea 92626def5a
commit ee00a556ec
84 changed files with 1104 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-docs/README
View File

@ -1 +0,0 @@
to deploy site: sh ./deploySite.sh

81
archiva-docs/README.adoc Normal file
View File

@ -0,0 +1,81 @@
Archiva Documentation - User Documentation
===========================================
:toc:
== How to build and publish the pages for the archiva web content
This module and the children contain web content and project reports that can be published to the
archiva web site: https://archiva.apache.org
The web content parts of this module and submodules are published to the path
/docs/${project.version}/
=== Use the script
There is a shell script +deploySite.sh+ which you can run to generate the site check and publish to
the remote repository. It works only on Linux, on other platforms you have to go the next section.
The script is interactive, it asks you to confirm the publish after generation of the staging part.
.Execute
./deploySite.sh
All arguments are appended to the mvn calls.
=== Run the mvn steps manually
==== Building the pages
You need enough free disk space to publish the web content. The archiva web site repository is big,
but the maven build will only checkout the necessary directories for this build (sparse checkout).
For all the commands you have to change to this archiva-modules directory:
cd archiva/archiva-modules
.The following creates the site to the staging folder
mvn clean site site:stage
The result can be checked in
archiva-modules/target/staging/ref/${project.version}
with your browser.
If you would like the use a local checkout of the archiva-web-content.git repository and not push directly
to the remote repository, you may add this parameter:
-DsiteRepositoryUrl=scm:git:file:///${path-to-your-local-archiva}/archiva-web-content.git
where +${path-to-your-local-archiva}+ is the path where a bare clone of the archiva-web-content.git is stored.
NOTE: You cannot use +mvn site:run+ because this will place the submodules into the same folder and
overwrite each other.
==== Publish the pages
.This command publishes to the git repository
mvn scm-publish:publish-scm
After publishing to the git repository the gitpubsub mechanism is transferring it to the HTTP server.
If you would like the use a local checkout of the archiva-web-content.git repository and not push directly
to the remote repository, you may add this parameter:
-DsiteRepositoryUrl=scm:git:file:///${path-to-your-local-archiva}/archiva-web-content.git
=== Some notes about the build process
A sparse checkout of the git repository will be created in
.site-content
but only, if the directory +.site-content/.git+ does not exist.

135
archiva-docs/checkoutSite.sh Executable file
View 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}"

61
archiva-docs/deploySite.sh Executable file
View File

@ -0,0 +1,61 @@
#!/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-15
#
# Publishes the site content and generated reports to the web content repository.
# It stops after the staging and let you check the content before pushing to the repository
#
THIS_DIR=$(dirname $0)
THIS_DIR=$(readlink -f ${THIS_DIR})
CONTENT_DIR=".site-content"
PROJECT_VERSION=$(grep '<version>' pom.xml |head -1 | sed -e 's/.*<version>\(.*\)<\/version>.*/\1/g')
SUB_DIR="docs/${PROJECT_VERSION}"
if [ -d "${CONTENT_DIR}/.git" ]; then
git -C "${CONTENT_DIR}" fetch origin
git -C "${CONTENT_DIR}" reset --hard origin/master
fi
echo ">>>> Creating site and reports <<<<"
mvn clean site site:stage "$@"
echo "*****************************************"
echo ">>>> Finished the site stage process <<<<"
echo "> You can check the content in the folder target/staging or by opening the following url"
echo "> file://${THIS_DIR}/target/staging/${SUB_DIR}/index.html"
echo "> "
echo "> If everything is fine enter yes. After that the publish process will be started."
echo -n "Do you want to publish (yes/no)? "
read ANSWER
if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" ]; then
echo "> Starting publish process"
mvn scm-publish:publish-scm "$@"
else
echo "> Aborting now"
echo "> Running git reset in .site-content directory"
git -C "${CONTENT_DIR}" fetch origin
git -C "${CONTENT_DIR}" reset --hard origin/master
echo ">>>> Finished <<<<"
fi

1
archiva-docs/git-sparse-checkout-pattern Normal file
View File

@ -0,0 +1 @@
/docs

75
archiva-docs/pom.xml
View File

@ -27,13 +27,15 @@
<artifactId>archiva-docs</artifactId>
<packaging>pom</packaging>
<name>Archiva :: Documentation</name>
<url>http://archiva.apache.org/docs/${project.version}/</url>
<url>https://archiva.apache.org/docs/${project.version}/</url>
<properties>
<siteFilePath>${user.home}/archiva-sites/archiva-docs-${project.version}/</siteFilePath>
<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.git</siteRepositoryUrl>
<scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
</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>
@ -143,8 +161,8 @@
<reportSets>
<reportSet>
<reports>
<report>license</report>
<report>project-team</report>
<report>licenses</report>
<report>team</report>
</reports>
</reportSet>
</reportSets>
@ -155,8 +173,53 @@
<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>
<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>
</project>

BIN
archiva-docs/src/site/resources/images/Archiva-Site-Publish.odg Normal file
View File

Binary file not shown.

BIN
archiva-docs/src/site/resources/images/Archiva-Site-Publish.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 161 KiB

12
archiva-docs/src/site/site.xml
View File

@ -48,8 +48,13 @@
</twitter>
<ohloh>
<projectId>6670</projectId>
<widget>stats</widget>
<widget>thin-badge</widget>
</ohloh>
<gitHub>
<projectId>apache/archiva</projectId>
<ribbonOrientation>right</ribbonOrientation>
<ribbonColor>black</ribbonColor>
</gitHub>
</fluidoSkin>
</custom>
@ -58,8 +63,11 @@
<version position="right" />
<body>
<breadcrumbs>
<item name="Apache Archiva" href="http://archiva.apache.org/index.html"/>
<item name="Apache" href="https://www.apache.org" />
<item name="Archiva" href="https://archiva.apache.org" />
<item name="Archiva Documentation" href="index.html" />
</breadcrumbs>
<menu name="Introduction">

81
archiva-modules/README.adoc Normal file
View File

@ -0,0 +1,81 @@
Archiva Modules - Collection of Archiva Subprojects
===================================================
:toc:
== How to build and publish the pages for the archiva web content
This module and the children contain web content and project reports that can be published to the
archiva web site: https://archiva.apache.org
The web content parts of this module and submodules are published to the path
/ref/${project.version}/
=== Use the script
There is a shell script +deploySite.sh+ which you can run to generate the site check and publish to
the remote repository. It works only on Linux, on other platforms you have to go the next section.
The script is interactive, it asks you to confirm the publish after generation of the staging part.
.Execute
./deploySite.sh
All arguments are appended to the mvn calls.
=== Run the mvn steps manually
==== Building the pages
You need enough free disk space to publish the web content. The archiva web site repository is big,
but the maven build will only checkout the necessary directories for this build (sparse checkout).
For all the commands you have to change to this archiva-modules directory:
cd archiva/archiva-modules
.The following creates the site to the staging folder
mvn clean site site:stage
The result can be checked in
archiva-modules/target/staging/ref/${project.version}
with your browser.
If you would like the use a local checkout of the archiva-web-content.git repository and not push directly
to the remote repository, you may add this parameter:
-DsiteRepositoryUrl=scm:git:file:///${path-to-your-local-archiva}/archiva-web-content.git
where +${path-to-your-local-archiva}+ is the path where a bare clone of the archiva-web-content.git is stored.
NOTE: You cannot use +mvn site:run+ because this will place the submodules into the same folder and
overwrite each other.
==== Publish the pages
.This command publishes to the git repository
mvn scm-publish:publish-scm
After publishing to the git repository the gitpubsub mechanism is transferring it to the HTTP server.
If you would like the use a local checkout of the archiva-web-content.git repository and not push directly
to the remote repository, you may add this parameter:
-DsiteRepositoryUrl=scm:git:file:///${path-to-your-local-archiva}/archiva-web-content.git
=== Some notes about the build process
A sparse checkout of the git repository will be created in
.site-content
but only, if the directory +.site-content/.git+ does not exist.

4
archiva-modules/archiva-base/archiva-checksum/pom.xml
View File

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

6
archiva-modules/archiva-base/archiva-common/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-configuration/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
View File

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

2
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
View File

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

6
archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
View File

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

4
archiva-modules/archiva-base/archiva-consumers/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-converter/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-filelock/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
View File

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

4
archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-maven2-model/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-mock/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-model/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-policies/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-proxy-api/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-proxy-common/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-repository-admin/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-repository-api/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-repository-layer/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-security-common/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-test-utils/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-transaction/pom.xml
View File

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

5
archiva-modules/archiva-base/archiva-xml-tools/pom.xml
View File

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

3
archiva-modules/archiva-base/pom.xml
View File

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

2
archiva-modules/archiva-karaf/archiva-features/pom.xml
View File

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

5
archiva-modules/archiva-karaf/pom.xml
View File

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

5
archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
View File

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

5
archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
View File

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

4
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
View File

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

5
archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
View File

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

5
archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
View File

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

5
archiva-modules/archiva-scheduler/pom.xml
View File

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

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
View File

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

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

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

23
archiva-modules/archiva-web/archiva-rest/pom.xml
View File

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

5
archiva-modules/archiva-web/archiva-rss/pom.xml
View File

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

4
archiva-modules/archiva-web/archiva-security/pom.xml
View File

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

3
archiva-modules/archiva-web/archiva-test-mocks/pom.xml
View File

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

1
archiva-modules/archiva-web/archiva-web-common/pom.xml
View File

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

2
archiva-modules/archiva-web/archiva-webapp-test/pom.xml
View File

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

1
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

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

2
archiva-modules/archiva-web/archiva-webdav/pom.xml
View File

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

4
archiva-modules/archiva-web/pom.xml
View File

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

62
archiva-modules/deploySite.sh Normal file → Executable file
View File

@ -1 +1,61 @@
mvn clean site site:stage -Preporting scm-publish:publish-scm $@
#!/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-15
#
# Publishes the site content and generated reports to the web content repository.
# It stops after the staging and let you check the content before pushing to the repository
#
THIS_DIR=$(dirname $0)
THIS_DIR=$(readlink -f ${THIS_DIR})
CONTENT_DIR=".site-content"
PROJECT_VERSION=$(grep '<version>' pom.xml |head -1 | sed -e 's/.*<version>\(.*\)<\/version>.*/\1/g')
SUB_DIR="ref/${PROJECT_VERSION}"
if [ -d "${CONTENT_DIR}/.git" ]; then
git -C "${CONTENT_DIR}" fetch origin
git -C "${CONTENT_DIR}" reset --hard origin/master
fi
echo ">>>> Creating site and reports <<<<"
mvn clean site site:stage -Preporting "$@"
echo "*****************************************"
echo ">>>> Finished the site stage process <<<<"
echo "> You can check the content in the folder target/staging or by opening the following url"
echo "> file://${THIS_DIR}/target/staging/${SUB_DIR}/index.html"
echo "> "
echo "> If everything is fine enter yes. After that the publish process will be started."
echo -n "Do you want to publish (yes/no)? "
read ANSWER
if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" ]; then
echo "> Starting publish process"
mvn scm-publish:publish-scm "$@"
else
echo "> Aborting now"
echo "> Running git reset in .site-content directory"
git -C "${CONTENT_DIR}" fetch origin
git -C "${CONTENT_DIR}" reset --hard origin/master
echo ">>>> Finished <<<<"
fi

1
archiva-modules/git-sparse-checkout-pattern Normal file
View File

@ -0,0 +1 @@
/ref

4
archiva-modules/metadata/metadata-model-maven2/pom.xml
View File

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

4
archiva-modules/metadata/metadata-model/pom.xml
View File

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

5
archiva-modules/metadata/metadata-repository-api/pom.xml
View File

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

5
archiva-modules/metadata/metadata-statistics-api/pom.xml
View File

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

5
archiva-modules/metadata/pom.xml
View File

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

5
archiva-modules/metadata/test-repository/pom.xml
View File

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

5
archiva-modules/plugins/audit/pom.xml
View File

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

5
archiva-modules/plugins/generic-metadata-support/pom.xml
View File

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

5
archiva-modules/plugins/maven2-repository/pom.xml
View File

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

3
archiva-modules/plugins/metadata-store-cassandra/pom.xml
View File

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

5
archiva-modules/plugins/metadata-store-file/pom.xml
View File

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

5
archiva-modules/plugins/metadata-store-jcr/pom.xml
View File

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

5
archiva-modules/plugins/pom.xml
View File

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

5
archiva-modules/plugins/problem-reports/pom.xml
View File

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

5
archiva-modules/plugins/repository-statistics/pom.xml
View File

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

4
archiva-modules/plugins/stage-repository-merge/pom.xml
View File

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

157
archiva-modules/pom.xml
View File

@ -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>
@ -27,16 +28,18 @@
<artifactId>archiva-modules</artifactId>
<packaging>pom</packaging>
<name>Archiva :: Modules</name>
<url>http://archiva.apache.org/ref/${project.version}</url>
<url>https://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.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>
@ -49,29 +52,99 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<artifactId>maven-site-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>
<content>${project.build.directory}/staging</content>
<skipDeploy>true</skipDeploy>
</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>
<skipDeploy>true</skipDeploy>
<stagingDirectory>${site.staging.base}/target/staging/ref/${project.version}/</stagingDirectory>
</configuration>
<executions>
<execution>
<id>attach-descriptor</id>
<goals>
<goal>attach-descriptor</goal>
</goals>
</execution>
<!-- <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>
<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 +162,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>
@ -100,9 +180,9 @@
<notimestamp>true</notimestamp>
<javadocVersion>1.8</javadocVersion>
<source>1.8</source>
<doclint>none</doclint>
<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 +194,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 +215,8 @@
</reportSets>
</plugin>
</plugins>
</reporting>
@ -158,14 +241,56 @@
</plugins>
</reporting>
</profile>
</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>
<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>
<distributionManagement>
<site>
<id>apache.website</id>
<url>${siteUrlDeployment}</url>
<url>${siteRepositoryUrl}</url>
</site>
</distributionManagement>
</project>

17
archiva-modules/src/site/site.xml
View File

@ -35,16 +35,25 @@
</twitter>
<ohloh>
<projectId>6670</projectId>
<widget>stats</widget>
<widget>thin-badge</widget>
</ohloh>
<gitHub>
<projectId>apache/archiva</projectId>
<ribbonOrientation>right</ribbonOrientation>
<ribbonColor>black</ribbonColor>
</gitHub>
</fluidoSkin>
</custom>
<publishDate format="yyyy-MM-dd" position="right" />
<version position="right" />
<body>
<breadcrumbs>
<!-- TODO: need to stop them inheriting
<item name="Reports" href="/reports" />
-->
<item name="Apache" href="https://www.apache.org" />
<item name="Archiva" href="https://archiva.apache.org" />
<item name="Archiva Modules" href="index.html" />
</breadcrumbs>
<menu name="Developers">

2
pom.xml
View File

@ -31,7 +31,7 @@
<packaging>pom</packaging>
<name>Apache Archiva</name>
<url>http://archiva.apache.org</url>
<url>https://archiva.apache.org</url>
<modules>
<module>archiva-cli</module>