Skip to content

Commit

Permalink
[CLEANUP] updated versions via release version merger
Browse files Browse the repository at this point in the history
  • Loading branch information
Buildguy committed Dec 9, 2018
1 parent 76f9af6 commit f00697e
Show file tree
Hide file tree
Showing 160 changed files with 386 additions and 386 deletions.
10 changes: 5 additions & 5 deletions assemblies/client/pom.xml
View file
Expand Up @@ -11,16 +11,16 @@
<parent>
<artifactId>pdi-assemblies</artifactId>
<groupId>org.pentaho.di</groupId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
<pdi-dataservice-driver-bundle.version>${project.version}</pdi-dataservice-driver-bundle.version>
<ael.version>9.0.0.0-SNAPSHOT</ael.version>
<ael.version>8.3.0.0-SNAPSHOT</ael.version>

<pentaho-karaf.version>9.0.0.0-SNAPSHOT</pentaho-karaf.version>
<pentaho-launcher.version>9.0.0.0-SNAPSHOT</pentaho-launcher.version>
<oss-licenses.version>9.0.0.0-SNAPSHOT</oss-licenses.version>
<pentaho-karaf.version>8.3.0.0-SNAPSHOT</pentaho-karaf.version>
<pentaho-launcher.version>8.3.0.0-SNAPSHOT</pentaho-launcher.version>
<oss-licenses.version>8.3.0.0-SNAPSHOT</oss-licenses.version>

<!-- swt -->
<org.eclipse.swt.gtk.linux.x86.version>4.3.2</org.eclipse.swt.gtk.linux.x86.version>
Expand Down
10 changes: 5 additions & 5 deletions assemblies/core/client/pom.xml
View file
Expand Up @@ -12,16 +12,16 @@
<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
<pdi-dataservice-driver-bundle.version>${project.version}</pdi-dataservice-driver-bundle.version>
<ael.version>9.0.0.0-SNAPSHOT</ael.version>
<ael.version>8.3.0.0-SNAPSHOT</ael.version>

<pentaho-karaf.version>9.0.0.0-SNAPSHOT</pentaho-karaf.version>
<pentaho-launcher.version>9.0.0.0-SNAPSHOT</pentaho-launcher.version>
<oss-licenses.version>9.0.0.0-SNAPSHOT</oss-licenses.version>
<pentaho-karaf.version>8.3.0.0-SNAPSHOT</pentaho-karaf.version>
<pentaho-launcher.version>8.3.0.0-SNAPSHOT</pentaho-launcher.version>
<oss-licenses.version>8.3.0.0-SNAPSHOT</oss-licenses.version>

<!-- swt -->
<org.eclipse.swt.gtk.linux.x86.version>4.3.2</org.eclipse.swt.gtk.linux.x86.version>
Expand Down
18 changes: 9 additions & 9 deletions assemblies/core/lib/pom.xml
View file
Expand Up @@ -12,22 +12,22 @@
<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
<pdi-engine-spark.version>${project.version}</pdi-engine-spark.version>
<rxjava.version>2.2.3</rxjava.version>

<pentaho-json.version>9.0.0.0-SNAPSHOT</pentaho-json.version>
<pentaho-json.version>8.3.0.0-SNAPSHOT</pentaho-json.version>
<pdi-spark-driver.version>${project.version}</pdi-spark-driver.version>
<pdi-osgi-bridge.version>9.0.0.0-SNAPSHOT</pdi-osgi-bridge.version>
<commons-database.version>9.0.0.0-SNAPSHOT</commons-database.version>
<pentaho-registry.version>9.0.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-metaverse.version>9.0.0.0-SNAPSHOT</pentaho-metaverse.version>
<platform.version>9.0.0.0-SNAPSHOT</platform.version>
<pentaho-reporting.version>9.0.0.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-hadoop-shims-api.version>9.0.0.0-SNAPSHOT</pentaho-hadoop-shims-api.version>
<pdi-osgi-bridge.version>8.3.0.0-SNAPSHOT</pdi-osgi-bridge.version>
<commons-database.version>8.3.0.0-SNAPSHOT</commons-database.version>
<pentaho-registry.version>8.3.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-metaverse.version>8.3.0.0-SNAPSHOT</pentaho-metaverse.version>
<platform.version>8.3.0.0-SNAPSHOT</platform.version>
<pentaho-reporting.version>8.3.0.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-hadoop-shims-api.version>8.3.0.0-SNAPSHOT</pentaho-hadoop-shims-api.version>

<!-- third party -->
<org.apache.karaf.main.version>3.0.3</org.apache.karaf.main.version>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/core/pom.xml
View file
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-assemblies</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/core/static/pom.xml
View file
Expand Up @@ -12,6 +12,6 @@
<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>
</project>
18 changes: 9 additions & 9 deletions assemblies/lib/pom.xml
View file
Expand Up @@ -11,22 +11,22 @@
<parent>
<artifactId>pdi-assemblies</artifactId>
<groupId>org.pentaho.di</groupId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
<pdi-engine-spark.version>${project.version}</pdi-engine-spark.version>
<rxjava.version>2.2.3</rxjava.version>

