Compare commits
35 Commits
cmeng/stig
...
release/8.
| Author | SHA1 | Date | |
|---|---|---|---|
|
6049837de0 | ||
|
|
115c035f18 | ||
|
|
22f981c99f | ||
|
|
c8fbdc19e8 | ||
|
|
afe006376c | ||
|
|
c18002c20f | ||
|
|
56aacbd26d | ||
|
|
54b2c1cfa0 | ||
|
|
50d15ecce9 | ||
|
|
a3ec4b77d2 | ||
|
|
e6d037cb57 | ||
|
|
f174e30acf | ||
|
|
25f720e67b | ||
|
|
b3d21bde5c | ||
|
|
123981fb94 | ||
|
|
5bb46c5a84 | ||
|
|
cb06d0ec37 | ||
|
|
76d7abc7a7 | ||
|
|
142a0eb357 | ||
|
|
645df3a00e | ||
|
|
4d52ca3d76 | ||
|
|
479518aef1 | ||
|
|
922f830b48 | ||
|
|
59ba1cce06 | ||
|
|
b6b14b8a96 | ||
|
|
69f48ec968 | ||
|
|
59297dd5a8 | ||
|
|
9500ec33ef | ||
|
|
241111a35d | ||
|
|
e9009d45bd | ||
|
|
bfc9c7364c | ||
|
|
adf22f763f | ||
|
|
2d0905ff00 | ||
|
|
12a0580237 | ||
|
|
9827d80c4a |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
@@ -112,7 +112,7 @@
|
||||
<dependency>
|
||||
<groupId>com.cedarsoftware</groupId>
|
||||
<artifactId>json-io</artifactId>
|
||||
<version>4.9.9-TALEND</version>
|
||||
<version>4.13.0-TALEND</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -143,12 +143,12 @@
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.15-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.15-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Avro with minimum depdencies -->
|
||||
@@ -300,7 +300,7 @@
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.14</version>
|
||||
</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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../talend.studio.parent.pom</relativePath>
|
||||
</parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
@@ -12,7 +12,7 @@
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<dataquality.lib.version>9.0.2</dataquality.lib.version>
|
||||
<dataquality.lib.version>9.0.6</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.11.4</fasterxml.jackson.version>
|
||||
</properties>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</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>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</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>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</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>8.0.1</version>
|
||||
<version>8.0.1-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>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -187,26 +187,6 @@
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-studio-add-conf</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>unpack</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>studio-add-conf</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<type>zip</type>
|
||||
<classifier />
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}/configuration</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-notice-txt</id>
|
||||
<phase>package</phase>
|
||||
@@ -332,11 +312,13 @@
|
||||
<configuration>
|
||||
<target>
|
||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
|
||||
<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${product.version}*</echo>
|
||||
<propertyregex property="version.majorminor" input="${product.version}" regexp="^([0-9_]+)\.([0-9_]+)\.(.*)" select="\1.\2" casesensitive="false" />
|
||||
<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${version.majorminor}*</echo>
|
||||
<echo>buildQualifier=${buildQualifier}</echo>
|
||||
<echo>product.timestamp=${product.timestamp}</echo>
|
||||
<echo>version.majorminor=${version.majorminor}</echo>
|
||||
<echo>version.full=${version.full}</echo>
|
||||
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
|
||||
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${version.majorminor}*/about.mappings" id="aboutmappingspath_temp" />
|
||||
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
||||
<echo>aboutmappingspath=${aboutmappingspath}</echo>
|
||||
<loadfile property="about" srcFile="${aboutmappingspath}">
|
||||
@@ -492,29 +474,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>
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,31 +3,31 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>8.0.1</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<components.version>0.37.0</components.version>
|
||||
<tacokit.components.version>1.26.0</tacokit.components.version>
|
||||
<component-runtime.version>1.37.0</component-runtime.version>
|
||||
<component-runtime.version>1.42.0</component-runtime.version>
|
||||
<components.version>0.37.5</components.version>
|
||||
<tacokit.components.version>1.31.1</tacokit.components.version>
|
||||
<m2.fasterxml.jackson.version>2.11.4</m2.fasterxml.jackson.version>
|
||||
<jackson-codehaus.version>1.9.15-TALEND</jackson-codehaus.version>
|
||||
<jackson-codehaus.version>1.9.16-TALEND</jackson-codehaus.version>
|
||||
<daikon.version>0.31.12</daikon.version>
|
||||
<slf4j-api.version>1.7.29</slf4j-api.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.12</org.talend.daikon.crypto-utils.version>
|
||||
<studio-utils.version>1.0.6</studio-utils.version>
|
||||
<studio-utils.version>1.0.8</studio-utils.version>
|
||||
<compcache.creator.version>1.0.0</compcache.creator.version>
|
||||
<tycho.version>1.7.0</tycho.version>
|
||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||
<base.version>8.0.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}-SNAPSHOT</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>
|
||||
<repo.type>Release</repo.type>
|
||||
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
|
||||
<repo.type>Snapshot</repo.type>
|
||||
<doc.version>7.3.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>
|
||||
@@ -44,7 +44,7 @@
|
||||
<osgi.ws>win32</osgi.ws>
|
||||
<osgi.os>win32</osgi.os>
|
||||
<osgi.arch>x86_64</osgi.arch>
|
||||
<strictVersions>false</strictVersions>
|
||||
<strictVersions>true</strictVersions>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
@@ -153,37 +153,37 @@
|
||||
</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>
|
||||
<id>org.eclipse.jdt.core</id>
|
||||
<restrictTo>
|
||||
<version>3.26.0.v20210609-0549</version>
|
||||
</restrictTo>
|
||||
<!-- <filter>
|
||||
<type>eclipse-plugin</type>
|
||||
<id>org.eclipse.jdt.core</id>
|
||||
<restrictTo>
|
||||
<version>3.26.0.v20210609-0549</version>
|
||||
</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>
|
||||
@@ -459,6 +459,7 @@
|
||||
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
|
||||
<timestamp>${maven.build.timestamp}</timestamp>
|
||||
<maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
|
||||
<tycho.buildtimestamp.format>${maven.build.timestamp.format}</tycho.buildtimestamp.format>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
@@ -466,6 +467,11 @@
|
||||
<url>${fullp2_url}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>eclipse_repo</id>
|
||||
<url>${eclipse-repo.url}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
<build>
|
||||
<plugins>
|
||||
@@ -495,7 +501,7 @@
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>yyyyMMdd'_'HHmm</format>
|
||||
<format>${tycho.buildtimestamp.format}</format>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
|
||||
@@ -504,7 +510,7 @@
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
<timestampProvider>jgit</timestampProvider>
|
||||
<jgit.ignore>pom.xml</jgit.ignore>
|
||||
<!--jgit.ignore>pom.xml</jgit.ignore-->
|
||||
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
Reference in New Issue
Block a user