Compare commits

...

7 Commits

Author SHA1 Message Date
Irene Wang
bc6688b32d Update Mac launcher version 2019-06-24 11:46:43 +02:00
Irene Wang
09bf97aa10 DEVOPS-2742 Allow naming ESB and MDM ZIPs differently 2019-01-11 12:46:41 +01:00
Irene Wang
e2932757b1 DEVOPS-2742 Package TOS MDM and ESB in final form during nightly builds 2018-12-31 10:07:03 +01:00
qiongli
30e8796b4f bugfix(TDQ-15911) add 2 parameters to fix NPE (#140) 2018-11-12 11:28:34 +08:00
nrousseau
a35ec060ba fix(TUP-19313) fix startup on mac (#115) 2018-05-09 17:40:21 +08:00
Ivan Gonchar
503581380d chore: bump daikon version to 0.17.3-SNAPSHOT (#97) 2018-03-05 23:53:00 +08:00
Pierre Teyssier
ae75d12bae Update tcomp back to snapshot 2018-02-23 16:55:20 +08:00
9 changed files with 67 additions and 65 deletions

View File

@@ -9,8 +9,8 @@
<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>

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -10,7 +10,4 @@
<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>

View File

@@ -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

View File

@@ -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>