Compare commits
61 Commits
jzhang/73/
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
448a58976d | ||
|
|
6091c0b7f5 | ||
|
|
3cacfad64a | ||
|
|
b95ac98de7 | ||
|
|
b46733e5db | ||
|
|
76d5a4ee43 | ||
|
|
97f75d933a | ||
|
|
c3aef7505b | ||
|
|
9fcfddf6ee | ||
|
|
d5e4b03c38 | ||
|
|
1bc9fe5469 | ||
|
|
abdbdf2102 | ||
|
|
b95b65b43b | ||
|
|
2753570d48 | ||
|
|
14cf877362 | ||
|
|
099b42b62d | ||
|
|
d49a0a5e8f | ||
|
|
a340385238 | ||
|
|
b5f03c02d6 | ||
|
|
e663fd9939 | ||
|
|
7b85ce307e | ||
|
|
513644e06f | ||
|
|
95a3158b5b | ||
|
|
1bff678e23 | ||
|
|
d36481b7cf | ||
|
|
f9be93c1c2 | ||
|
|
a6e0d474fc | ||
|
|
3e463ad9d6 | ||
|
|
8227fa30ad | ||
|
|
d83af2f66b | ||
|
|
6cf4f6a3fe | ||
|
|
593c7b38d4 | ||
|
|
d4b582b5fd | ||
|
|
e11d543555 | ||
|
|
71d2b60c12 | ||
|
|
682b529fd4 | ||
|
|
8211db3e00 | ||
|
|
14ffc7709d | ||
|
|
2305da028b | ||
|
|
2e28c62c6d | ||
|
|
28feadd37c | ||
|
|
5c4a678284 | ||
|
|
e00b580862 | ||
|
|
14bad8f528 | ||
|
|
0189c9b290 | ||
|
|
d8f4ca3e61 | ||
|
|
71b4fb154b | ||
|
|
db2b45ce90 | ||
|
|
98139e7cab | ||
|
|
93efd732dc | ||
|
|
74fc1892b9 | ||
|
|
55962cbf90 | ||
|
|
03d118eb0e | ||
|
|
f31347c758 | ||
|
|
4dee335b4f | ||
|
|
3a1cb67f59 | ||
|
|
ed72ab400e | ||
|
|
7c048b4cdb | ||
|
|
9cbf5294ed | ||
|
|
c02c790c92 | ||
|
|
5c21c43bb8 |
@@ -10,6 +10,7 @@
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
@@ -117,7 +118,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<version>3.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
@@ -127,7 +128,7 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${fasterxml.jackson.version}</version>
|
||||
<version>${fasterxml.jackson.databind.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
@@ -137,7 +138,7 @@
|
||||
<dependency>
|
||||
<groupId>commons-beanutils</groupId>
|
||||
<artifactId>commons-beanutils</artifactId>
|
||||
<version>1.9.3</version>
|
||||
<version>1.9.4-talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
@@ -157,12 +158,12 @@
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.14-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.14-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Avro with minimum depdencies -->
|
||||
@@ -312,9 +313,9 @@
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.10</version>
|
||||
<version>1.14-talend</version>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
single dependencies -->
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
@@ -329,7 +330,7 @@
|
||||
<dependency>
|
||||
<groupId>commons-beanutils</groupId>
|
||||
<artifactId>commons-beanutils</artifactId>
|
||||
<version>1.9.3</version>
|
||||
<version>1.9.4-talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
@@ -381,6 +382,33 @@
|
||||
<artifactId>woodstox-core</artifactId>
|
||||
<version>5.3.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcprov</artifactId>
|
||||
<version>1.68.0</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.13.2</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
<version>4.5.13-talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
<version>4.4.14-talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.19-TALEND</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath>../../talend.studio.parent.pom</relativePath>
|
||||
</parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
@@ -12,8 +12,9 @@
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<dataquality.lib.version>8.0.9</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.10.1</fasterxml.jackson.version>
|
||||
<dataquality.lib.version>8.0.21</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
|
||||
<fasterxml.jackson.databind.version>2.13.2.2</fasterxml.jackson.databind.version>
|
||||
<!-- jackson dataformat and jaxb should use version 2.9.10 to make studio compatible with bonita -->
|
||||
<fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.version>
|
||||
</properties>
|
||||
|
||||
@@ -15,4 +15,4 @@ eclipse.p2.data.area=@config.dir/../p2/
|
||||
eclipse.p2.profile=profile
|
||||
default.update.site.url=https://update.talend.com/Studio/tos/
|
||||
|
||||
component.java.coordinates = org.talend.components:couchbase:1.17.1,org.talend.components:cosmosDB:1.17.1
|
||||
component.java.coordinates = org.talend.components:couchbase:1.27.11,org.talend.components:cosmosDB:1.27.11
|
||||
|
||||
@@ -290,11 +290,13 @@
|
||||
<configuration>
|
||||
<target>
|
||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
|
||||
<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${product.version}*</echo>
|
||||
<propertyregex property="unqualifiedVersion.short" input="${product.version}" regexp="^([0-9])\.([0-9])\.([0-9])" select="\1.\2" casesensitive="false" />
|
||||
<echo>unqualifiedVersion.short: ${unqualifiedVersion.short}</echo>
|
||||
<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${unqualifiedVersion.short}*</echo>
|
||||
<echo>buildQualifier=${buildQualifier}</echo>
|
||||
<echo>product.timestamp=${product.timestamp}</echo>
|
||||
<echo>version.full=${version.full}</echo>
|
||||
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
|
||||
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${unqualifiedVersion.short}*/about.mappings" id="aboutmappingspath_temp" />
|
||||
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
||||
<echo>aboutmappingspath=${aboutmappingspath}</echo>
|
||||
<loadfile property="about" srcFile="${aboutmappingspath}">
|
||||
@@ -456,29 +458,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>
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<daikon.version>0.31.11</daikon.version>
|
||||
<components.version>0.28.16</components.version>
|
||||
<daikon.version>0.31.12</daikon.version>
|
||||
<components.version>0.36.10</components.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>0.31.11</org.talend.daikon.crypto-utils.version>
|
||||
<org.talend.daikon.crypto-utils.version>0.31.12</org.talend.daikon.crypto-utils.version>
|
||||
<tycho.version>0.22.0</tycho.version>
|
||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||
<base.version>7.3.1</base.version>
|
||||
@@ -110,7 +110,7 @@
|
||||
</snapshots>
|
||||
<url>${opensourcesnapshot-repo.url}</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</repositories>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
@@ -139,12 +139,12 @@
|
||||
<artifactId>tycho-maven-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<extensions>true</extensions>
|
||||
</plugin>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-versions-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
</plugin>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
@@ -175,7 +175,7 @@
|
||||
</restrictTo>
|
||||
</filter>
|
||||
|
||||
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
|
||||
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
|
||||
<filter>
|
||||
<type>java-package</type>
|
||||
<id>javax.persistence</id>
|
||||
@@ -185,13 +185,13 @@
|
||||
</restrictTo>
|
||||
</filter>
|
||||
-->
|
||||
<!-- example 3: work around Equinox bug 348045
|
||||
<!-- 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>
|
||||
@@ -442,7 +442,7 @@
|
||||
</files>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
@@ -495,7 +495,7 @@
|
||||
<sequential>
|
||||
<echo>Signing @{jarFile}</echo>
|
||||
<exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
|
||||
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
|
||||
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
|
||||
</exec>
|
||||
</sequential>
|
||||
</ac:for>
|
||||
|
||||
Reference in New Issue
Block a user