You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/05/18 09:50:03 UTC
[maven-assembly-plugin] 01/01: [MASSEMBLY-957] Deprecate repository element
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MASSEMBLY-957-deprecate-repo-elem
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 88a5a44287ad5914c398831cd0d869a989bbd19c
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed May 18 11:48:50 2022 +0200
[MASSEMBLY-957] Deprecate repository element
We have to deprecate ancient repository element in descriptor,
as it was done for Maven 2.0 (present since 1.0 version of this
plugin), but since Maven 3.0 things changed quite a lot.
---
pom.xml | 10 +++++-----
.../assembly/archive/phase/RepositoryAssemblyPhase.java | 6 ++++++
src/main/mdo/assembly-component.mdo | 6 ++++--
src/main/mdo/assembly.mdo | 6 ++++--
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 487db1a9..24ca9411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ under the License.
<properties>
<javaVersion>7</javaVersion>
- <mdoVersion>2.1.0</mdoVersion>
+ <mdoVersion>2.1.1</mdoVersion>
<mavenVersion>3.2.5</mavenVersion>
<slf4jVersion>1.7.5</slf4jVersion>
@@ -179,10 +179,10 @@ under the License.
<version>4.2.1</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- </dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
index 639a3eb4..cf107b02 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
@@ -74,6 +74,12 @@ public class RepositoryAssemblyPhase implements AssemblyArchiverPhase, PhaseOrde
final AssemblerConfigurationSource configSource )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
+ LOGGER.warn( "" );
+ LOGGER.warn( "The <repository> element in assembly descriptor is deprecated," );
+ LOGGER.warn( "support for it will be removed. For details see:" );
+ LOGGER.warn( "https://issues.apache.org/jira/browse/MASSEMBLY-957" );
+ LOGGER.warn( "" );
+
final List<Repository> repositoriesList = assembly.getRepositories();
final File tempRoot = configSource.getTemporaryRootDirectory();
diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo
index 792bcc91..4ba873c2 100644
--- a/src/main/mdo/assembly-component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -21,8 +21,8 @@
Modello currently does not have capability to share files
-->
-<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.8.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.8.0.xsd"
+<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
xml.namespace="http://maven.apache.org/ASSEMBLY-COMPONENT/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/assembly-component-${version}.xsd">
@@ -125,6 +125,7 @@
</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.
@@ -1027,6 +1028,7 @@
<version>1.0.0+</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
diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo
index 84d39aa3..225f1b1a 100644
--- a/src/main/mdo/assembly.mdo
+++ b/src/main/mdo/assembly.mdo
@@ -23,8 +23,8 @@
to "assembly-component.mdo".
-->
-<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.8.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.8.0.xsd"
+<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
xml.namespace="http://maven.apache.org/ASSEMBLY/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/assembly-${version}.xsd">
@@ -233,6 +233,7 @@
</association>
<description>
<![CDATA[
+ <b>Deprecated since model version 2.1.1</b>.
Specifies which repository files to include in the assembly. A
repository is specified by providing one or more of
<repository> subelements.
@@ -1140,6 +1141,7 @@
<version>1.0.0+</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