Jill/r731/appint-35965 (#6510 )

* APPINT-35965 downgrade plexus-io * APPINT-35965 downgrade plexus-io
add dependency to new version guava for maven-assembly-plugin plugin (#6501 )
2023-10-27 18:08:01 +08:00 · 2023-10-26 14:35:09 +08:00 · 2023-10-25 17:43:48 +08:00 · 2023-10-25 12:08:07 +08:00 · 2023-10-24 10:09:45 +08:00 · 2023-10-20 11:29:32 +08:00
12 changed files with 121 additions and 6 deletions
--- a/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/build-helper-maven-plugin-3-0-0/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/build/plugins/build-helper-maven-plugin-3-0-0/pom.xml
@@ -44,6 +44,11 @@
 		    <artifactId>maven-core</artifactId>
 		    <version>3.8.1</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+			<version>32.0.1-jre</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
--- 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
@@ -116,7 +116,17 @@
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-io</artifactId>
-			<version>3.4.1</version>
+			<version>3.2.0</version>
+			<exclusions><!--  fix CVE to plexus-io:3.2.0-->
+				<exclusion>
+				    <groupId>commons-io</groupId>
+				    <artifactId>commons-io</artifactId>
+				</exclusion>
+				<exclusion>
+				    <groupId>junit</groupId>
+				    <artifactId>junit</artifactId>
+				</exclusion>							
+			</exclusions>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.maven</groupId>
@@ -129,6 +139,11 @@
            	</exclusion>
            </exclusions>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+			<version>32.0.1-jre</version>
+		</dependency>
 		<dependency>
       		<groupId>org.apache.maven.shared</groupId>
       		<artifactId>maven-shared-utils</artifactId>
--- 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
@@ -25,6 +25,11 @@
            	</exclusion>
            </exclusions>
        </dependency>
+        <dependency>
+			<groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+			<version>32.0.1-jre</version>
+		</dependency>
        <dependency>
       		<groupId>org.apache.maven.shared</groupId>
       		<artifactId>maven-shared-utils</artifactId>
--- a/main/plugins/org.talend.designer.maven.tos/resources/build/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/build/pom.xml
@@ -41,6 +41,11 @@
            	</exclusion>
            </exclusions>
        </dependency>
+        <dependency>
+			<groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+			<version>32.0.1-jre</version>
+		</dependency>
        <dependency>
       		<groupId>org.apache.maven.shared</groupId>
       		<artifactId>maven-shared-utils</artifactId>
@@ -111,7 +116,7 @@
                <exclusion>
                    <groupId>org.apache.maven</groupId>
                    <artifactId>maven-core</artifactId>
-                </exclusion>
+                </exclusion>
    			<exclusion>
 		          <groupId>org.apache.maven</groupId>
   				  <artifactId>maven-compat</artifactId>
--- a/main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml
@@ -221,6 +221,11 @@
 			<artifactId>commons-text</artifactId>
 			<version>1.10.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+			<version>32.0.1-jre</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
@@ -81,6 +81,11 @@
                            <artifactId>maven-core</artifactId>
                            <version>3.8.1</version>
                        </dependency>
+                        <dependency>
+							<groupId>com.google.guava</groupId>
+							<artifactId>guava</artifactId>
+							<version>32.0.1-jre</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -103,6 +108,11 @@
                            <artifactId>maven-core</artifactId>
                            <version>3.8.1</version>
                        </dependency>
+                        <dependency>
+							<groupId>com.google.guava</groupId>
+							<artifactId>guava</artifactId>
+							<version>32.0.1-jre</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -150,6 +160,11 @@
                            <artifactId>maven-core</artifactId>
                            <version>3.8.1</version>
                        </dependency>
+                        <dependency>
+							<groupId>com.google.guava</groupId>
+							<artifactId>guava</artifactId>
+							<version>32.0.1-jre</version>
+						</dependency>
 					</dependencies>
 					<configuration>
 						<archive>
@@ -197,6 +212,11 @@
                            <artifactId>maven-core</artifactId>
                            <version>3.8.1</version>
                        </dependency>
+                        <dependency>
+							<groupId>com.google.guava</groupId>
+							<artifactId>guava</artifactId>
+							<version>32.0.1-jre</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -234,6 +254,11 @@
                            <artifactId>jsr305</artifactId>
                            <version>3.0.2</version>
                        </dependency>
+                         <dependency>
+							<groupId>com.google.guava</groupId>
+							<artifactId>guava</artifactId>
+							<version>32.0.1-jre</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.rcp/src/main/java/org/talend/rcp/exportLogs/ExportLogsWizardPage.java
+++ b/main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/exportLogs/ExportLogsWizardPage.java
@@ -457,7 +457,41 @@ public class ExportLogsWizardPage extends WizardPage {
        for (Entry<Object, Object> en : p.entrySet()) {
            sb.append(en.getKey() + "=" + en.getValue() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
        }
-        writeToFile(dest, ".sysConfig", sb); //$NON-NLS-1$
+        StringBuffer processedData = processSensitiveDataHidden(sb.toString());
+        writeToFile(dest, ".sysConfig", processedData); //$NON-NLS-1$
+    }
+
+    private StringBuffer processSensitiveDataHidden(String data) {
+        StringBuffer processedData = new StringBuffer();
+        while (true) {
+            String line;
+            int index = data.indexOf("\n");
+            if (index == -1) {
+                line = data.toString();
+                String processedLine = line;
+                int equalsIndex = line.indexOf('=');
+                if (equalsIndex != -1) {
+                    String key = line.substring(0, equalsIndex).trim();
+                    if (key.toLowerCase().contains("password")) {
+                        processedLine = key + "=" + "***";
+                    }
+                }
+                processedData.append(processedLine);
+                break;
+            }
+            line = data.substring(0, index);
+            String processedLine = line;
+            int equalsIndex = line.indexOf('=');
+            if (equalsIndex != -1) {
+                String key = line.substring(0, equalsIndex).trim();
+                if (key.toLowerCase().contains("password")) {
+                    processedLine = key + "=" + "***";
+                }
+            }
+            processedData.append(processedLine).append("\n");
+            data = data.substring(index + 1);
+        }
+        return processedData;
    }

    private void writeToFile(File dest, String fileName, StringBuffer sb) {
--- 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
@@ -165,6 +165,14 @@
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.basedir}/tmp/org/apache/maven/maven-bom/4.0.0-alpha-5</outputDirectory>
 								</artifactItem>
+								<artifactItem>
+									<groupId>org.codehaus.plexus</groupId>
+									<artifactId>plexus-io</artifactId>
+									<version>3.2.0</version>
+									<type>jar</type>
+									<overWrite>false</overWrite>
+									<outputDirectory>${project.basedir}/tmp/org/codehaus/plexus/plexus-io/3.2.0</outputDirectory>
+								</artifactItem>
 							</artifactItems>
 							<outputDirectory>${project.basedir}/tmp</outputDirectory>
 						</configuration>
Author	SHA1	Message	Date
Jill Yan	d9691eb405	Jill/r731/appint-35965 (#6510 ) * APPINT-35965 downgrade plexus-io * APPINT-35965 downgrade plexus-io	2023-10-27 18:08:01 +08:00
sbliu	46bb67ab7e	add dependency to new version guava for maven-assembly-plugin plugin (#6501 )	2023-10-26 14:35:09 +08:00
sbliu	22891b2e99	fix missing guava in junit (#6498 )	2023-10-25 17:43:48 +08:00
jiezhang-tlnd	4b208e9fe4	fix junit (#6496 )	2023-10-25 12:08:07 +08:00
sbliu	2387b83d0f	fix(TUP-40275) upgrade guava to 32.0.1-jre (#6398 ) * fix(TUP-40275) upgrade guava to 32.0.1-jre * revert some changes	2023-10-24 10:09:45 +08:00
Jane Ding	aec62af46c	fix(TUP-40439):In the ".sysConfig" of "support logs" that gather (#6451 ) * fix(TUP-40439):In the ".sysConfig" of "support logs" that gather "nexus.password" value is plain text https://jira.talendforge.org/browse/TUP-40439 * fix(TUP-40439):In the ".sysConfig" of "support logs" that gather "nexus.password" value is plain text https://jira.talendforge.org/browse/TUP-40439	2023-10-20 11:29:32 +08:00
apoltavtsev	34a0e52678	APPINT-35122: Incorrect routelet module inside root pom is corrected (#6457 )	2023-10-11 16:16:13 +02:00
apoltavtsev	274bfb2d40	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:28:42 +02:00