[MASSEMBLY-974] Drop deprecated repository element from model and tests
Code was removed in 6c7b43c4e5a96bef884131e87b00942e5cd901dc
diff --git a/pom.xml b/pom.xml
index b436316..8d61c06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,7 +407,6 @@
<pomInclude>projects/reproducible/pom.xml</pomInclude>
</pomIncludes>
<pomExcludes>
- <pomExclude>projects/repositories/repo-with-snapshot-parents/pom.xml</pomExclude>
<pomExclude>projects/dependency-sets/depSet-transFromProfile/pom.xml</pomExclude>
</pomExcludes>
</configuration>
diff --git a/src/functional-tests/resources/assemblies/MASSEMBLY-98.xml b/src/functional-tests/resources/assemblies/MASSEMBLY-98.xml
deleted file mode 100644
index 3fd6194..0000000
--- a/src/functional-tests/resources/assemblies/MASSEMBLY-98.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- </groupVersionAlignment>
- <groupVersionAlignment>
- <id>assembly2</id>
- <version>1.0</version>
- <excludes>
- <exclude>dependency-artifact</exclude>
- </excludes>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-excludes.xml b/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-excludes.xml
deleted file mode 100644
index e4ed624..0000000
--- a/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-excludes.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- <excludes>
- <exclude>dependency-artifact</exclude>
- </excludes>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-includes.xml b/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-includes.xml
deleted file mode 100644
index ffc5830..0000000
--- a/src/functional-tests/resources/assemblies/repository-groupVersionAlignment-includes.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- <includes>
- <include>dependency-artifact</include>
- </includes>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/src/functional-tests/resources/assemblies/repository-groupVersionAlignment.xml b/src/functional-tests/resources/assemblies/repository-groupVersionAlignment.xml
deleted file mode 100644
index cd31fc1..0000000
--- a/src/functional-tests/resources/assemblies/repository-groupVersionAlignment.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <groupVersionAlignments>
- <groupVersionAlignment>
- <id>assembly</id>
- <version>1.1</version>
- </groupVersionAlignment>
- </groupVersionAlignments>
- </repository>
- </repositories>
-</assembly>
diff --git a/src/functional-tests/resources/assemblies/repository-with-metadata.xml b/src/functional-tests/resources/assemblies/repository-with-metadata.xml
deleted file mode 100644
index b817abe..0000000
--- a/src/functional-tests/resources/assemblies/repository-with-metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- <includeMetadata>true</includeMetadata>
- </repository>
- </repositories>
-</assembly>
diff --git a/src/functional-tests/resources/assemblies/repository.xml b/src/functional-tests/resources/assemblies/repository.xml
deleted file mode 100644
index c63e196..0000000
--- a/src/functional-tests/resources/assemblies/repository.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>repositories</id>
- <formats>
- <format>zip</format>
- </formats>
- <repositories>
- <repository>
- <outputDirectory>repository</outputDirectory>
- </repository>
- </repositories>
-</assembly>
diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo
index 07a6fbb..0499f1b 100644
--- a/src/main/mdo/assembly-component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -117,22 +117,6 @@
</description>
</field>
<field>
- <name>repositories</name>
- <version>1.1.0/2.1.1</version>
- <association>
- <type>Repository</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- <b>Deprecated since model version 2.1.1</b>.
- Specifies a set of repositories to include in the assembly. A
- repository is specified by providing one or more of
- <repository> subelements.
- ]]>
- </description>
- </field>
- <field>
<name>containerDescriptorHandlers</name>
<version>1.1.0+</version>
<association>
@@ -1024,190 +1008,6 @@
</class>
<class>
- <name>Repository</name>
- <version>1.0.0/2.1.1</version>
- <description>
- <![CDATA[
- <b>Deprecated since model version 2.1.1</b>.
- Defines a Maven repository to be included in the assembly. The artifacts
- available to be included in a repository are your project's dependency
- artifacts. The repository created contains the needed metadata entries
- and also contains both sha1 and md5 checksums. This is useful for creating
- archives which will be deployed to internal repositories.
-
- <p><b>NOTE:</b> Currently, only artifacts from the central repository
- are allowed.</p>
- ]]>
- </description>
- <fields>
- <field>
- <name>outputDirectory</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- Sets the output directory relative to the root
- of the root directory of the assembly. For example,
- "log" will put the specified files in the log directory,
- directly beneath the root of the archive.
- </description>
- </field>
- <field>
- <name>includes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <include> subelements are present, they define a set of
- artifact coordinates to include. If none is present, then
- <includes> represents all valid values.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define a set of
- dependency artifact coordinates to exclude. If none is present, then
- <excludes> represents no exclusions.
-
- Artifact coordinates may be given in simple groupId:artifactId form,
- or they may be fully qualified in the form groupId:artifactId:type[:classifier]:version.
- Additionally, wildcards can be used, as in *:maven-*
- ]]>
- </description>
- </field>
- <field>
- <name>fileMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0644</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the file mode of the files included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of Read = 4,
- Write = 2, and Execute = 1. For example, the value 0644
- translates to User read-write, Group and Other read-only. The default value is 0644.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>directoryMode</name>
- <version>1.0.0+</version>
- <type>String</type>
- <!--
- <defaultValue>0755</defaultValue>
- -->
- <description>
- <![CDATA[
- Similar to a UNIX permission, sets the directory mode of the directories
- included.
- THIS IS AN OCTAL VALUE.
- Format: (User)(Group)(Other) where each component is a sum of
- Read = 4, Write = 2, and Execute = 1. For example, the value
- 0755 translates to User read-write, Group and Other read-only. The default value is 0755.
- <a href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html">(more on unix-style permissions)</a>
- ]]>
- </description>
- </field>
- <field>
- <name>includeMetadata</name>
- <version>1.0.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- If set to true, this property will trigger the creation of repository
- metadata which will allow the repository to be used as a functional remote
- repository. Default value is false.
- </description>
- </field>
- <field>
- <name>groupVersionAlignments</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- Specifies that you want to align a group of artifacts to a specified
- version. A groupVersionAlignment is specified by providing one or
- more of <groupVersionAlignment> subelements.
- ]]>
- </description>
- <association>
- <type>GroupVersionAlignment</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>scope</name>
- <version>1.1.0+</version>
- <type>String</type>
- <defaultValue>runtime</defaultValue>
- <required>true</required>
- <description>
- Specifies the scope for artifacts included in this repository.
- Default scope value is "runtime". (Since 2.2)
- </description>
- </field>
- </fields>
- </class>
- <class>
- <name>GroupVersionAlignment</name>
- <version>1.0.0+</version>
- <description>
- Allows a group of artifacts to be aligned to a specified version.
- </description>
- <fields>
- <field>
- <name>id</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The groupId of the artifacts for which you want to align the
- versions.
- </description>
- </field>
- <field>
- <name>version</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The version you want to align this group to.
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define the
- artifactIds of the artifacts to exclude. If none is present, then
- <excludes> represents no exclusions. An exclude is specified
- by providing one or more of <exclude> subelements.
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- </fields>
- </class>
- <class>
<name>UnpackOptions</name>
<version>1.1.0+</version>
<description>
diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo
index 8ffd761..1e0790a 100644
--- a/src/main/mdo/assembly.mdo
+++ b/src/main/mdo/assembly.mdo
@@ -1122,48 +1122,6 @@
</class>
<class>
- <name>GroupVersionAlignment</name>
- <version>1.0.0+</version>
- <description>
- Allows a group of artifacts to be aligned to a specified version.
- </description>
- <fields>
- <field>
- <name>id</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The groupId of the artifacts for which you want to align the
- versions.
- </description>
- </field>
- <field>
- <name>version</name>
- <version>1.0.0+</version>
- <type>String</type>
- <description>
- The version you want to align this group to.
- </description>
- </field>
- <field>
- <name>excludes</name>
- <version>1.0.0+</version>
- <description>
- <![CDATA[
- When <exclude> subelements are present, they define the
- artifactIds of the artifacts to exclude. If none is present, then
- <excludes> represents no exclusions. An exclude is specified
- by providing one or more of <exclude> subelements.
- ]]>
- </description>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- </fields>
- </class>
- <class>
<name>UnpackOptions</name>
<version>1.1.0+</version>
<description>
