You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2022/04/26 09:51:40 UTC

[GitHub] [maven-assembly-plugin] cstamas opened a new pull request, #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

cstamas opened a new pull request, #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54

   Updates parent POM to 36, Maven to 3.2.5 w/
   proper scoping, and many other dependencies.
   
   Also, gets rid of Plexus API and Plexus components
   and replaces them with JSR330.
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] cstamas commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
cstamas commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858693826


##########
pom.xml:
##########
@@ -244,58 +277,25 @@ under the License.
       </resource>
     </resources>
 
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <executions>
-          <execution>
-            <id>descriptors</id>
-            <goals>
-              <goal>generate-metadata</goal>
-              <goal>generate-test-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>${mdoVersion}</version>
-          <models>
-            <model>src/main/mdo/assembly.mdo</model>
-            <model>src/main/mdo/assembly-component.mdo</model>
-          </models>
-        </configuration>
-        <executions>
-          <execution>
-            <id>mdo</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>mdo-site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>xdoc</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>sisu-maven-plugin</artifactId>
+          <version>${sisuVersion}</version>

Review Comment:
   Removed



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] slawekjaranowski commented on pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#issuecomment-1109673908

   parent and component updates in separate PR will be ok


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] michael-o commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
michael-o commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r861236239


##########
pom.xml:
##########
@@ -88,80 +89,96 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.3</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4jVersion}</version>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-aether-provider</artifactId>
-      <version>3.0</version>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-inject-plexus</artifactId>
-      <version>1.4.2</version>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+      <version>${sisuVersion}</version>

Review Comment:
   Shit, where is `sisuVersion` defined?



##########
src/main/java/org/apache/maven/plugins/assembly/internal/PlexusLoggingHelper.java:
##########
@@ -0,0 +1,39 @@
+package org.apache.maven.plugins.assembly.internal;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.slf4j.Slf4jLogger;
+
+/**
+ * Support for plexus logging, as downstream component APIs still expect Plexus logger..

Review Comment:
   puke...



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] cstamas commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
cstamas commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858555216


##########
pom.xml:
##########
@@ -66,9 +66,11 @@ under the License.
   <properties>
     <javaVersion>7</javaVersion>
     <mdoVersion>2.1.0</mdoVersion>
-    <mavenArchiverVersion>3.5.1</mavenArchiverVersion>
-    <mavenFilteringVersion>3.2.0</mavenFilteringVersion>
-    <mavenVersion>3.0</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
+    <sisuVersion>0.3.5</sisuVersion>
+    <slf4jVersion>1.7.5</slf4jVersion>

Review Comment:
   maven 3.2.5 used that version, yes, just like aether and not "maven resovler"



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] cstamas commented on pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
cstamas commented on PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#issuecomment-1109776447

   > parent and component updates in separate PR will be ok
   
   Nope, sorry: "component updates" requires code changes, like in case of common filters, completely different mocking is needed. So really, all these are interleaved and tangled together, hence, IMHO they need to be untangled together as well. Sadly, this is the price of neglected plugin. So, no, am not splitting this PR only to get multiple commits (and issues), as it merely just generates more work, while the result is, as I said, just "more issues".


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] slawekjaranowski commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r861248284


##########
pom.xml:
##########
@@ -88,80 +89,96 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.3</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4jVersion}</version>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-aether-provider</artifactId>
-      <version>3.0</version>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-inject-plexus</artifactId>
-      <version>1.4.2</version>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+      <version>${sisuVersion}</version>

Review Comment:
   https://github.com/apache/maven-parent/blob/master/pom.xml#L934
   version tag can be removed there is also depednecyManagment for it
   https://github.com/apache/maven-parent/blob/master/pom.xml#L947-L952



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] michael-o commented on pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
michael-o commented on PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#issuecomment-1112576865

   Expect a few nits and what has been mentioned https://github.com/apache/maven-assembly-plugin/pull/54#pullrequestreview-953214479, as soon as this is addressed I am fine to merge this as one commit under one ticket. Splitting is really really hard.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] cstamas merged pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
cstamas merged PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] cstamas commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
cstamas commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858556675


##########
src/main/java/org/apache/maven/plugins/assembly/internal/ComponentSupport.java:
##########
@@ -19,16 +19,18 @@
  * under the License.
  */
 
