fix(TCOMP-2260): merge TCOMP-2407

Talend · Apr 18, 2023 · c07b307 · c07b307
1 parent 6405480
commit c07b307
Show file tree

Hide file tree

Showing 11 changed files with 599 additions and 146 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,4 +61,7 @@ documentation/rebuildpdf.bat
 
 # release process
 .build/
-.build_source/
+.build_source/
+# direnv
+.envrc
+.env
diff --git a/.jenkins/scripts/docker_build.sh b/.jenkins/scripts/docker_build.sh
@@ -20,20 +20,32 @@ set -xe
 # Parameters:
 # $1: docker tag version
 # $2: should tag as latest
+# $3: requested image, if not given, all will be pushed
 
-tag="${1?Missing tag}"
-latest="${2:-false}"
+_TAG="${1?Missing tag}"
+_IS_LATEST="${2-'false'}"
+_ONLY_ONE_IMAGE="${3-''}"
 
 dockerBuild() {
-  echo ">> Building and pushing $1:${tag}"
-  cd "images/${1}-image"
-  mvn package jib:build@build -Ddocker.talend.image.tag=${tag}
-  if [[ ${latest} == 'true' ]]; then
-    mvn package jib:build@build -Ddocker.talend.image.tag=latest
+  _IMAGE="${1}"
+  echo ">> Building and push $_IMAGE:${_TAG}"
+
+  mvn package jib:build@build \
+    --file "images/${_IMAGE}-image/pom.xml" \
+    --define docker.talend.image.tag="${_TAG}"
+
+  if [[ ${_IS_LATEST} == 'true' ]]; then
+    mvn package jib:build@build \
+    --file "images/${_IMAGE}-image/pom.xml" \
+    --define docker.talend.image.tag=latest
   fi
-  cd ../..
 }
 
-dockerBuild "component-server"
-dockerBuild "component-starter-server"
-dockerBuild "remote-engine-customizer"
+if [[ -n "${_ONLY_ONE_IMAGE}" ]]; then
+  dockerBuild "${_ONLY_ONE_IMAGE}"
+else
+  dockerBuild "component-server"
+  dockerBuild "component-starter-server"
+  dockerBuild "remote-engine-customizer"
+fi
+
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/ci/Jenkinsfile-scan b/ci/Jenkinsfile-scan
@@ -21,7 +21,7 @@ final def veracodeCredentials = usernamePassword(
 final def nexusCredentials = usernamePassword(
   credentialsId: 'nexus-artifact-zl-credentials',
   usernameVariable: 'NEXUS_USER',
-  passwordVariable: 'NEXUS_PASSWORD')
+  passwordVariable: 'NEXUS_PASS')
 
 String git_branch_name = ""
 

diff --git a/...st/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java b/...st/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java
@@ -17,7 +17,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.talend.sdk.component.runtime.manager.service.MavenRepositoryResolver.M2_REPOSITORY;
 import static org.talend.sdk.component.runtime.manager.service.MavenRepositoryResolver.STUDIO_MVN_REPOSITORY;
 import static org.talend.sdk.component.runtime.manager.service.MavenRepositoryResolver.TALEND_COMPONENT_MANAGER_M2_REPOSITORY;
 import static org.talend.sdk.component.runtime.manager.service.MavenRepositoryResolver.TALEND_COMPONENT_MANAGER_M2_SETTINGS;
