You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/05/10 22:44:27 UTC
[maven-assembly-plugin] branch MASSEMBLY-974-component created (now 6104fc56)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MASSEMBLY-974-component
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
at 6104fc56 [MASSEMBLY-974] Drop deprecated repository element from model and tests
This branch includes the following new commits:
new 6104fc56 [MASSEMBLY-974] Drop deprecated repository element from model and tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-assembly-plugin] 01/01: [MASSEMBLY-974] Drop deprecated repository element from model and tests
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MASSEMBLY-974-component
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 6104fc569443999b42dc5c05958100e523ad5f92
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu May 11 00:33:56 2023 +0200
[MASSEMBLY-974] Drop deprecated repository element from model and tests
Code was removed in 6c7b43c4e5a96bef884131e87b00942e5cd901dc
---
pom.xml | 1 -
.../resources/assemblies/MASSEMBLY-98.xml | 42 -----
.../repository-groupVersionAlignment-excludes.xml | 38 ----
.../repository-groupVersionAlignment-includes.xml | 38 ----
.../repository-groupVersionAlignment.xml | 35 ----
.../assemblies/repository-with-metadata.xml | 30 ----
.../resources/assemblies/repository.xml | 29 ---
src/main/mdo/assembly-component.mdo | 200 ---------------------
src/main/mdo/assembly.mdo | 42 -----
9 files changed, 455 deletions(-)
diff --git a/pom.xml b/pom.xml
index de27fd75..99d61e93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,7 +407,6 @@ under the License.
<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 3fd61944..00000000
--- 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 e4ed6247..00000000
--- 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 ffc58308..00000000
--- 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 cd31fc1d..00000000
--- 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 b817abe3..00000000
--- 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 c63e1964..00000000
--- 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 07a6fbbe..0499f1b5 100644
--- a/src/main/mdo/assembly-component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -116,22 +116,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>
@@ -1023,190 +1007,6 @@
</fields>
</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>
diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo
index 8ffd761d..1e0790ab 100644
--- a/src/main/mdo/assembly.mdo
+++ b/src/main/mdo/assembly.mdo
@@ -1121,48 +1121,6 @@
</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>