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 b47ad1015e93744367a0b3d0021c78dbfbde9ce6..3dc20787e17e8eb09d330c125ed7aee01105b514 100644 (file)
--- 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 71bcd79cc7fd48b27de0ed9e03115c23ea03b616..62918f734c8cb395618ed707de6046eccb6b78f5 100644 (file)
--- 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 4bc65784e58cea7339439a03fda7ba00ebcce482..a95fb6670420ddd400e9b3e08d015fc54a092614 100644 (file)
--- 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>