@@ -39,6 +38,8 @@
 
 class MavenRepositoryResolverTest {
 
+    static String M2_REPOSITORY = ".m2" + File.separator + "repository";
+
     private final MavenRepositoryResolver resolver = new MavenRepositoryDefaultResolver();
 
     final MavenRepositoryDefaultResolver mavenSettingsOnlyResolver = new MavenRepositoryDefaultResolver() {
@@ -63,7 +64,7 @@ public Path get(final String path) {
         }
     };
 
-    private final String fallback = System.getProperty("user.home") + "/" + M2_REPOSITORY;
+    private final String fallback = System.getProperty("user.home") + File.separator + M2_REPOSITORY;
 
     private final Path repository = Paths.get(new File("target/test-classes").getAbsolutePath());
 
@@ -164,7 +165,8 @@ void discoverFromSettingsWindowsPath() {
         mavenSettingsOnlyResolver.setHandler(handlerNoExistCheck);
         final Path m2 = mavenSettingsOnlyResolver.discover();
         assertNotNull(m2);
-        assertEquals("C:/Users/maven/repository", m2.toString());
+        assertEquals("C:" + File.separator + "Users" + File.separator + "maven" + File.separator + "repository",
+                m2.toString());
         System.clearProperty(TALEND_COMPONENT_MANAGER_M2_SETTINGS);
     }
 
@@ -174,7 +176,8 @@ void discoverFromSettingsTildePath() {
         mavenSettingsOnlyResolver.setHandler(handlerNoExistCheck);
         final Path m2 = mavenSettingsOnlyResolver.discover();
         assertNotNull(m2);
-        assertEquals(System.getProperty("user.home") + "/mvn_home_dev/repository", m2.toString());
+        assertEquals(System.getProperty("user.home") + File.separator + "mvn_home_dev" + File.separator + "repository",
+                m2.toString());
         System.clearProperty(TALEND_COMPONENT_MANAGER_M2_SETTINGS);
     }
 
@@ -184,7 +187,8 @@ void discoverFromSettingsUserHomeProperty() {
         mavenSettingsOnlyResolver.setHandler(handlerNoExistCheck);
         final Path m2 = mavenSettingsOnlyResolver.discover();
         assertNotNull(m2);
-        assertEquals(System.getProperty("user.home") + "/mvn_home_dev/repository", m2.toString());
+        assertEquals(System.getProperty("user.home") + File.separator + "mvn_home_dev" + File.separator + "repository",
+                m2.toString());
         System.clearProperty(TALEND_COMPONENT_MANAGER_M2_SETTINGS);
     }
 

diff --git a/...mentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc b/...mentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc
@@ -1,5 +1,17 @@
 
 
+== Version 1.56.0
+
+=== Bug
+
+- link:https://jira.talendforge.org/browse/TCOMP-2355[TCOMP-2355^]: Error on language support for xx_YY language files link:search.html?query=component-server[component-server^,role='dockey']
+
+
+
+=== Work Item
+
+- link:https://jira.talendforge.org/browse/TCOMP-2405[TCOMP-2405^]: Upgrade snakeyaml to 2.0 link:search.html?query=build[build^,role='dockey']
+
 == Version 1.55.0
 
 === Bug
@@ -702,6 +714,14 @@
 
 
 
+
+
+
+== Version 1.38.9
+
+=== Work Item
+
+- link:https://jira.talendforge.org/browse/TCOMP-2412[TCOMP-2412^]: Upgrade tomcat to 9.0.69 link:search.html?query=component-server[component-server^,role='dockey']
 
 == Version 1.38.8
 
@@ -1481,12 +1501,6 @@
 
 
 
-
-== Version 1.1.15.2
-
-=== Work Item
-
-- link:https://jira.talendforge.org/browse/TCOMP-1752[TCOMP-1752^]: Make component-runtime class loader find classes in RemoteEngine JobServer
 
 == Version 1.1.15
 
@@ -1521,6 +1535,12 @@
 - link:https://jira.talendforge.org/browse/TCOMP-1578[TCOMP-1578^]: Upgrade asciidoctor-pdf to v1.5.0-beta.7
 - link:https://jira.talendforge.org/browse/TCOMP-1581[TCOMP-1581^]: Support JUnit5 meta annotations for our extensions
 
+== Version 1.1.15.2
+
+=== Work Item
+
+- link:https://jira.talendforge.org/browse/TCOMP-1752[TCOMP-1752^]: Make component-runtime class loader find classes in RemoteEngine JobServer
+
 == Version 1.1.15.1
 
 === New Feature

diff --git a/...tation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc b/...tation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc
@@ -8,7 +8,7 @@
     "name":"Romain Manni-Bucau"
   },
   {
-    "commits":689,
+    "commits":695,
     "description":"Software engineer @Talend.\r\n\r\nComponents team member.\n\nBlog: undx.github.io",
     "gravatar":"https://avatars.githubusercontent.com/u/265575?v=4",
     "id":"undx",
@@ -50,7 +50,7 @@
     "name":"ypiel"
   },
   {
-    "commits":27,
+    "commits":28,
     "description":"",
     "gravatar":"https://avatars.githubusercontent.com/u/7742508?v=4",
     "id":"yyin-talend",
@@ -70,6 +70,13 @@
     "id":"wwang-talend",
     "name":"wang wei"
   },
+  {
+    "commits":15,
+    "description":"QA Automation @ Talend Nantes",
+    "gravatar":"https://avatars.githubusercontent.com/u/1255625?v=4",
+    "id":"acatoire",
+    "name":"Axel CATOIRE"
+  },
   {
     "commits":10,
     "description":"",
@@ -98,13 +105,6 @@
     "id":"jsomsanith-tlnd",
     "name":"Jimmy Somsanith"
   },
