summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-configuration
diff options
context:
space:
mode:
authorMaria Odea B. Ching <oching@apache.org>2009-11-22 09:28:36 +0000
committerMaria Odea B. Ching <oching@apache.org>2009-11-22 09:28:36 +0000
commit614a6c1e2f8a76abee98381a3fcf03900bcb9149 (patch)
tree0634349b971986508af64ab34ed63ab8ae374142 /archiva-modules/archiva-base/archiva-configuration
parent07080653194785b6fddce0e2b088938aeaeed114 (diff)
downloadarchiva-614a6c1e2f8a76abee98381a3fcf03900bcb9149.tar.gz
archiva-614a6c1e2f8a76abee98381a3fcf03900bcb9149.zip
[MRM-747] Archiva should prevent re-deployment of released or non-snapshot versioned artifacts
o make blocking of re-dployments configurable per repository o added test git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@883051 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-configuration')
-rw-r--r--archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo7
-rw-r--r--archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml2
2 files changed, 9 insertions, 0 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index 1af52dd63..0187601c2 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -476,6 +476,13 @@
<defaultValue>true</defaultValue>
</field>
<field>
+ <name>blockRedeployments</name>
+ <version>1.0.0+</version>
+ <type>boolean</type>
+ <description>True if re-deployment of artifacts already in the repository will be blocked.</description>
+ <defaultValue>false</defaultValue>
+ </field>
+ <field>
<name>snapshots</name>
<version>1.0.0+</version>
<type>boolean</type>
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
index 12473f3f1..51b54f82f 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
@@ -9,6 +9,7 @@
<layout>default</layout>
<releases>true</releases>
<snapshots>false</snapshots>
+ <blockRedeployments>true</blockRedeployments>
<scanned>true</scanned>
<refreshCronExpression>0 0 * * * ?</refreshCronExpression>
<daysOlder>30</daysOlder>
@@ -20,6 +21,7 @@
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
+ <blockRedeployments>false</blockRedeployments>
<scanned>true</scanned>
<refreshCronExpression>0 0\,30 * * * ?</refreshCronExpression>
<daysOlder>30</daysOlder>