Compare commits
54 Commits
release/6.
...
feature/TU
| Author | SHA1 | Date | |
|---|---|---|---|
|
8c86d1f723 | ||
|
|
cdc9203eb6 | ||
|
|
3fffa234c5 | ||
|
|
7339347382 | ||
|
|
51c4f2f333 | ||
|
|
03df29ee5c | ||
|
|
de76aaceb6 | ||
|
|
d4fe953cbd | ||
|
|
9291346017 | ||
|
|
9589ae8785 | ||
|
|
0aed6ad7e5 | ||
|
|
a93e354860 | ||
|
|
e249a19463 | ||
|
|
0e58fd9d05 | ||
|
|
a08363ca2c | ||
|
|
58d5f2ef66 | ||
|
|
63eea05636 | ||
|
|
88822d74b2 | ||
|
|
4d83f9f46f | ||
|
|
f1557728ad | ||
|
|
0a65489f9f | ||
|
|
e5301d88d1 | ||
|
|
14a0b2359a | ||
|
|
1d8650e5ed | ||
|
|
078f39ddd1 | ||
|
|
10008c4912 | ||
|
|
4faaeebbfb | ||
|
|
2eb1193821 | ||
|
|
cfe84c40cd | ||
|
|
e977378db5 | ||
|
|
34771bd8bb | ||
|
|
a52c6cb24a | ||
|
|
1ebdb789f1 | ||
|
|
b6dc94588c | ||
|
|
8b9dee3087 | ||
|
|
dd8c6a6821 | ||
|
|
f33840c2e3 | ||
|
|
8b7fffc9df | ||
|
|
fa9cf6a41f | ||
|
|
600e2a8c42 | ||
|
|
dcaaca9101 | ||
|
|
21e362b8a6 | ||
|
|
a257f6245b | ||
|
|
8dcd480c5c | ||
|
|
8f449d059d | ||
|
|
1c9ebd1912 | ||
|
|
024729e359 | ||
|
|
350e6a6d4a | ||
|
|
9e715eef65 | ||
|
|
ffda81595c | ||
|
|
54ddbeb75e | ||
|
|
c0e37278c0 | ||
|
|
5d8400ebab | ||
|
|
0502565281 |
@@ -3,5 +3,5 @@
|
||||
3) eclipse export fails to update the content.xml and artifact so we need to regenerate the p2 repository with the following command
|
||||
Applications/java/eclipse/4.2/eclipse/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -metadataRepository file:/Applications/java/talend/TargetPlatformE44/p2site/ -artifactRepository file:/Applications/java/talend/TargetPlatformE44/p2site/ -source /Applications/java/talend/TargetPlatformE44 -config ANY -publishArtifacts
|
||||
4) Deploy ZIP of target to Nexus (features/, plugins/, artifacts.jar, contents.jar at the root):
|
||||
mvn deploy:deploy-file -Dfile=/Applications/java/talend/TargetPlatformE44/p2site/TargetPlatformE44.zip -DgroupId=org.talend.repo -DartifactId=talend-eclipse-p2-repo -Dversion=4.4.1-SNAPSHOT -Dpackaging=zip -Durl=https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot -DrepositoryId=talend_nexus_deployment
|
||||
Nexus p2 repository will be available at https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip/plugins/
|
||||
mvn deploy:deploy-file -Dfile=/Applications/java/talend/TargetPlatformE44/p2site/TargetPlatformE44.zip -DgroupId=org.talend.repo -DartifactId=talend-eclipse-p2-repo -Dversion=4.4.1-SNAPSHOT -Dpackaging=zip -Durl=http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot -DrepositoryId=talend_nexus_deployment
|
||||
Nexus p2 repository will be available at http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip/plugins/
|
||||
|
||||
@@ -4,6 +4,6 @@
|
||||
<properties size='0'>
|
||||
</properties>
|
||||
<children size='1'>
|
||||
<child location='https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
|
||||
<child location='http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
|
||||
</children>
|
||||
</repository>
|
||||
@@ -5,6 +5,6 @@
|
||||
<property name='p2.atomic.composite.loading' value='true'/>
|
||||
</properties>
|
||||
<children size='1'>
|
||||
<child location='https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
|
||||
<child location='http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
|
||||
</children>
|
||||
</repository>
|
||||
@@ -5,47 +5,159 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.url</groupId>
|
||||
<artifactId>pax-url-aether</artifactId>
|
||||
<version>2.4.5-Talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.common</artifactId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.4.3-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.record.linkage</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.1.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.standardization</artifactId>
|
||||
<version>3.0.3-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.sampling</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<version>2.1.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
<artifactId>daikon</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<!-- daikon dependencies-->
|
||||
<dependency>
|
||||
<groupId>com.cedarsoftware</groupId>
|
||||
<artifactId>json-io</artifactId>
|
||||
<version>4.1.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson-->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
<version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson-->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
<!-- end of daikon dependencies-->
|
||||
|
||||
<!-- ========================= -->
|
||||
<!-- Added by TDM -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.13</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.13</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Avro and dependencies -->
|
||||
<!-- To be replaced when avro will be available -->
|
||||
<!-- from servicemix with less dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro</artifactId>
|
||||
<version>1.7.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.thoughtworks.paranamer</groupId>
|
||||
<artifactId>paranamer</artifactId>
|
||||
<version>2.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.livesense</groupId>
|
||||
<artifactId>org.liveSense.fragment.sun.misc</artifactId>
|
||||
<version>1.0.5</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Keep version in sync with slf4j-api -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- End added by TDM -->
|
||||
<!-- ========================= -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-api</artifactId>
|
||||
<version>0.1-SNAPSHOT</version>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common</artifactId>
|
||||
<version>0.1-SNAPSHOT</version>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common-oauth</artifactId>
|
||||
<version>0.1-SNAPSHOT</version>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-salesforce</artifactId>
|
||||
<version>0.1-SNAPSHOT</version>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these single dependencies -->
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -5,19 +5,19 @@
|
||||
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</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>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<snapshots><enabled>false</enabled></snapshots>
|
||||
<releases><enabled>true</enabled></releases>
|
||||
</repository>
|
||||
@@ -32,7 +32,7 @@
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
@@ -42,7 +42,7 @@
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
@@ -27,7 +27,7 @@
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
@@ -34,7 +34,7 @@
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<profiles>
|
||||
|
||||
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms64m
|
||||
-Xmx768m
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-Xdock:icon=../Resources/talend.icns
|
||||
-XstartOnFirstThread
|
||||
-Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms64m
|
||||
-Xmx768m
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-Xdock:icon=../Resources/talend.icns
|
||||
-XstartOnFirstThread
|
||||
-Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms64m
|
||||
-Xmx768m
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-Xdock:icon=../Resources/talend.icns
|
||||
-XstartOnFirstThread
|
||||
-Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms64m
|
||||
-Xmx768m
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-Xdock:icon=../Resources/talend.icns
|
||||
-XstartOnFirstThread
|
||||
-Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms64m
|
||||
-Xmx768m
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-Xdock:icon=../Resources/talend.icns
|
||||
-XstartOnFirstThread
|
||||
-Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
@@ -30,12 +30,12 @@
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
|
||||
<product.final.name>${launcher.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>
|
||||
@@ -118,7 +118,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
|
||||
<version>4.4.1a</version>
|
||||
<version>${base.version}</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
|
||||
6
pom.xml
6
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
@@ -31,7 +31,7 @@
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
||||
@@ -3,27 +3,27 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.1.0</version>
|
||||
<version>6.2.0-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.1.0</base.version>
|
||||
<base.version>6.2.0</base.version>
|
||||
<!-- osgi.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<osgi.version>6.1.0</osgi.version>
|
||||
<osgi.version>${base.version}-SNAPSHOT</osgi.version>
|
||||
<!-- maven.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<maven.version>6.1.0</maven.version>
|
||||
<repo.type>Release</repo.type>
|
||||
<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>
|
||||
<maven.version>${base.version}-SNAPSHOT</maven.version>
|
||||
<repo.type>Snapshot</repo.type>
|
||||
<talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
|
||||
<talend.nexus.url>http://${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
|
||||
<talend.nexus.p2unzip.url>http://${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>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.1.0-SNAPSHOT/talend-eclipse-p2-repo-6.1.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
|
||||
<babel-repo.url>${opensourcesnapshot-unziprepo.url}/talend-babel-p2-repo/4.4.1-SNAPSHOT/talend-babel-p2-repo-4.4.1-SNAPSHOT.zip-unzip</babel-repo.url>
|
||||
<doc-repo.url>${opensourcerelease-unziprepo.url}/talend-doc-p2-repo/6.1.0/talend-doc-p2-repo-6.1.0.zip-unzip/</doc-repo.url>
|
||||
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.1.1-SNAPSHOT/talend-doc-p2-repo-6.1.1-SNAPSHOT.zip-unzip/</doc-repo.url>
|
||||
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/6.5.0a/bonita-community-p2-repo-6.5.0a.zip-unzip/</bonita-open-repo.url>
|
||||
<equinox.build>org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</equinox.build>
|
||||
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
|
||||
@@ -138,7 +138,7 @@
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<executionEnvironmentDefault>JavaSE-1.7</executionEnvironmentDefault>
|
||||
<executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
|
||||
<environments>
|
||||
<environment>
|
||||
<os>${osgi.os}</os>
|
||||
@@ -189,9 +189,9 @@
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
|
||||
<compilerVersion>1.7</compilerVersion>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
<compilerVersion>1.8</compilerVersion>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
Reference in New Issue
Block a user