Compare commits
40 Commits
master
...
release/8.
| Author | SHA1 | Date | |
|---|---|---|---|
|
6049837de0 | ||
|
|
115c035f18 | ||
|
|
22f981c99f | ||
|
|
c8fbdc19e8 | ||
|
|
afe006376c | ||
|
|
c18002c20f | ||
|
|
56aacbd26d | ||
|
|
54b2c1cfa0 | ||
|
|
50d15ecce9 | ||
|
|
a3ec4b77d2 | ||
|
|
e6d037cb57 | ||
|
|
f174e30acf | ||
|
|
25f720e67b | ||
|
|
b3d21bde5c | ||
|
|
123981fb94 | ||
|
|
5bb46c5a84 | ||
|
|
cb06d0ec37 | ||
|
|
76d7abc7a7 | ||
|
|
142a0eb357 | ||
|
|
645df3a00e | ||
|
|
4d52ca3d76 | ||
|
|
479518aef1 | ||
|
|
922f830b48 | ||
|
|
59ba1cce06 | ||
|
|
b6b14b8a96 | ||
|
|
69f48ec968 | ||
|
|
59297dd5a8 | ||
|
|
9500ec33ef | ||
|
|
241111a35d | ||
|
|
e9009d45bd | ||
|
|
bfc9c7364c | ||
|
|
adf22f763f | ||
|
|
2d0905ff00 | ||
|
|
12a0580237 | ||
|
|
9827d80c4a | ||
|
|
ca6eefb80c | ||
|
|
ec9f75fc13 | ||
|
|
486ac12331 | ||
|
|
5ef4ec9663 | ||
|
|
a0eb63bd5b |
@@ -112,7 +112,7 @@
|
||||
<dependency>
|
||||
<groupId>com.cedarsoftware</groupId>
|
||||
<artifactId>json-io</artifactId>
|
||||
<version>4.9.9-TALEND</version>
|
||||
<version>4.13.0-TALEND</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -143,12 +143,12 @@
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.15-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.15-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Avro with minimum depdencies -->
|
||||
@@ -351,7 +351,7 @@
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcprov</artifactId>
|
||||
<version>1.68.0</version>
|
||||
<version>1.69.0</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<dataquality.lib.version>9.0.2</dataquality.lib.version>
|
||||
<dataquality.lib.version>9.0.6</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.11.4</fasterxml.jackson.version>
|
||||
</properties>
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
<artifactId>talend-tos-p2-repo</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
||||
|
||||
<properties>
|
||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" version="7.4.1.qualifier" useFeatures="true" includeLaunchers="false">
|
||||
<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" version="8.0.1.qualifier" useFeatures="true" includeLaunchers="false">
|
||||
|
||||
<configIni use="default">
|
||||
<linux>config.ini</linux>
|
||||
|
||||
@@ -10,4 +10,5 @@
|
||||
|
||||
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
|
||||
<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">
|
||||
|
||||
<configIni use="default">
|
||||
<linux>config.ini</linux>
|
||||
|
||||
@@ -10,4 +10,5 @@
|
||||
|
||||
<artifactId>org.talend.studio.tos.di.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
|
||||
<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">
|
||||
|
||||
<configIni use="default">
|
||||
<linux>config.ini</linux>
|
||||
|
||||
@@ -10,4 +10,5 @@
|
||||
|
||||
<artifactId>org.talend.studio.tos.dq.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
|
||||
<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">
|
||||
|
||||
<configIni use="default">
|
||||
<linux>config.ini</linux>
|
||||
|
||||
@@ -10,4 +10,5 @@
|
||||
|
||||
<artifactId>org.talend.studio.tos.esb.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
|
||||
<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">
|
||||
|
||||
<configIni use="default">
|
||||
<linux>config.ini</linux>
|
||||
|
||||
@@ -187,26 +187,6 @@
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-studio-add-conf</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>unpack</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>studio-add-conf</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<type>zip</type>
|
||||
<classifier />
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}/configuration</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-notice-txt</id>
|
||||
<phase>package</phase>
|
||||
@@ -332,11 +312,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="version.majorminor" input="${product.version}" regexp="^([0-9_]+)\.([0-9_]+)\.(.*)" select="\1.\2" casesensitive="false" />
|
||||
<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${version.majorminor}*</echo>
|
||||
<echo>buildQualifier=${buildQualifier}</echo>
|
||||
<echo>product.timestamp=${product.timestamp}</echo>
|
||||
<echo>version.majorminor=${version.majorminor}</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}_${version.majorminor}*/about.mappings" id="aboutmappingspath_temp" />
|
||||
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
||||
<echo>aboutmappingspath=${aboutmappingspath}</echo>
|
||||
<loadfile property="about" srcFile="${aboutmappingspath}">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user