<pentaho-json.version>9.0.0.0-SNAPSHOT</pentaho-json.version>
<pentaho-json.version>8.3.0.0-SNAPSHOT</pentaho-json.version>
<pdi-spark-driver.version>${project.version}</pdi-spark-driver.version>
<pdi-osgi-bridge.version>9.0.0.0-SNAPSHOT</pdi-osgi-bridge.version>
<commons-database.version>9.0.0.0-SNAPSHOT</commons-database.version>
<pentaho-registry.version>9.0.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-metaverse.version>9.0.0.0-SNAPSHOT</pentaho-metaverse.version>
<platform.version>9.0.0.0-SNAPSHOT</platform.version>
<pentaho-reporting.version>9.0.0.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-hadoop-shims-api.version>9.0.0.0-SNAPSHOT</pentaho-hadoop-shims-api.version>
<pdi-osgi-bridge.version>8.3.0.0-SNAPSHOT</pdi-osgi-bridge.version>
<commons-database.version>8.3.0.0-SNAPSHOT</commons-database.version>
<pentaho-registry.version>8.3.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-metaverse.version>8.3.0.0-SNAPSHOT</pentaho-metaverse.version>
<platform.version>8.3.0.0-SNAPSHOT</platform.version>
<pentaho-reporting.version>8.3.0.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-hadoop-shims-api.version>8.3.0.0-SNAPSHOT</pentaho-hadoop-shims-api.version>

<!-- third party -->
<org.apache.karaf.main.version>3.0.3</org.apache.karaf.main.version>
Expand Down
22 changes: 11 additions & 11 deletions assemblies/plugins/pom.xml
View file
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>pdi-assemblies</artifactId>
<groupId>org.pentaho.di</groupId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -27,23 +27,23 @@
<kettle-openerp-plugin.version>${project.version}</kettle-openerp-plugin.version>
<kettle-palo-plugin.version>${project.version}</kettle-palo-plugin.version>
<kettle5-log4j-plugin.version>${project.version}</kettle5-log4j-plugin.version>
<pdi-google-analytics-plugin.version>9.0.0.0-SNAPSHOT</pdi-google-analytics-plugin.version>
<pdi-salesforce-plugin.version>9.0.0.0-SNAPSHOT</pdi-salesforce-plugin.version>
<pdi-google-analytics-plugin.version>8.3.0.0-SNAPSHOT</pdi-google-analytics-plugin.version>
<pdi-salesforce-plugin.version>8.3.0.0-SNAPSHOT</pdi-salesforce-plugin.version>
<ms-access-plugin.version>${project.version}</ms-access-plugin.version>
<lucid-db-streaming-loader-plugin.version>${project.version}</lucid-db-streaming-loader-plugin.version>
<gp-bulk-loader-plugin.version>${project.version}</gp-bulk-loader-plugin.version>
<pentaho-googledrive-vfs-plugin.version>${project.version}</pentaho-googledrive-vfs-plugin.version>
<google-bigquery-plugin.version>${project.version}</google-bigquery-plugin.version>
<elasticsearch-bulk-insert-plugin.version>${project.version}</elasticsearch-bulk-insert-plugin.version>
<pdi-xml-plugin.version>9.0.0.0-SNAPSHOT</pdi-xml-plugin.version>
<pdi-json-plugin.version>9.0.0.0-SNAPSHOT</pdi-json-plugin.version>
<pdi-sap-plugin.version>9.0.0.0-SNAPSHOT</pdi-sap-plugin.version>
<big-data-plugin.version>9.0.0.0-SNAPSHOT</big-data-plugin.version>
<pentaho-cassandra-plugin.version>9.0.0.0-SNAPSHOT</pentaho-cassandra-plugin.version>
<pdi-xml-plugin.version>8.3.0.0-SNAPSHOT</pdi-xml-plugin.version>
<pdi-json-plugin.version>8.3.0.0-SNAPSHOT</pdi-json-plugin.version>
<pdi-sap-plugin.version>8.3.0.0-SNAPSHOT</pdi-sap-plugin.version>
<big-data-plugin.version>8.3.0.0-SNAPSHOT</big-data-plugin.version>
<pentaho-cassandra-plugin.version>8.3.0.0-SNAPSHOT</pentaho-cassandra-plugin.version>
<pdi-teradata-tpt-plugin-package.version>${project.version}</pdi-teradata-tpt-plugin-package.version>
<pdi-platform-utils-plugin.version>9.0.0.0-SNAPSHOT</pdi-platform-utils-plugin.version>
<vertica-bulkloader-plugin.version>9.0.0.0-SNAPSHOT</vertica-bulkloader-plugin.version>
<pdi-pur-plugin.version>9.0.0.0-SNAPSHOT</pdi-pur-plugin.version>
<pdi-platform-utils-plugin.version>8.3.0.0-SNAPSHOT</pdi-platform-utils-plugin.version>
<vertica-bulkloader-plugin.version>8.3.0.0-SNAPSHOT</vertica-bulkloader-plugin.version>
<pdi-pur-plugin.version>8.3.0.0-SNAPSHOT</pdi-pur-plugin.version>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions assemblies/pom.xml
View file
Expand Up @@ -5,15 +5,15 @@

