Compare commits

..

1 Commits

Author SHA1 Message Date
hzhao-talendbj
df40bf79c5 try comment babel repo 2023-11-11 15:29:48 +08:00
13 changed files with 209 additions and 164 deletions

View File

@@ -5,16 +5,11 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
<packaging>pom</packaging>
<properties>
<components.version>0.38.0-SNAPSHOT</components.version>
<daikon.version>7.1.16</daikon.version>
<studio-utils.version>1.0.16</studio-utils.version>
</properties>
<repositories>
<repository>
@@ -43,7 +38,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.6.13-Talend_v20231201-1613</version>
<version>2.6.13.1-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
@@ -119,6 +114,11 @@
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<!-- end of daikon dependencies -->
<!-- ========================= -->
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.3</version>
<version>1.11.2</version>
</dependency>
<dependency>
@@ -156,6 +156,11 @@
<artifactId>paranamer</artifactId>
<version>2.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
</dependency>
<dependency>
<groupId>com.github.livesense</groupId>
<artifactId>org.liveSense.fragment.sun.misc</artifactId>
@@ -262,6 +267,11 @@
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.14</version>
</dependency>
<!-- to avoid updatin the complete eclipse target platform we add these
single dependencies -->
<dependency>
@@ -274,6 +284,11 @@
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>org-slf4j-api</artifactId>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
@@ -284,6 +299,11 @@
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
@@ -304,6 +324,27 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.24-TALEND</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
<!-- removed org.talend.libraries.guava so added here for org.talend.dataquality.semantic -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../talend.studio.parent.pom</relativePath>
</parent>
<groupId>org.talend.repo</groupId>
@@ -12,7 +12,9 @@
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<dataquality.lib.version>9.2.2-SNAPSHOT</dataquality.lib.version>
<dataquality.lib.version>9.1.16-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.14.3</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.14.3</fasterxml.jackson.databind.version>
</properties>
<distributionManagement>
@@ -157,7 +159,7 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
<version>${tycho.version}</version>
<version>4.0.0</version>
<executions>
<execution>
<id>create-p2-repository</id>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath />
</parent>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath />
</parent>

View File

@@ -53,6 +53,7 @@
<feature id="org.talend.dataquality.se.test.feature"/>
<feature id="org.talend.studio.components.bd.couchbase.feature"/>
<feature id="org.talend.studio.components.bd.cosmosdb.feature"/>
<feature id="org.talend.studio.components.tcompv0.jdbc.feature"/>
<feature id="org.talend.studio.components.tcompv0.couchbase.feature"/>
<feature id="org.talend.studio.components.tcompv0.netsuite.feature"/>
<feature id="org.talend.studio.components.tcompv0.marklogic.feature"/>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath />
</parent>
@@ -134,7 +134,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-binaries</artifactId>
<version>8.0.2</version>
<version>8.0.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -142,7 +142,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>8.0.2</version>
<version>8.0.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -158,7 +158,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-delta-pack</artifactId>
<version>4.30</version>
<version>4.28</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -472,29 +472,29 @@
<timestampProvider>default</timestampProvider>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>-->
<!-- Attach product ZIP to Maven artifact -->
<!-- <id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/products/${product.final.name}.zip</file>
<type>product</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
<!-- <id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/products/${product.final.name}.zip</file>
<type>product</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath />
</parent>

View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>studio-deps-bom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<component-runtime.version>1.63.0</component-runtime.version>
<components.version>0.38.0-SNAPSHOT</components.version>
<tacokit.components.version>1.54.0-SNAPSHOT</tacokit.components.version>
<m2.fasterxml.jackson.version>2.14.3</m2.fasterxml.jackson.version>
<m2.fasterxml.jackson.databind.version>2.14.3</m2.fasterxml.jackson.databind.version>
<jackson-codehaus.version>1.9.16-TALEND</jackson-codehaus.version>
<daikon.version>7.1.16</daikon.version>
<slf4j-api.version>1.7.34</slf4j-api.version>
<daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
<daikon.audit.version>1.16.1</daikon.audit.version>
<org.talend.daikon.crypto-utils.version>7.1.16</org.talend.daikon.crypto-utils.version>
<studio-utils.version>1.0.16</studio-utils.version>
<tycho.version>4.0.4</tycho.version>
</properties>
</project>

View File

