diff options
| author | skygo <skygo@unknown> | 2012-08-22 20:54:23 +0000 |
|---|---|---|
| committer | skygo <skygo@unknown> | 2012-08-22 20:54:23 +0000 |
| commit | d6401718615637ba7ac5a2aca1af716e2e03db85 (patch) | |
| tree | df866920560cf07734681a589f9bb6e82fcc405b | |
| parent | 3f34a790541955775820112fcfd8fa71f280cc2f (diff) | |
| download | archiva-d6401718615637ba7ac5a2aca1af716e2e03db85.tar.gz archiva-d6401718615637ba7ac5a2aca1af716e2e03db85.zip | |
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
3 files changed, 5 insertions, 6 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 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> |