<groupId>org.pentaho.di</groupId>
<artifactId>pdi-assemblies</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Assemblies</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/samples/pom.xml
View file
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>pdi-assemblies</artifactId>
<groupId>org.pentaho.di</groupId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/static/pom.xml
View file
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>pdi-assemblies</artifactId>
<groupId>org.pentaho.di</groupId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Expand Up @@ -6,15 +6,15 @@

<groupId>pentaho-kettle</groupId>
<artifactId>kettle-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PDI Core</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions dbdialog/pom.xml
View file
Expand Up @@ -5,15 +5,15 @@

<groupId>pentaho-kettle</groupId>
<artifactId>kettle-dbdialog</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PDI DB Dialog</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions engine-ext/api/pom.xml
View file
Expand Up @@ -5,15 +5,15 @@

<groupId>org.pentaho</groupId>
<artifactId>pdi-engine-api</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>PDI Engine API</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-engine-ext</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions engine-ext/pom.xml
View file
Expand Up @@ -5,15 +5,15 @@

<groupId>org.pentaho.di</groupId>
<artifactId>pdi-engine-ext</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Engine Extensions</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<modules>
Expand Down
12 changes: 6 additions & 6 deletions engine/pom.xml
View file
Expand Up @@ -6,15 +6,15 @@

<groupId>pentaho-kettle</groupId>
<artifactId>kettle-engine</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PDI Engine</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -23,10 +23,10 @@
<maven-failsafe-plugin.reuseForks>false</maven-failsafe-plugin.reuseForks>

<!-- Pentaho dependencies -->
<pentaho-reporting.version>9.0.0.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-registry.version>9.0.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-connections.version>9.0.0.0-SNAPSHOT</pentaho-connections.version>
<mondrian.version>9.0.0.0-SNAPSHOT</mondrian.version>
<pentaho-reporting.version>8.3.0.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-registry.version>8.3.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-connections.version>8.3.0.0-SNAPSHOT</pentaho-connections.version>
<mondrian.version>8.3.0.0-SNAPSHOT</mondrian.version>

<!-- Third-party dependencies -->
<antlr-complete.version>3.5.2</antlr-complete.version>
Expand Down
6 changes: 3 additions & 3 deletions integration/pom.xml
View file
Expand Up @@ -6,14 +6,14 @@

<groupId>org.pentaho</groupId>
<artifactId>pdi-integration-tests</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>

<name>Pentaho Data Integration Integration Tests</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -22,7 +22,7 @@
<sshd-sftp.version>0.11.0</sshd-sftp.version>
<ftpserver-core.version>1.0.6</ftpserver-core.version>
<bcprov-jdk14.version>1.51</bcprov-jdk14.version>
<pdi.version>9.0.0.0-SNAPSHOT</pdi.version>
<pdi.version>8.3.0.0-SNAPSHOT</pdi.version>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions plugins/aggregate-rows/assemblies/plugin/pom.xml
View file
Expand Up @@ -6,17 +6,17 @@
<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>aggregate-rows-assemblies</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aggregate-rows-plugin</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Aggregate Rows Plugin Distribution</name>

<properties>
<project.revision>9.0.0.0-SNAPSHOT</project.revision>
<project.revision>8.3.0.0-SNAPSHOT</project.revision>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions plugins/aggregate-rows/assemblies/pom.xml
View file
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>aggregate-rows</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aggregate-rows-assemblies</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Aggregate Rows Plugin Assemblies</name>
Expand Down
6 changes: 3 additions & 3 deletions plugins/aggregate-rows/core/pom.xml
View file
Expand Up @@ -6,17 +6,17 @@
<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>aggregate-rows</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>aggregate-rows-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>8.3.0.0-SNAPSHOT</version>

<name>PDI Aggregate Rows Plugin Core</name>

<properties>
<dependency.javax.servlet-api.version>3.0.1</dependency.javax.servlet-api.version>
<pdi.version>9.0.0.0-SNAPSHOT</pdi.version>
<pdi.version>8.3.0.0-SNAPSHOT</pdi.version>
<build.revision>${project.version}</build.revision>
<timestamp>${maven.build.timestamp}</timestamp>
<build.description>${project.description}</build.description>
Expand Down

1 comment on commit f00697e

@springborland
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did the Apache license kettle refer to the GPL license's pentaho-platform-core project?
Is the compiled pdi-ce still restricted by GPL?

Please sign in to comment.