Browse Source

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
tags/archiva-1.4-M3
skygo 11 years ago
parent
commit
d640171861

+ 2
- 3
archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo View File

@@ -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>

+ 1
- 1
archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml View File

@@ -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.

+ 2
- 2
archiva-modules/archiva-web/archiva-webapp-js/pom.xml View File

@@ -933,9 +933,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${project.build.directory}/appserver-base/conf"/>
</tasks>
</target>
</configuration>
</execution>
</executions>

Loading…
Cancel
Save