Compare commits
1 Commits
patchrelea
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
ea272bb920 |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
@@ -369,7 +369,7 @@
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
<artifactId>snakeyaml</artifactId>
|
||||
<version>1.26</version>
|
||||
<version>1.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
|
||||
@@ -1,21 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath>../../talend.studio.parent.pom</relativePath>
|
||||
</parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.3.1-M5</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<dataquality.lib.version>8.0.9</dataquality.lib.version>
|
||||
<components.version>0.28.0-SNAPSHOT</components.version>
|
||||
<dataquality.lib.version>7.4.2-SNAPSHOT</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.10.1</fasterxml.jackson.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>
|
||||
<daikon.version>0.31.10-SNAPSHOT</daikon.version>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
14
build/talend.studio.bom/pom.xml
Normal file
14
build/talend.studio.bom/pom.xml
Normal file
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-bom</artifactId>
|
||||
<version>7.3.1-M5</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>studio bom</name>
|
||||
|
||||
<properties>
|
||||
<daikon.version>0.31.6</daikon.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
@@ -4,13 +4,13 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
<artifactId>talend-tos-p2-repo</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.3.1.PATCH</version>
|
||||
<version>7.3.1.M5</version>
|
||||
|
||||
<properties>
|
||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
|
||||
@@ -63,9 +63,6 @@
|
||||
<feature id="org.talend.updates.feature"/>
|
||||
<feature id="org.talend.utils.feature"/>
|
||||
<feature id="org.talend.dataquality.se.test.feature"/>
|
||||
<feature id="org.talend.help.di.feature"/>
|
||||
<feature id="org.talend.help.bd.feature"/>
|
||||
<feature id="org.talend.help.esb.feature"/>
|
||||
</features>
|
||||
|
||||
|
||||
|
||||
@@ -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.3.2-SNAPSHOT
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.3.1.PATCH</version>
|
||||
<version>7.3.1.M5</version>
|
||||
</project>
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.di.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.3.1.PATCH</version>
|
||||
<version>7.3.1.M5</version>
|
||||
</project>
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.dq.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.3.1.PATCH</version>
|
||||
<version>7.3.1.M5</version>
|
||||
</project>
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.esb.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.3.1.PATCH</version>
|
||||
<version>7.3.1.M5</version>
|
||||
</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-M5</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,25 +3,20 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<version>7.3.1-M5</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<components.version>0.28.16</components.version>
|
||||
<daikon.version>0.31.10</daikon.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.10</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>
|
||||
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<osgi.compatible.version>${base.version}</osgi.compatible.version>
|
||||
<osgi.compatible.version>${base.version}.M5</osgi.compatible.version>
|
||||
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<maven.compatible.version>${base.version}</maven.compatible.version>
|
||||
<maven.compatible.version>${base.version}-M5</maven.compatible.version>
|
||||
<repo.type>Release</repo.type>
|
||||
<doc.version>7.3.1-SNAPSHOT</doc.version>
|
||||
<doc.version>7.2.1-SNAPSHOT</doc.version>
|
||||
<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>
|
||||
@@ -35,8 +30,8 @@
|
||||
<equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
|
||||
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
|
||||
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
|
||||
<tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}.PATCH/talend-tos-p2-repo-${osgi.compatible.version}.PATCH.zip-unzip/</tos-p2-repo.url>
|
||||
<tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}-PATCH/dependencies.p2.tos-${maven.compatible.version}-PATCH.zip-unzip/</tos-deps-p2-repo.url>
|
||||
<tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-p2-repo.url>
|
||||
<tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-p2-repo.url>
|
||||
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
|
||||
<osgi.ws>win32</osgi.ws>
|
||||
<osgi.os>win32</osgi.os>
|
||||
@@ -160,12 +155,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>
|
||||
@@ -175,22 +170,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>
|
||||
@@ -276,8 +271,8 @@
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<properties>
|
||||
<release.suffix>-PATCH</release.suffix>
|
||||
<revision.filename>PATCH</revision.filename>
|
||||
<release.suffix>-SNAPSHOT</release.suffix>
|
||||
<revision.filename>SNAPSHOT</revision.filename>
|
||||
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
|
||||
</properties>
|
||||
<build>
|
||||
|
||||
Reference in New Issue
Block a user