@@ -1,20 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>studio-deps-bom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<relativePath>../studio-deps-bom/</relativePath>
</parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.8.8-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<component-runtime.version>1.62.1</component-runtime.version>
<components.version>0.38.0-SNAPSHOT</components.version>
<tacokit.components.version>1.52.0-SNAPSHOT</tacokit.components.version>
<m2.fasterxml.jackson.version>2.14.3</m2.fasterxml.jackson.version>
<m2.fasterxml.jackson.databind.version>2.14.3</m2.fasterxml.jackson.databind.version>
<jackson-codehaus.version>1.9.16-TALEND</jackson-codehaus.version>
<daikon.version>7.1.16</daikon.version>
<slf4j-api.version>1.7.34</slf4j-api.version>
<daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
<daikon.audit.version>1.16.1</daikon.audit.version>
<org.talend.daikon.crypto-utils.version>7.1.16</org.talend.daikon.crypto-utils.version>
<studio-utils.version>1.0.13</studio-utils.version>
<compcache.creator.version>1.0.0</compcache.creator.version>
<tycho.version>4.0.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>8.0.2</base.version>
<base.version>8.8.8</base.version>
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
<osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
@@ -24,111 +33,75 @@
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
<talend.nexus.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
<opensourcesnapshot-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceSnapshot/org/talend/repo</opensourcesnapshot-unziprepo.url>
<opensourcerelease-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceRelease/org/talend/repo</opensourcerelease-unziprepo.url>
<eclipse-repo.url>${opensourcerelease-unziprepo.url}/eclipse-p2-repo/4.20/eclipse-p2-repo-4.20.zip-unzip/</eclipse-repo.url>
<babel-repo.url>${opensourcerelease-unziprepo.url}/babel-r2021-06/0.19.0/babel-r2021-06-0.19.0.zip-unzip/</babel-repo.url>
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
<tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-p2-repo.url>
<tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-p2-repo.url>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
<osgi.arch>x86_64</osgi.arch>
<strictVersions>true</strictVersions>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot</url>
<url>${opensourcesnapshot-repo.url}</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
</snapshotRepository>
<repository>
<id>talend_nexus_deployment</id>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease</url>
<url>${opensourcerelease-repo.url}</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
</distributionManagement>
<repositories>
<repository>
<id>tos-deps</id>
<url>${tos-deps-p2-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-zl.talend.com/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>talend_open</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot</url>
</repository>
<repository>
<id>eclipse</id>
<url>https://download.eclipse.org/releases/2023-12</url>
<layout>p2</layout>
<id>talend_open</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>${opensourcerelease-repo.url}</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>${opensourcesnapshot-repo.url}</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-zl.talend.com/nexus/content/repositories/releases/</url>
<id>talend-openplugins-snapshot</id>
<name>talend-openplugins-snapshot</name>
<url>${opensourcesnapshot-repo.url}</url>
</pluginRepository>
<pluginRepository>
<id>snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/</url>
</pluginRepository>
<pluginRepository>
<id>talend_open</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease</url>
<id>talend-openplugins-release</id>
<name>talend-openplugins-release</name>
<url>${opensourcerelease-repo.url}</url>
</pluginRepository>
</pluginRepositories>
@@ -170,13 +143,6 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<target>
<artifact>
<groupId>org.talend.studio</groupId>
<artifactId>target-platform</artifactId>
<version>${osgi.compatible.version}</version>
</artifact>
</target>
<pomDependencies>ignore</pomDependencies>
<executionEnvironmentDefault>JavaSE-17</executionEnvironmentDefault>
<environments>
@@ -187,18 +153,39 @@
</environment>
</environments>
<filters>
<filter>
<type>eclipse-plugin</type>
<id>org.apache.log4j</id>
<restrictTo>
<version>1.2.24.TALEND</version>
<!-- restrict version of a bundle -->
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
</filter>
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.orbit.xml-apis-ext</id>
<removeAll />
</filter>
</filter>-->
<!-- <filter>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.core</id>
<restrictTo>
<version>3.26.0.v20210609-0549</version>
</restrictTo>
</filter> -->
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
-->
</filters>
</configuration>
</plugin>
@@ -234,6 +221,32 @@
</plugins>
</build>
<profiles>
<profile>
<id>add.base.p2</id>
<activation>
<file>
<missing>${user.dir}/skip.eclipse.p2.properties</missing>
</file>
</activation>
<repositories>
<repository>
<id>fullp2</id>
<url>https://artifacts-oss.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceRelease/org/talend/repo/eclipse-p2-repo/4.28/eclipse-p2-repo-4.28.zip-unzip/</url>
<layout>p2</layout>
</repository>
<!-- <repository>
<id>babel_repo</id>
<url>https://download.eclipse.org/technology/babel/update-site/latest/</url>
<layout>p2</layout>
</repository>
-->
<repository>
<id>swtbot</id>
<url>https://download.eclipse.org/technology/swtbot/releases/4.1.0/</url>
<layout>p2</layout>
</repository>
</repositories>
</profile>
<profile>
<id>nonofficial</id>
<activation>
@@ -446,11 +459,23 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
<tycho.buildtimestamp.format>${maven.build.timestamp.format}</tycho.buildtimestamp.format>
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
</properties>
<repositories>
<repository>
<id>fullp2</id>
<url>${fullp2_url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>eclipse_repo</id>
<url>${eclipse-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>
<build>
<plugins>
<plugin>