Compare commits
7 Commits
master
...
patch/7.3.
| Author | SHA1 | Date | |
|---|---|---|---|
|
303d60d7a7 | ||
|
|
a87727f940 | ||
|
|
7aefe14622 | ||
|
|
a8732814cc | ||
|
|
c5fb502c21 | ||
|
|
d95215f5c7 | ||
|
|
f9e05fa54c |
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.repo</groupId>
|
<groupId>org.talend.repo</groupId>
|
||||||
<artifactId>dependencies.p2</artifactId>
|
<artifactId>dependencies.p2</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH2</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>dependencies.p2.tos</artifactId>
|
<artifactId>dependencies.p2.tos</artifactId>
|
||||||
|
|||||||
@@ -1,168 +1,168 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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">
|
<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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.talend.repo</groupId>
|
<groupId>org.talend.repo</groupId>
|
||||||
<artifactId>dependencies.p2</artifactId>
|
<artifactId>dependencies.p2</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH2</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||||
<components.version>0.28.1</components.version>
|
<components.version>0.28.4</components.version>
|
||||||
<dataquality.lib.version>8.0.0</dataquality.lib.version>
|
<dataquality.lib.version>8.0.1</dataquality.lib.version>
|
||||||
<fasterxml.jackson.version>2.10.1</fasterxml.jackson.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 -->
|
<!-- 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>
|
<fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.version>
|
||||||
<daikon.version>0.31.10</daikon.version>
|
<daikon.version>0.31.10</daikon.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<snapshotRepository>
|
<snapshotRepository>
|
||||||
<id>talend_nexus_deployment</id>
|
<id>talend_nexus_deployment</id>
|
||||||
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||||
<snapshots><enabled>true</enabled></snapshots>
|
<snapshots><enabled>true</enabled></snapshots>
|
||||||
<releases><enabled>false</enabled></releases>
|
<releases><enabled>false</enabled></releases>
|
||||||
</snapshotRepository>
|
</snapshotRepository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>talend_nexus_deployment</id>
|
<id>talend_nexus_deployment</id>
|
||||||
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||||
<snapshots><enabled>false</enabled></snapshots>
|
<snapshots><enabled>false</enabled></snapshots>
|
||||||
<releases><enabled>true</enabled></releases>
|
<releases><enabled>true</enabled></releases>
|
||||||
</repository>
|
</repository>
|
||||||
</distributionManagement>
|
</distributionManagement>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>talend_open</id>
|
<id>talend_open</id>
|
||||||
<releases>
|
<releases>
|
||||||
<enabled>true</enabled>
|
<enabled>true</enabled>
|
||||||
</releases>
|
</releases>
|
||||||
<snapshots>
|
<snapshots>
|
||||||
<enabled>false</enabled>
|
<enabled>false</enabled>
|
||||||
</snapshots>
|
</snapshots>
|
||||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>talend_open_snapshots</id>
|
<id>talend_open_snapshots</id>
|
||||||
<releases>
|
<releases>
|
||||||
<enabled>false</enabled>
|
<enabled>false</enabled>
|
||||||
</releases>
|
</releases>
|
||||||
<snapshots>
|
<snapshots>
|
||||||
<enabled>true</enabled>
|
<enabled>true</enabled>
|
||||||
</snapshots>
|
</snapshots>
|
||||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
<version>2.10</version>
|
<version>2.10</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>copy-dependencies</id>
|
<id>copy-dependencies</id>
|
||||||
<phase>generate-resources</phase>
|
<phase>generate-resources</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>copy-dependencies</goal>
|
<goal>copy-dependencies</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
|
<outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
|
||||||
<excludeTransitive>true</excludeTransitive>
|
<excludeTransitive>true</excludeTransitive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
<version>1.8</version>
|
<version>1.8</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>zip-p2-repo</id>
|
<id>zip-p2-repo</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>run</goal>
|
<goal>run</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<target>
|
<target>
|
||||||
<zip destfile="${project.build.directory}/${project.artifactId}.zip">
|
<zip destfile="${project.build.directory}/${project.artifactId}.zip">
|
||||||
<fileset dir="${project.build.directory}/output">
|
<fileset dir="${project.build.directory}/output">
|
||||||
<include name="**/*" />
|
<include name="**/*" />
|
||||||
</fileset>
|
</fileset>
|
||||||
</zip>
|
</zip>
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.groovy.maven</groupId>
|
<groupId>org.codehaus.groovy.maven</groupId>
|
||||||
<artifactId>gmaven-plugin</artifactId>
|
<artifactId>gmaven-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>choose-target-repository</id>
|
<id>choose-target-repository</id>
|
||||||
<phase>initialize</phase>
|
<phase>initialize</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>execute</goal>
|
<goal>execute</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>
|
<source>
|
||||||
if (project.version.endsWith("-SNAPSHOT")){
|
if (project.version.endsWith("-SNAPSHOT")){
|
||||||
project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
|
project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
project.properties.targetrepository = project.distributionManagement.repository.url;
|
project.properties.targetrepository = project.distributionManagement.repository.url;
|
||||||
}
|
}
|
||||||
</source>
|
</source>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
<version>2.8.2</version>
|
<version>2.8.2</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>deploy_p2_zip</id>
|
<id>deploy_p2_zip</id>
|
||||||
<phase>deploy</phase>
|
<phase>deploy</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>deploy-file</goal>
|
<goal>deploy-file</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<packaging>zip</packaging>
|
<packaging>zip</packaging>
|
||||||
<generatePom>true</generatePom>
|
<generatePom>true</generatePom>
|
||||||
<url>${targetrepository}</url>
|
<url>${targetrepository}</url>
|
||||||
<repositoryId>talend_nexus_deployment</repositoryId>
|
<repositoryId>talend_nexus_deployment</repositoryId>
|
||||||
<artifactId>${project.artifactId}</artifactId>
|
<artifactId>${project.artifactId}</artifactId>
|
||||||
<groupId>org.talend.repo</groupId>
|
<groupId>org.talend.repo</groupId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
<file>${project.build.directory}/${project.artifactId}.zip</file>
|
<file>${project.build.directory}/${project.artifactId}.zip</file>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho.extras</groupId>
|
<groupId>org.eclipse.tycho.extras</groupId>
|
||||||
<artifactId>tycho-p2-extras-plugin</artifactId>
|
<artifactId>tycho-p2-extras-plugin</artifactId>
|
||||||
<version>0.22.0</version>
|
<version>0.22.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>create-p2-repository</id>
|
<id>create-p2-repository</id>
|
||||||
<phase>prepare-package</phase>
|
<phase>prepare-package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>publish-features-and-bundles</goal>
|
<goal>publish-features-and-bundles</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
|
<metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
|
||||||
<artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
|
<artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
|
||||||
<sourceLocation>${project.build.directory}/p2</sourceLocation>
|
<sourceLocation>${project.build.directory}/p2</sourceLocation>
|
||||||
<compress>true</compress>
|
<compress>true</compress>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>studio-bom</artifactId>
|
<artifactId>studio-bom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>studio bom</name>
|
<name>studio bom</name>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -456,29 +456,29 @@
|
|||||||
<timestampProvider>default</timestampProvider>
|
<timestampProvider>default</timestampProvider>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!--
|
<!--
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
<version>1.7</version>
|
<version>1.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>-->
|
<execution>-->
|
||||||
<!-- Attach product ZIP to Maven artifact -->
|
<!-- Attach product ZIP to Maven artifact -->
|
||||||
<!-- <id>attach-artifacts</id>
|
<!-- <id>attach-artifacts</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>attach-artifact</goal>
|
<goal>attach-artifact</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<artifacts>
|
<artifacts>
|
||||||
<artifact>
|
<artifact>
|
||||||
<file>${project.build.directory}/products/${product.final.name}.zip</file>
|
<file>${project.build.directory}/products/${product.final.name}.zip</file>
|
||||||
<type>product</type>
|
<type>product</type>
|
||||||
</artifact>
|
</artifact>
|
||||||
</artifacts>
|
</artifacts>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>-->
|
</plugin>-->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@@ -12,10 +12,10 @@
|
|||||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||||
<base.version>7.3.1</base.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 is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
|
||||||
<osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
|
<osgi.compatible.version>${base.version}</osgi.compatible.version>
|
||||||
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||||
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
|
<maven.compatible.version>${base.version}</maven.compatible.version>
|
||||||
<repo.type>Snapshot</repo.type>
|
<repo.type>Release</repo.type>
|
||||||
<doc.version>7.3.1-SNAPSHOT</doc.version>
|
<doc.version>7.3.1-SNAPSHOT</doc.version>
|
||||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
<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.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
|
||||||
@@ -31,12 +31,12 @@
|
|||||||
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
|
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
|
||||||
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-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}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-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>
|
<tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/7.3.1-PATCH2/dependencies.p2.tos-7.3.1-PATCH2.zip-unzip/</tos-deps-p2-repo.url>
|
||||||
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
|
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
|
||||||
<osgi.ws>win32</osgi.ws>
|
<osgi.ws>win32</osgi.ws>
|
||||||
<osgi.os>win32</osgi.os>
|
<osgi.os>win32</osgi.os>
|
||||||
<osgi.arch>x86_64</osgi.arch>
|
<osgi.arch>x86_64</osgi.arch>
|
||||||
<strictVersions>true</strictVersions>
|
<strictVersions>false</strictVersions>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
@@ -105,7 +105,7 @@
|
|||||||
</snapshots>
|
</snapshots>
|
||||||
<url>${opensourcesnapshot-repo.url}</url>
|
<url>${opensourcesnapshot-repo.url}</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
@@ -134,12 +134,12 @@
|
|||||||
<artifactId>tycho-maven-plugin</artifactId>
|
<artifactId>tycho-maven-plugin</artifactId>
|
||||||
<version>${tycho.version}</version>
|
<version>${tycho.version}</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-versions-plugin</artifactId>
|
<artifactId>tycho-versions-plugin</artifactId>
|
||||||
<version>${tycho.version}</version>
|
<version>${tycho.version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>target-platform-configuration</artifactId>
|
<artifactId>target-platform-configuration</artifactId>
|
||||||
@@ -155,12 +155,12 @@
|
|||||||
</environments>
|
</environments>
|
||||||
<filters>
|
<filters>
|
||||||
<!-- restrict version of a bundle -->
|
<!-- restrict version of a bundle -->
|
||||||
<!--<filter>
|
<!--<filter>
|
||||||
<type>eclipse-plugin</type>
|
<type>eclipse-plugin</type>
|
||||||
<id>org.eclipse.ui.views.properties.tabbed</id>
|
<id>org.eclipse.ui.views.properties.tabbed</id>
|
||||||
<restrictTo>
|
<restrictTo>
|
||||||
<version>3.6.100.v20140519-0906</version>
|
<version>3.6.100.v20140519-0906</version>
|
||||||
</restrictTo>
|
</restrictTo>
|
||||||
</filter>-->
|
</filter>-->
|
||||||
<filter>
|
<filter>
|
||||||
<type>eclipse-plugin</type>
|
<type>eclipse-plugin</type>
|
||||||
@@ -170,23 +170,23 @@
|
|||||||
</restrictTo>
|
</restrictTo>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
|
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
|
||||||
<filter>
|
<filter>
|
||||||
<type>java-package</type>
|
<type>java-package</type>
|
||||||
<id>javax.persistence</id>
|
<id>javax.persistence</id>
|
||||||
<restrictTo>
|
<restrictTo>
|
||||||
<type>eclipse-plugin</type>
|
<type>eclipse-plugin</type>
|
||||||
<id>javax.persistence</id>
|
<id>javax.persistence</id>
|
||||||
</restrictTo>
|
</restrictTo>
|
||||||
</filter>
|
</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>
|
</filters>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@@ -437,7 +437,7 @@
|
|||||||
</files>
|
</files>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
@@ -490,7 +490,7 @@
|
|||||||
<sequential>
|
<sequential>
|
||||||
<echo>Signing @{jarFile}</echo>
|
<echo>Signing @{jarFile}</echo>
|
||||||
<exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
|
<exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
|
||||||
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
|
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
|
||||||
</exec>
|
</exec>
|
||||||
</sequential>
|
</sequential>
|
||||||
</ac:for>
|
</ac:for>
|
||||||
|
|||||||
Reference in New Issue
Block a user