diff options
author | Martin Stockhammer <martin_s@apache.org> | 2018-11-04 13:34:47 +0100 |
---|---|---|
committer | Martin Stockhammer <martin_s@apache.org> | 2018-11-04 13:34:47 +0100 |
commit | 586f3c3c2bcab707d1a5d3a43aa409dcee129393 (patch) | |
tree | 64b58ce6e0a70659580feeaf7274e9aa2b7f906e /archiva-modules | |
parent | d29ac49e8068689b5f8458f7886167d9e8fa179c (diff) | |
download | archiva-586f3c3c2bcab707d1a5d3a43aa409dcee129393.tar.gz archiva-586f3c3c2bcab707d1a5d3a43aa409dcee129393.zip |
Adding archiva-modules site build changes for git migration
Diffstat (limited to 'archiva-modules')
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 8f5ab0b0b..95a20f4b5 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 a81e4c625..e0458d407 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 044310f6c..11d2270e4 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 abe893b9c..deb832d49 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 628ec47ab..384780614 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 b0cfb03e9..4f2e3a082 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 8cee773b8..24e3e9b12 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 099d2b83c..b56bf1b05 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 88ffcaf20..d1c715f65 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 f4cfc9053..9ac6aef0c 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 e952313b2..8186e6be5 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 5829da297..c8891194f 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 b68dacb8e..1cc6b0f2e 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 84edf97a6..fbf7f1efb 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 0198eb4ca..2a3a01506 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 229eab4ff..8af55e217 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 071268cd1..49bb61dad 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 4eb1eacf5..eaee92067 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 7da80fca6..267c001ea 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 f0d8ab086..15e70cb4f 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 c22109ce7..733c599a3 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 23c0e6c3b..a27897df6 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 33ee7b130..c912c182c 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 5e99f6d9b..b752f2810 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 f7047344c..9d4865a62 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 168426c13..6aa2d7676 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 e9d60bdfb..1af1ab065 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 7b76e7b74..7136844d7 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 00823b572..f9ebb9e9e 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 bde3e5cc7..0c81176ff 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 4c3ba0231..a9eee95f9 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 190beb869..f962aed3f 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 54bd4aa8e..4b20b63d1 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 aadfb3677..3223f88d1 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 ff50a8dd0..167e825f9 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 38b1af312..1dd81b4ec 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 b55a4213c..b919145c6 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 26825f43e..a56a57fc3 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 3ff1e109e..46bdc4749 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 0d1265526..4dbe2afb9 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 94f71773a..89d5e7929 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 cdbae6562..ccbbd37a4 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 97270b0a5..3b515e479 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 f1f4a594f..3f096d961 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 f1677129b..96046a4cf 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 673facf7e..e6fe99ff7 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 b25a684a1..845cb19c6 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 a7765ec0d..3d70a4824 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 913229f58..5b7d47fee 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 73033120c..3fd8427a2 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 931b2f9f6..4252ef068 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 0df3ad6f2..c55c6f80f 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 000000000..5e582bd1e --- /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 <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}" + diff --git a/archiva-modules/git-sparse-checkout-pattern b/archiva-modules/git-sparse-checkout-pattern new file mode 100644 index 000000000..d1e3efa3e --- /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 ad10ffbcb..1bb4a8a1a 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 3ddf05645..399198ecd 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 5cc507898..290f6f67b 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 251f2a729..61bbfbf23 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 1c1ba6978..b86b8751a 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 7313a1c8a..1ebe3003a 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 cf37c0d6f..be0268318 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 64120b412..68bd5cd17 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 8d5a04c2a..270dd7e18 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 e1650b127..3f2cafe65 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 2fcf7eb41..4e85c63ff 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 a7df77f7b..114bcb7dc 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 039d7e14c..e8242b392 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 69c7f3c1c..ad15973c0 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 38f83fdc9..4fe10de2e 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 d8719f8e6..d77142822 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 ccbc0594d..529642506 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> |