diff --git a/build/dependencies.p2/dependencies.p2.tos/pom.xml b/build/dependencies.p2/dependencies.p2.tos/pom.xml index 6a6071c..635159e 100644 --- a/build/dependencies.p2/dependencies.p2.tos/pom.xml +++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml @@ -119,11 +119,6 @@ jaxb-api 2.3.1 - - commons-beanutils - commons-beanutils - 1.9.4 - @@ -161,11 +156,6 @@ paranamer 2.8 - - org.apache.commons - commons-compress - 1.23.0 - com.github.livesense org.liveSense.fragment.sun.misc @@ -272,12 +262,7 @@ ${components.version} bundle - - commons-codec - commons-codec - 1.14 - - biz.aQute.bnd @@ -289,11 +274,6 @@ commons-logging 1.2 - - org.slf4j - org-slf4j-api - 1.7.2 - org.apache.commons commons-configuration2 @@ -304,11 +284,6 @@ commons-text 1.10.0 - - org.yaml - snakeyaml - 2.2 - org.codehaus.woodstox stax2-api @@ -329,27 +304,6 @@ ch.qos.reload4j reload4j 1.2.24-TALEND - - - com.fasterxml.jackson.core - jackson-annotations - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml.jackson.databind.version} - - - - com.google.guava - guava - 32.0.1-jre diff --git a/build/dependencies.p2/pom.xml b/build/dependencies.p2/pom.xml index 9be5a85..a53d866 100644 --- a/build/dependencies.p2/pom.xml +++ b/build/dependencies.p2/pom.xml @@ -13,8 +13,6 @@ https://artifacts-oss.talend.com 9.2.2-SNAPSHOT - 2.14.3 - 2.14.3 diff --git a/build/talend.studio.tos.product.parent.pom/pom.xml b/build/talend.studio.tos.product.parent.pom/pom.xml index 78a8491..d01ad90 100644 --- a/build/talend.studio.tos.product.parent.pom/pom.xml +++ b/build/talend.studio.tos.product.parent.pom/pom.xml @@ -158,7 +158,7 @@ ${project.groupId} eclipse-delta-pack - 4.28 + 4.30 zip true ${studio.dir} diff --git a/talend.studio.parent.pom/pom.xml b/talend.studio.parent.pom/pom.xml index 173c660..127bc9b 100644 --- a/talend.studio.parent.pom/pom.xml +++ b/talend.studio.parent.pom/pom.xml @@ -1,554 +1,554 @@ - - - 4.0.0 - - org.talend.studio - studio-deps-bom - 8.0.2-SNAPSHOT - ../studio-deps-bom/ - - parent-pom - pom - - - UTF-8 - 1.0.0 - ${tycho.version} - 8.0.2 - - ${base.version}-SNAPSHOT - - ${base.version}-SNAPSHOT - Snapshot - 7.3.1-SNAPSHOT - https://artifacts-oss.talend.com - ${talend.nexus.host}/nexus/content/repositories - ${talend.nexus.host}/nexus/content/unzip - ${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/ - error - win32 - win32 - x86_64 - true - - - - - talend_nexus_deployment - https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot - true - false - - - talend_nexus_deployment - https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease - false - true - - - - - tos-deps - ${tos-deps-p2-repo.url} - p2 - - - releases - - true - - - false - - https://artifacts-zl.talend.com/nexus/content/repositories/releases/ - - - snapshots - - false - - - true - - https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/ - - - talend_open - - true - - - false - - https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease - - - talend_open_snapshots - - false - - - true - - https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot - - - eclipse - https://download.eclipse.org/releases/2023-06/ - p2 - - - - - - releases - - true - - - false - - https://artifacts-zl.talend.com/nexus/content/repositories/releases/ - - - snapshots - - false - - - true - - https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/ - - - talend_open - - true - - - false - - https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease - - - - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho.version} - - profile - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - ${strictVersions} - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho.version} - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - - - org.talend.studio - target-platform - ${osgi.compatible.version} - - - ignore - JavaSE-17 - - - ${osgi.os} - ${osgi.ws} - ${osgi.arch} - - - - - eclipse-plugin - org.apache.log4j - - 1.2.24.TALEND - - - - p2-installable-unit - slf4j.nop - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho.version} - - ignore - - -err:+discouraged,forbidden - -warn:+discouraged,forbidden - - 17 - 17 - 17 - false - - - - org.talend.ci - component-cache-creator - ${compcache.creator.version} - - - generate-sources - - generate - - - - - - - - - nonofficial - - - !buildRootDir - - - - -SNAPSHOT - SNAPSHOT - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - parse-version - - parse-version - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho - tycho-buildtimestamp-jgit - ${tycho.version} - - - - false - yyyyMMdd'_'HHmm - - false - - - - - - jgit - pom.xml - ignore - - - - - - - junit.product - - -SNAPSHOT - SNAPSHOT - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - parse-version - - parse-version - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - false - yyyyMMdd'_'HHmm - - false - - - - - - default - - - - - - - tuj - - -SNAPSHOT - SNAPSHOT - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - parse-version - - parse-version - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho - tycho-buildtimestamp-jgit - ${tycho.version} - - - - false - yyyyMMdd'_'HHmm - - false - - - - - - jgit - pom.xml - ignore - - - - - - - official - - ${buildRootDir}/../targetplatform - ${talendtargetplatform.path}/${product.version} - false - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - read-build-properties - initialize - - read-project-properties - - - - ${buildRootDir}/config/build.50more.properties - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho - tycho-buildtimestamp-jgit - ${tycho.version} - - - - false - yyyyMMdd'_'HHmm - - false - - - - - - jgit - pom.xml - ignore - - - - - - - patch - - false - - - ${maven.build.timestamp} - yyyyMMdd'_'HHmm - ${maven.build.timestamp.format} - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - parse-version - - parse-version - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho - tycho-buildtimestamp-jgit - ${tycho-extras.version} - - - - false - ${tycho.buildtimestamp.format} - - false - - - - - - jgit - pom.xml - ignore - - - - - - - sign - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - sign - verify - - - - - - - - - Signing @{jarFile} - - - - - - - - - run - - - - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-nodeps - 1.8.1 - - - - - - - - + + + 4.0.0 + + org.talend.studio + studio-deps-bom + 8.0.2-SNAPSHOT + ../studio-deps-bom/ + + parent-pom + pom + + + UTF-8 + 1.0.0 + ${tycho.version} + 8.0.2 + + ${base.version}-SNAPSHOT + + ${base.version}-SNAPSHOT + Snapshot + 7.3.1-SNAPSHOT + https://artifacts-oss.talend.com + ${talend.nexus.host}/nexus/content/repositories + ${talend.nexus.host}/nexus/content/unzip + ${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/ + error + win32 + win32 + x86_64 + true + + + + + talend_nexus_deployment + https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot + true + false + + + talend_nexus_deployment + https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease + false + true + + + + + tos-deps + ${tos-deps-p2-repo.url} + p2 + + + releases + + true + + + false + + https://artifacts-zl.talend.com/nexus/content/repositories/releases/ + + + snapshots + + false + + + true + + https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/ + + + talend_open + + true + + + false + + https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease + + + talend_open_snapshots + + false + + + true + + https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot + + + eclipse + https://download.eclipse.org/releases/2023-12 + p2 + + + + + + releases + + true + + + false + + https://artifacts-zl.talend.com/nexus/content/repositories/releases/ + + + snapshots + + false + + + true + + https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/ + + + talend_open + + true + + + false + + https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease + + + + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + profile + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + ${strictVersions} + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + org.talend.studio + target-platform + ${osgi.compatible.version} + + + ignore + JavaSE-17 + + + ${osgi.os} + ${osgi.ws} + ${osgi.arch} + + + + + eclipse-plugin + org.apache.log4j + + 1.2.24.TALEND + + + + p2-installable-unit + org.eclipse.orbit.xml-apis-ext + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + ignore + + -err:+discouraged,forbidden + -warn:+discouraged,forbidden + + 17 + 17 + 17 + false + + + + org.talend.ci + component-cache-creator + ${compcache.creator.version} + + + generate-sources + + generate + + + + + + + + + nonofficial + + + !buildRootDir + + + + -SNAPSHOT + SNAPSHOT + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + parse-version + + parse-version + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-buildtimestamp-jgit + ${tycho.version} + + + + false + yyyyMMdd'_'HHmm + + false + + + + + + jgit + pom.xml + ignore + + + + + + + junit.product + + -SNAPSHOT + SNAPSHOT + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + parse-version + + parse-version + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + false + yyyyMMdd'_'HHmm + + false + + + + + + default + + + + + + + tuj + + -SNAPSHOT + SNAPSHOT + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + parse-version + + parse-version + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-buildtimestamp-jgit + ${tycho.version} + + + + false + yyyyMMdd'_'HHmm + + false + + + + + + jgit + pom.xml + ignore + + + + + + + official + + ${buildRootDir}/../targetplatform + ${talendtargetplatform.path}/${product.version} + false + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + read-build-properties + initialize + + read-project-properties + + + + ${buildRootDir}/config/build.50more.properties + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-buildtimestamp-jgit + ${tycho.version} + + + + false + yyyyMMdd'_'HHmm + + false + + + + + + jgit + pom.xml + ignore + + + + + + + patch + + false + + + ${maven.build.timestamp} + yyyyMMdd'_'HHmm + ${maven.build.timestamp.format} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + parse-version + + parse-version + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-buildtimestamp-jgit + ${tycho-extras.version} + + + + false + ${tycho.buildtimestamp.format} + + false + + + + + + jgit + pom.xml + ignore + + + + + + + sign + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + sign + verify + + + + + + + + + Signing @{jarFile} + + + + + + + + + run + + + + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + org.apache.ant + ant-nodeps + 1.8.1 + + + + + + + +