Revert "fix(TUP-39924): upgrade org.codehaus.plexus:plexus-archiver to 4.8.0,plexus-io to 3.4.1 , maven-assembly-plugin to 3.6.0 and plexus-util to 4.0.0 for incompatibility.. (#6356 )" (#6458 )

This reverts commit 6665603efc.
APPINT-35122: Incorrect routelet module inside root pom is corrected (#6457 )
2023-10-12 15:57:03 +08:00 · 2023-10-11 16:19:17 +02:00 · 2023-10-09 17:31:26 +02:00
10 changed files with 37 additions and 194 deletions
--- a/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/karaf-maven-plugin-4-2-7/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/karaf-maven-plugin-4-2-7/pom.xml
@@ -39,22 +39,12 @@
 					<groupId>org.jsoup</groupId>
 					<artifactId>jsoup</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-utils</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-compat</artifactId>
 			<version>3.8.1</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-utils</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -98,25 +88,10 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.8.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-xml</artifactId>
-			<version>4.0.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-archiver</artifactId>
-			<version>4.8.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-io</artifactId>
-			<version>3.4.1</version>
+			<version>3.6.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.maven</groupId>
--- a/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/maven-bundle-plugin-2-5-3/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/maven-bundle-plugin-2-5-3/pom.xml
@@ -26,16 +26,12 @@
 					<groupId>org.codehaus.plexus</groupId>
 					<artifactId>plexus-archiver</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-utils</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-archiver</artifactId>
-			<version>4.8.0</version>
+			<version>3.6.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.commons</groupId>
@@ -43,16 +39,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-xml</artifactId>
-			<version>4.0.0</version>
-		</dependency>
 	</dependencies>
 	
 	<build>
--- a/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/talend-compiler-plugin/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/talend-compiler-plugin/pom.xml
@@ -19,10 +19,6 @@
            		<groupId>org.apache.maven.shared</groupId>
            		<artifactId>maven-shared-utils</artifactId>
            	</exclusion>
-            	<exclusion>
-            		<groupId>org.codehaus.plexus</groupId>
-            		<artifactId>plexus-utils</artifactId>
-            	</exclusion>
            </exclusions>
        </dependency>
        <dependency>
@@ -52,7 +48,7 @@
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-archiver</artifactId>
-			<version>4.8.0</version>
+			<version>3.6.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.commons</groupId>
@@ -60,16 +56,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-xml</artifactId>
-			<version>4.0.0</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
--- a/main/plugins/org.talend.designer.maven.tos/resources/build/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/build/pom.xml
@@ -98,7 +98,7 @@
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-assembly-plugin</artifactId>
-			<version>3.6.0</version>
+			<version>3.0.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-codec</groupId>
@@ -107,7 +107,7 @@
 				<exclusion>
     				<groupId>org.apache.maven.shared</groupId>
     				<artifactId>maven-shared-utils</artifactId>
-    			</exclusion>
+    			</exclusion>
                <exclusion>
                    <groupId>org.apache.maven</groupId>
                    <artifactId>maven-core</artifactId>
@@ -115,15 +115,7 @@
    			<exclusion>
 		          <groupId>org.apache.maven</groupId>
   				  <artifactId>maven-compat</artifactId>
-		        </exclusion>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-archiver</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-utils</artifactId>
-				</exclusion>
+		        </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -191,21 +183,6 @@
 			<artifactId>jboss-marshalling</artifactId>
 			<version>2.0.12.Final</version>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-archiver</artifactId>
-			<version>4.8.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-xml</artifactId>
-			<version>4.0.0</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
--- a/main/plugins/org.talend.designer.maven/resources/templates/general/pom_project_template.xml
+++ b/main/plugins/org.talend.designer.maven/resources/templates/general/pom_project_template.xml
@@ -44,17 +44,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>4.0.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-xml</artifactId>
-							<version>4.0.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-io</artifactId>
-							<version>3.4.1</version>
+							<version>3.0.24</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -74,7 +64,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>4.8.0</version>
+							<version>3.6.0</version>
 						</dependency>
                        <dependency>
                            <groupId>org.apache.maven</groupId>
@@ -113,14 +103,9 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>4.0.0</version>
+							<version>3.0.24</version>
 						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-xml</artifactId>
-							<version>4.0.0</version>
-						</dependency>
-						<dependency>
+							<dependency>
 							<groupId>org.apache.commons</groupId>
 							<artifactId>commons-compress</artifactId>
 							<version>1.21</version>
@@ -133,12 +118,12 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>4.8.0</version>
+							<version>3.6.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 						    <artifactId>plexus-io</artifactId>
-						    <version>3.4.1</version>
+						    <version>3.0.0</version>
 						</dependency>
 						<dependency>
                            <groupId>org.apache.maven.shared</groupId>
@@ -160,7 +145,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.6.0</version>
+					<version>3.0.0</version>
 					<dependencies>
 						<dependency>
 					       <groupId>org.apache.maven.shared</groupId>
@@ -170,12 +155,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>4.0.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-xml</artifactId>
-							<version>4.0.0</version>
+							<version>3.0.24</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -190,7 +170,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>4.8.0</version>
+							<version>3.6.0</version>
 						</dependency>
                        <dependency>
                            <groupId>org.apache.maven</groupId>
@@ -224,16 +204,11 @@
                            <artifactId>maven-shared-utils</artifactId>
                            <version>3.3.3</version>
                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.maven</groupId>
-                            <artifactId>maven-core</artifactId>
-                            <version>3.8.1</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>com.google.code.findbugs</groupId>
-                            <artifactId>jsr305</artifactId>
-                            <version>3.0.2</version>
-                        </dependency>
+                            <dependency>
+                                <groupId>org.apache.maven</groupId>
+                                <artifactId>maven-core</artifactId>
+                                <version>3.8.1</version>
+                            </dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -35,7 +34,6 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -1061,6 +1059,7 @@ public class AggregatorPomsHelper {
 	                    	String routeCustomVersion = (String) routeProperty.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
 	                    	boolean routeUseSnapshot = routeProperty.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
 	
+	                    	IFile routePomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
 	
 	                    	// Inherit child job parameters from parent route
 	
@@ -1083,7 +1082,9 @@ public class AggregatorPomsHelper {
 	                    	runProcessService.generatePom(childJob.getProcessItem(), TalendProcessOptionConstants.GENERATE_POM_NO_FILTER);
 	
 	                    	IFile childPomFile = getItemPomFolder(childJobProperty).getFile(TalendMavenConstants.POM_FILE_NAME);
-	                        modules.add(getModulePath(childPomFile));
+	                    	if (childPomFile.getProject().getName().equalsIgnoreCase(routePomFile.getProject().getName())) { 
+	                    		modules.add(getModulePath(childPomFile));
+	                    	}
 	
 	                    	// restore original Job parameters
 	                    	childJobProperty.setParentItem(null);
--- a/main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/exports/SyncChildrenContextsResourcesProvider.java
+++ b/main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/exports/SyncChildrenContextsResourcesProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.runtime.utils.io.FileCopyUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.process.JobInfo;
+import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.repository.build.IBuildResourcesProvider;
@@ -70,6 +71,9 @@ public class SyncChildrenContextsResourcesProvider implements IBuildResourcesPro
        final IFolder mainResourcesFolder = processJavaProject.getExternalResourcesFolder();
        final File targetFolder = mainResourcesFolder.getLocation().toFile();
        dependenciesItems.stream().filter(jobInfo -> !jobInfo.isJoblet()).map(JobInfo::getProcessItem).forEach(item -> {
+            if (ProcessUtils.isRoutelet(item.getProperty())) {
+          	    item.getProperty().setParentItem(processItem);
+            }
            ITalendProcessJavaProject childJavaProject = runProcessService.getTalendJobJavaProject(item.getProperty());
            if (childJavaProject != null) {
                final IFolder childResourcesFolder = childJavaProject.getExternalResourcesFolder();
--- a/main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/exports/SyncChildrenSourceCodeProvider.java
+++ b/main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/exports/SyncChildrenSourceCodeProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.runtime.utils.io.FileCopyUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.process.JobInfo;
+import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.repository.build.IBuildResourcesProvider;
@@ -67,6 +68,9 @@ public class SyncChildrenSourceCodeProvider implements IBuildResourcesProvider {
        final File targetFolder = mainSrcFolder.getLocation().toFile();

        dependenciesItems.stream().filter(jobInfo -> !jobInfo.isJoblet()).map(JobInfo::getProcessItem).forEach(item -> {
+            if (ProcessUtils.isRoutelet(item.getProperty())) {
+                item.getProperty().setParentItem(processItem);
+            }
            ITalendProcessJavaProject childJavaProject = runProcessService.getTalendJobJavaProject(item.getProperty());
            if (childJavaProject != null) {
                final IFolder childSrcFolder = childJavaProject.getSrcFolder();
--- a/main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/exports/SyncChildrenTestReportsProvider.java
+++ b/main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/exports/SyncChildrenTestReportsProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.runtime.utils.io.FileCopyUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.process.JobInfo;
+import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.repository.build.IBuildResourcesProvider;
@@ -65,6 +66,9 @@ public class SyncChildrenTestReportsProvider implements IBuildResourcesProvider
            if (jobInfo.isJoblet()) {
                continue;
            }
+            if (ProcessUtils.isRoutelet(jobInfo.getProcessItem().getProperty())) {
+                jobInfo.getProcessItem().getProperty().setParentItem(processItem);
+            }
            ITalendProcessJavaProject childJavaProject = runProcessService
                    .getTalendJobJavaProject(jobInfo.getProcessItem().getProperty());
            if (childJavaProject != null) {
--- a/main/plugins/org.talend.updates.runtime/pom.xml
+++ b/main/plugins/org.talend.updates.runtime/pom.xml
@@ -27,11 +27,6 @@
 					<groupId>org.apache.commons</groupId>
 					<artifactId>commons-lang3</artifactId>
 				</exclusion>
-				<!-- for TUP-39614 -->
-				<exclusion>
-					<groupId>org.apache.maven</groupId>
-					<artifactId>maven-core</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -49,29 +44,7 @@
 		    <artifactId>plexus-component-annotations</artifactId>
 		    <version>1.7.1</version>
 		</dependency>
-		<!-- TUP-39924 start-->
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-assembly-plugin</artifactId>
-			<version>3.6.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-archiver</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.36</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<!-- TUP-39924 end -->
+		
 	</dependencies>
  	<build>
 		<plugins>
@@ -129,48 +102,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-artifact</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.junit</groupId>
-									<artifactId>junit-bom</artifactId>
-									<version>5.9.3</version>
-									<type>pom</type>
-									<overWrite>false</overWrite>
-									<outputDirectory>${project.basedir}/tmp/org/junit/junit-bom/5.9.3</outputDirectory>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.junit</groupId>
-									<artifactId>junit-bom</artifactId>
-									<version>5.7.2</version>
-									<type>pom</type>
-									<overWrite>false</overWrite>
-									<outputDirectory>${project.basedir}/tmp/org/junit/junit-bom/5.7.2</outputDirectory>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.maven</groupId>
-									<artifactId>maven-bom</artifactId>
-									<version>4.0.0-alpha-5</version>
-									<type>pom</type>
-									<overWrite>false</overWrite>
-									<outputDirectory>${project.basedir}/tmp/org/apache/maven/maven-bom/4.0.0-alpha-5</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.basedir}/tmp</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
Author	SHA1	Message	Date
zyuan-talend	c7fb9616ff	Revert "fix(TUP-39924): upgrade org.codehaus.plexus:plexus-archiver to 4.8.0,plexus-io to 3.4.1 , maven-assembly-plugin to 3.6.0 and plexus-util to 4.0.0 for incompatibility.. (#6356 )" (#6458 ) This reverts commit `6665603efc`.	2023-10-12 15:57:03 +08:00
apoltavtsev	74944201c7	APPINT-35122: Incorrect routelet module inside root pom is corrected (#6457 )	2023-10-11 16:19:17 +02:00
apoltavtsev	f1ba902b6e	APPINT-35949: [731] Compile error for CI+route+routelet (#6450 ) * APPINT-35949: [731] Compile error for CI+route+routelet * Update SyncChildrenSourceCodeProvider.java * Update SyncChildrenTestReportsProvider.java * Update SyncChildrenContextsResourcesProvider.java * Update SyncChildrenSourceCodeProvider.java * Update SyncChildrenContextsResourcesProvider.java * Update SyncChildrenSourceCodeProvider.java * Update SyncChildrenTestReportsProvider.java	2023-10-09 17:31:26 +02:00