-import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * @author jdcasey
- *
- *          //todo delete this class once the plexus maven plugin can merge a generated components.xml with an
- *          existing one.
+ * Support for components.
  */
-class SarUnArchiver
-    extends ZipUnArchiver
+public abstract class ComponentSupport

Review Comment:
   It is plugin internal anyway (look at pkg), is really just to lessen logger copy + pasta, but we can get rid of it, and just change all `getLogger()` occurences to `logger`



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] slawekjaranowski commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858601866


##########
pom.xml:
##########
@@ -244,58 +277,25 @@ under the License.
       </resource>
     </resources>
 
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <executions>
-          <execution>
-            <id>descriptors</id>
-            <goals>
-              <goal>generate-metadata</goal>
-              <goal>generate-test-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>${mdoVersion}</version>
-          <models>
-            <model>src/main/mdo/assembly.mdo</model>
-            <model>src/main/mdo/assembly-component.mdo</model>
-          </models>
-        </configuration>
-        <executions>
-          <execution>
-            <id>mdo</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>mdo-site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>xdoc</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>sisu-maven-plugin</artifactId>
+          <version>${sisuVersion}</version>

Review Comment:
   Version and executions configuration are in  parent, can be removed here



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] michael-o commented on pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
michael-o commented on PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#issuecomment-1109631160

   > many separated issues .... I prefer to split 😃
   
   While I agree with you some parts are pretty hard to spilt. All the Plexus removal is tightly coupled to Maven upgrade and shuffling of *some*  dependencies. Although, parent and components can be separate commits.
   
   What exactly do you propose to factor out?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] michael-o commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
michael-o commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858576336


##########
src/main/java/org/apache/maven/plugins/assembly/internal/ComponentSupport.java:
##########
@@ -19,16 +19,18 @@
  * under the License.
  */
 
-import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * @author jdcasey
- *
- *          //todo delete this class once the plexus maven plugin can merge a generated components.xml with an
- *          existing one.
+ * Support for components.
  */
-class SarUnArchiver
-    extends ZipUnArchiver
+public abstract class ComponentSupport

Review Comment:
   I guess so, I'd go with `static final Logger LOGGER`.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] cstamas commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
cstamas commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858694279


##########
pom.xml:
##########
@@ -244,58 +277,25 @@ under the License.
       </resource>
     </resources>
 
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <executions>
-          <execution>
-            <id>descriptors</id>
-            <goals>
-              <goal>generate-metadata</goal>
-              <goal>generate-test-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>${mdoVersion}</version>
-          <models>
-            <model>src/main/mdo/assembly.mdo</model>
-            <model>src/main/mdo/assembly-component.mdo</model>
-          </models>
-        </configuration>
-        <executions>
-          <execution>
-            <id>mdo</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>mdo-site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>xdoc</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>sisu-maven-plugin</artifactId>
+          <version>${sisuVersion}</version>
+          <executions>
+            <execution>
+              <id>index-project</id>
+              <goals>
+                <goal>main-index</goal>
+                <goal>test-index</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.1.1</version>

Review Comment:
   Removed



##########
pom.xml:
##########
@@ -66,9 +66,11 @@ under the License.
   <properties>
     <javaVersion>7</javaVersion>
     <mdoVersion>2.1.0</mdoVersion>
-    <mavenArchiverVersion>3.5.1</mavenArchiverVersion>
-    <mavenFilteringVersion>3.2.0</mavenFilteringVersion>
-    <mavenVersion>3.0</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
+    <sisuVersion>0.3.5</sisuVersion>

Review Comment:
   Removed



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] michael-o commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
michael-o commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858550618


##########
pom.xml:
##########
@@ -66,9 +66,11 @@ under the License.
   <properties>
     <javaVersion>7</javaVersion>
     <mdoVersion>2.1.0</mdoVersion>
