Compare commits
10 Commits
patch/6.5.
...
maintenanc
| Author | SHA1 | Date | |
|---|---|---|---|
|
bc6688b32d | ||
|
|
09bf97aa10 | ||
|
|
e2932757b1 | ||
|
|
30e8796b4f | ||
|
|
a35ec060ba | ||
|
|
503581380d | ||
|
|
ae75d12bae | ||
|
|
39d1f2aed0 | ||
|
|
00e9844ef2 | ||
|
|
24f51a3df4 |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
@@ -20,37 +20,37 @@
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-common</artifactId>
|
||||
<version>1.6.5</version>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-semantic-model</artifactId>
|
||||
<version>1.6.5</version>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-semantic</artifactId>
|
||||
<version>1.6.5</version>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-statistics</artifactId>
|
||||
<version>1.6.5</version>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-record-linkage</artifactId>
|
||||
<version>3.3.5</version>
|
||||
<version>3.3.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-standardization</artifactId>
|
||||
<version>3.3.5</version>
|
||||
<version>3.3.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-sampling</artifactId>
|
||||
<version>2.4.5</version>
|
||||
<version>2.4.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
@@ -223,7 +223,7 @@
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</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>
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<components.version>0.19.9</components.version>
|
||||
<daikon.version>0.17.2</daikon.version>
|
||||
<components.version>0.19-SNAPSHOT</components.version>
|
||||
<daikon.version>0.17.3-SNAPSHOT</daikon.version>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
launcher.prefix=TOS_BD
|
||||
storage.prefix=${launcher.prefix}
|
||||
product.name=Talend Open Studio for Big Data
|
||||
product.branding.platform=org.talend.rcp.branding.tos.bigdata
|
||||
product.branding.id=${product.branding.platform}.product
|
||||
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
|
||||
product.website=http://www.talend.com\n
|
||||
storage.dir=tos
|
||||
storage.dir=tosbd
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
launcher.prefix=TOS_DI
|
||||
storage.prefix=${launcher.prefix}
|
||||
product.name=Talend Open Studio for Data Integration
|
||||
product.branding.platform=org.talend.rcp.branding.tos
|
||||
product.branding.id=${product.branding.platform}.product
|
||||
|
||||
@@ -10,3 +10,5 @@ osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
file.encoding=UTF-8
|
||||
eclipse.p2.data.area=@config.dir/../p2/
|
||||
eclipse.p2.profile=profile
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
launcher.prefix=TOS_DQ
|
||||
storage.prefix=${launcher.prefix}
|
||||
product.name=Talend Open Profiler
|
||||
product.branding.platform=org.talend.rcp.branding.top
|
||||
product.branding.id=${product.branding.platform}.product
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
launcher.prefix=TOS_ESB
|
||||
storage.prefix=TOS_ESB-Studio
|
||||
product.name=Talend Open Studio
|
||||
product.branding.platform=org.talend.rcp.branding.esbstandard
|
||||
product.branding.id=${product.branding.platform}.product
|
||||
|
||||
@@ -4,13 +4,10 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.mdm.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<properties>
|
||||
<product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
</properties>
|
||||
</project>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
launcher.prefix=TOS_MDM
|
||||
product.final.name.prefix=TOS_MDM-Studio
|
||||
storage.prefix=TOS_MDM-Studio
|
||||
product.name=Talend Open Studio for MDM
|
||||
product.branding.platform=org.talend.rcp.branding.tombundle
|
||||
product.branding.id=${product.branding.platform}.product
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
<product.final.name>${storage.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
<studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
|
||||
</properties>
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
</files>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
@@ -91,7 +91,7 @@
|
||||
<id>${project.artifactId}</id>
|
||||
</product>
|
||||
</products>
|
||||
</configuration>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@@ -118,7 +118,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.5.2</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
@@ -134,7 +134,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>eclipse-delta-pack</artifactId>
|
||||
<version>4.4.1</version>
|
||||
<version>4.4.1b</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
@@ -235,35 +235,35 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- <plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
<version>1.3.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-javajet</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<executable>java</executable>
|
||||
<workingDirectory>${studio.dir}</workingDirectory>
|
||||
<arguments>
|
||||
<argument>-Xmx1536m</argument>
|
||||
<argument>-XX:MaxPermSize=512m</argument>
|
||||
<argument>-classpath</argument>
|
||||
<argument>${studio.dir}/plugins/${equinox.build}</argument>
|
||||
<argument>org.eclipse.core.launcher.Main</argument>
|
||||
<argument>-application</argument>
|
||||
<argument>org.talend.designer.codegen.CodeGenInit</argument>
|
||||
<argument>-nosplash</argument>
|
||||
<argument>-consoleLog</argument>
|
||||
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
|
||||
</arguments>
|
||||
</configuration>
|
||||
<!-- <plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
<version>1.3.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-javajet</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<executable>java</executable>
|
||||
<workingDirectory>${studio.dir}</workingDirectory>
|
||||
<arguments>
|
||||
<argument>-Xmx1536m</argument>
|
||||
<argument>-XX:MaxPermSize=512m</argument>
|
||||
<argument>-classpath</argument>
|
||||
<argument>${studio.dir}/plugins/${equinox.build}</argument>
|
||||
<argument>org.eclipse.core.launcher.Main</argument>
|
||||
<argument>-application</argument>
|
||||
<argument>org.talend.designer.codegen.CodeGenInit</argument>
|
||||
<argument>-nosplash</argument>
|
||||
<argument>-consoleLog</argument>
|
||||
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
|
||||
</arguments>
|
||||
</configuration>
|
||||
</plugin>-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@@ -305,7 +305,7 @@
|
||||
<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" />
|
||||
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
||||
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
||||
<echo>aboutmappingspath=${aboutmappingspath}</echo>
|
||||
<loadfile property="about" srcFile="${aboutmappingspath}">
|
||||
<filterchain>
|
||||
@@ -503,29 +503,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>
|
||||
@@ -539,8 +539,7 @@
|
||||
<configuration>
|
||||
<target>
|
||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
|
||||
<propertyregex property="product.version.short" input="${product.version}" regexp="\." replace="" global="true" casesensitive="false" override="true" />
|
||||
<property name="product.build.path" value="${product.build.id}/${storage.dir}/V${product.version}${revision.filename}/${storage.dir}_${product.version.short}" />
|
||||
<property name="product.build.path" value="${product.build.id}/${storage.dir}/V${product.version}${revision.filename}" />
|
||||
<property name="product.dir" value="${storage}/${product.build.path}" />
|
||||
<mkdir dir="${product.dir}" />
|
||||
<echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<tycho.version>0.22.0</tycho.version>
|
||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||
<base.version>6.5.1</base.version>
|
||||
<base.version>6.5.2</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)-->
|
||||
@@ -149,12 +149,12 @@
|
||||
</environments>
|
||||
<filters>
|
||||
<!-- 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>
|
||||
<type>eclipse-plugin</type>
|
||||
<id>org.eclipse.ui.views.properties.tabbed</id>
|
||||
<restrictTo>
|
||||
<version>3.6.100.v20140519-0906</version>
|
||||
</restrictTo>
|
||||
</filter>-->
|
||||
<filter>
|
||||
<type>eclipse-plugin</type>
|
||||
@@ -164,22 +164,22 @@
|
||||
</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 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>
|
||||
<!-- example 3: work around Equinox bug 348045
|
||||
<filter>
|
||||
<type>p2-installable-unit</type>
|
||||
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
|
||||
<removeAll />
|
||||
</filter>
|
||||
-->
|
||||
</filters>
|
||||
</configuration>
|
||||
|
||||
Reference in New Issue
Block a user