-  {
-    "commits":8,
-    "description":"QA Automation @ Talend Nantes",
-    "gravatar":"https://avatars.githubusercontent.com/u/1255625?v=4",
-    "id":"acatoire",
-    "name":"Axel CATOIRE"
-  },
   {
     "commits":8,
     "description":"",

diff --git a/documentation/src/main/antora/site-template.yml b/documentation/src/main/antora/site-template.yml
@@ -50,6 +50,7 @@ content:
       - '!component-runtime-1.38.5'
       - '!component-runtime-1.38.6'
       - '!component-runtime-1.38.7'
+      - '!component-runtime-1.38.8'
       - '!component-runtime-1.39.0'
       - '!component-runtime-1.39.1'
       - '!component-runtime-1.39.2'
@@ -70,6 +71,10 @@ content:
       - '!component-runtime-1.50.3'
       - '!component-runtime-1.51.0'
       - '!component-runtime-1.51.1'
+      - '!component-runtime-1.52.0'
+      - '!component-runtime-1.52.1'
+      - '!component-runtime-1.53.0'
+      - '!component-runtime-1.54.0'
     branches:
       - HEAD
     start_path: documentation/src/main/antora

diff --git a/images/component-server-image/pom.xml b/images/component-server-image/pom.xml
@@ -231,7 +231,7 @@
                   <TALEND_COMPONENT_SERVER_MAVEN_REPOSITORY>${TALEND_HOME}/connectors</TALEND_COMPONENT_SERVER_MAVEN_REPOSITORY>
                   <TALEND_VAULT_CACHE_VAULT_DECRYPT_ENDPOINT>v1/tenants-keyrings/decrypt/{x-talend-tenant-id}</TALEND_VAULT_CACHE_VAULT_DECRYPT_ENDPOINT>
                   <CLASSPATH>${docker.talend.dir.base}component-kit/custom/*:${docker.talend.dir.base}custom/*:${TALEND_HOME}/extensions/*:${docker.talend.dir.app}resources:${docker.talend.dir.app}classes</CLASSPATH>
-                  <JDK_JAVA_OPTIONS>--add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED -Dlog4j.configurationFile=${docker.talend.dir.app}conf/log4j2-component-server-TEXT.xml</JDK_JAVA_OPTIONS>
+                  <JDK_JAVA_OPTIONS>--add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.net.nio=ALL-UNNAMED -Dlog4j.configurationFile=${docker.talend.dir.app}conf/log4j2-component-server-TEXT.xml</JDK_JAVA_OPTIONS>
                 </environment>
                 <labels>
                   <com.talend.docker.cmd>docker run -d -p ${docker.image.port}:${docker.image.port} ${docker.image.to}</com.talend.docker.cmd>

diff --git a/pom.xml b/pom.xml
@@ -1746,6 +1746,19 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>private_repository</id>
+      <!--
+        This profile is used by the CI or for development branch deployment.
+        Its overwrite the snapshotRepository with a private one.
+      -->
+      <distributionManagement>
+        <snapshotRepository>
+          <id>talend.snapshots</id>
+          <url>https://artifacts-zl.talend.com/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
     <profile>
       <id>travis</id>
       <properties>

diff --git a/reporting/pom.xml b/reporting/pom.xml
@@ -29,6 +29,13 @@
 
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
+    <!--
+     documentation.skip is false by default
+     It is useful in case you want to build the whole project without the documentation.
+     Example: The CI is using it on developers branches.
+     If set to false, the "documentation" maven profile will not be used.
+     -->
+    <documentation.skip>false</documentation.skip>
   </properties>
 
   <dependencies>
@@ -187,11 +194,6 @@
       <artifactId>remote-engine-customizer-image</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.talend.sdk.component</groupId>
-      <artifactId>documentation</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.talend.sdk.component</groupId>
       <artifactId>talend-component-kit-intellij-plugin</artifactId>
@@ -241,4 +243,28 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>documentation</id>
+      <!--
+      This profile can be controlled with "documentation.skip" property in case you want to build
+       the whole project with/without the documentation.
+      -->
+      <activation>
+        <property>
+          <name>documentation.skip</name>
+          <value>false</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.talend.sdk.component</groupId>
+          <artifactId>documentation</artifactId>
+          <version>${project.version}</version>
+          <optional>${documentation.skip}</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>