-    <mavenArchiverVersion>3.5.1</mavenArchiverVersion>
-    <mavenFilteringVersion>3.2.0</mavenFilteringVersion>
-    <mavenVersion>3.0</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
+    <sisuVersion>0.3.5</sisuVersion>
+    <slf4jVersion>1.7.5</slf4jVersion>

Review Comment:
   1.7.5?



##########
src/main/java/org/apache/maven/plugins/assembly/internal/ComponentSupport.java:
##########
@@ -19,16 +19,18 @@
  * under the License.
  */
 
-import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * @author jdcasey
- *
- *          //todo delete this class once the plexus maven plugin can merge a generated components.xml with an
- *          existing one.
+ * Support for components.
  */
-class SarUnArchiver
-    extends ZipUnArchiver
+public abstract class ComponentSupport

Review Comment:
   I would deprecate this class right away if it will only contain logger injection.



##########
src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java:
##########
@@ -383,13 +374,12 @@ else if ( "..".equals( part ) )
      * <li>environment variables.</li>
      * </ol>
      */
-    public static String evaluateFileNameMapping( final String expression, @Nonnull final Artifact artifact,
-                                                  @Nullable final MavenProject mainProject,
-                                                  @Nullable final Artifact moduleArtifact,
-                                                  @Nonnull final AssemblerConfigurationSource configSource,
+    public static String evaluateFileNameMapping( final String expression, final Artifact artifact,
+                                                  /* nullable */ final MavenProject mainProject,

Review Comment:
   Shouldn't this be part of the Javadoc?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] slawekjaranowski commented on pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#issuecomment-1109617051

   many separated issues .... I prefer to split 😃 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [maven-assembly-plugin] slawekjaranowski commented on a diff in pull request #54: [MASSEMBLY-954] Update plugin to Maven 3.2.5

Posted by GitBox <gi...@apache.org>.
slawekjaranowski commented on code in PR #54:
URL: https://github.com/apache/maven-assembly-plugin/pull/54#discussion_r858601866


##########
pom.xml:
##########
@@ -244,58 +277,25 @@ under the License.
       </resource>
     </resources>
 
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <executions>
-          <execution>
-            <id>descriptors</id>
-            <goals>
-              <goal>generate-metadata</goal>
-              <goal>generate-test-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>${mdoVersion}</version>
-          <models>
-            <model>src/main/mdo/assembly.mdo</model>
-            <model>src/main/mdo/assembly-component.mdo</model>
-          </models>
-        </configuration>
-        <executions>
-          <execution>
-            <id>mdo</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>mdo-site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>xdoc</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>sisu-maven-plugin</artifactId>
+          <version>${sisuVersion}</version>

Review Comment:
   Version and executions configuration are in  parent, van be removed here



##########
pom.xml:
##########
@@ -66,9 +66,11 @@ under the License.
   <properties>
     <javaVersion>7</javaVersion>
     <mdoVersion>2.1.0</mdoVersion>
-    <mavenArchiverVersion>3.5.1</mavenArchiverVersion>
-    <mavenFilteringVersion>3.2.0</mavenFilteringVersion>
-    <mavenVersion>3.0</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
+    <sisuVersion>0.3.5</sisuVersion>

Review Comment:
   The same version is in parent



##########
pom.xml:
##########
@@ -244,58 +277,25 @@ under the License.
       </resource>
     </resources>
 
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <executions>
-          <execution>
-            <id>descriptors</id>
-            <goals>
-              <goal>generate-metadata</goal>
-              <goal>generate-test-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>${mdoVersion}</version>
-          <models>
-            <model>src/main/mdo/assembly.mdo</model>
-            <model>src/main/mdo/assembly-component.mdo</model>
-          </models>
-        </configuration>
-        <executions>
-          <execution>
-            <id>mdo</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>mdo-site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>xdoc</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>sisu-maven-plugin</artifactId>
+          <version>${sisuVersion}</version>
+          <executions>
+            <execution>
+              <id>index-project</id>
+              <goals>
+                <goal>main-index</goal>
+                <goal>test-index</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.1.1</version>

Review Comment:
   plugin without configuration can be removed from pluginMangment ...



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org