Compare commits
2 Commits
release/8.
...
release/6.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57cca2cd54 | ||
|
|
9787cc8e01 |
@@ -5,14 +5,14 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<components.version>0.19.0</components.version>
|
||||
<components.version>0.19.2</components.version>
|
||||
<daikon.version>0.17.0</daikon.version>
|
||||
</properties>
|
||||
|
||||
@@ -234,7 +234,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,7 +5,7 @@
|
||||
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</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.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.4.1-SNAPSHOT</version>
|
||||
<version>6.4.1</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
@@ -12,10 +12,10 @@
|
||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||
<base.version>6.4.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}-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>${base.version}-SNAPSHOT</maven.compatible.version>
|
||||
<repo.type>Snapshot</repo.type>
|
||||
<maven.compatible.version>${base.version}</maven.compatible.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>
|
||||
@@ -35,7 +35,7 @@
|
||||
<osgi.ws>win32</osgi.ws>
|
||||
<osgi.os>win32</osgi.os>
|
||||
<osgi.arch>x86</osgi.arch>
|
||||
<strictVersions>true</strictVersions>
|
||||
<strictVersions>false</strictVersions>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
@@ -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