From: skygo <skygo@unknown>
Date: Wed, 22 Aug 2012 20:54:23 +0000 (+0000)
Subject: remove some deprecation in mdo file and antrun target
X-Git-Tag: archiva-1.4-M3~386
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d6401718615637ba7ac5a2aca1af716e2e03db85;p=archiva.git

remove some deprecation in mdo file and antrun target

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1376232 13f79535-47bb-0310-9956-ffa450edef68
---

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 b47ad1015..3dc20787e 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
@@ -42,7 +42,7 @@
           <required>true</required>
           <description>This is the version of the configuration format.</description>
         </field>
-        <field java.adder="false">
+        <field>
           <description>
  @deprecated use managedRepositories or remoteRepositories instead.
           </description>
@@ -50,8 +50,7 @@
           <version>1.0.0+</version>
           <association java.generate-add="false"
                        java.generate-remove="false"
-                       java.generate-break="false"
-                       java.generate-create="false">
+                       java.adder="false">
             <type>V1RepositoryConfiguration</type>
             <multiplicity>*</multiplicity>
           </association>
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
index 71bcd79cc..62918f734 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
+++ b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
@@ -19,7 +19,7 @@
   -->
 
 <model xsd.namespace="http://archiva.apache.org/model/1.2.0"
-       xsd.target-namespace="http://archiva.apache.org/model/1.2.0">
+       xsd.targetNamespace="http://archiva.apache.org/model/1.2.0">
   <id>archiva-base-model</id>
   <name>ArchivaBaseModel</name>
   <!-- Note that we've outright removed old model information instead of setting the finish version to be 1.2.1.
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 4bc65784e..a95fb6670 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -933,9 +933,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}/appserver-base/conf"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>