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 4, 2017
1 parent 55d0247 commit f483c79
Show file tree
Hide file tree
Showing 133 changed files with 317 additions and 317 deletions.
46 changes: 23 additions & 23 deletions assemblies/pdi-ce/pom.xml
View file
Expand Up @@ -5,36 +5,36 @@

<groupId>org.pentaho.di</groupId>
<artifactId>pdi-ce</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Client Community Edition</name>

<parent>
<artifactId>pdi-assemblies</artifactId>
<groupId>org.pentaho.di</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<properties>
<assembly.dir>${project.build.directory}/assembly</assembly.dir>
<assembly.launcher.jar>pentaho-application-launcher-${pentaho-launcher.version}.jar</assembly.launcher.jar>

<pdi-dataservice-driver-bundle.version>${project.version}</pdi-dataservice-driver-bundle.version>
<ael.version>8.1.0-SNAPSHOT</ael.version>
<ael.version>8.1.0.0-SNAPSHOT</ael.version>
<pdi-spark-driver.version>${project.version}</pdi-spark-driver.version>
<pdi-engine-spark.version>${project.version}</pdi-engine-spark.version>
<rxjava.version>2.0.4</rxjava.version>

<pentaho-karaf.version>8.1.0-SNAPSHOT</pentaho-karaf.version>
<pdi-osgi-bridge.version>8.1.0-SNAPSHOT</pdi-osgi-bridge.version>
<pentaho-launcher.version>8.1.0-SNAPSHOT</pentaho-launcher.version>
<pentaho-database-model.version>8.1.0-SNAPSHOT</pentaho-database-model.version>
<pentaho-registry.version>8.1.0-SNAPSHOT</pentaho-registry.version>
<pentaho-metaverse.version>8.1.0-SNAPSHOT</pentaho-metaverse.version>
<platform.version>8.1.0-SNAPSHOT</platform.version>
<pentaho-reporting.version>8.1.0-SNAPSHOT</pentaho-reporting.version>
<oss-licenses.version>8.1.0-SNAPSHOT</oss-licenses.version>
<pentaho-karaf.version>8.1.0.0-SNAPSHOT</pentaho-karaf.version>
<pdi-osgi-bridge.version>8.1.0.0-SNAPSHOT</pdi-osgi-bridge.version>
<pentaho-launcher.version>8.1.0.0-SNAPSHOT</pentaho-launcher.version>
<pentaho-database-model.version>8.1.0.0-SNAPSHOT</pentaho-database-model.version>
<pentaho-registry.version>8.1.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-metaverse.version>8.1.0.0-SNAPSHOT</pentaho-metaverse.version>
<platform.version>8.1.0.0-SNAPSHOT</platform.version>
<pentaho-reporting.version>8.1.0.0-SNAPSHOT</pentaho-reporting.version>
<oss-licenses.version>8.1.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 Expand Up @@ -95,23 +95,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>8.1.0-SNAPSHOT</pdi-google-analytics-plugin.version>
<pdi-salesforce-plugin.version>8.1.0-SNAPSHOT</pdi-salesforce-plugin.version>
<pdi-google-analytics-plugin.version>8.1.0.0-SNAPSHOT</pdi-google-analytics-plugin.version>
<pdi-salesforce-plugin.version>8.1.0.0-SNAPSHOT</pdi-salesforce-plugin.version>
<ms-access-bulk-loader-plugin.version>${project.version}</ms-access-bulk-loader-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>
<elasticsearch-bulk-insert-plugin.version>${project.version}</elasticsearch-bulk-insert-plugin.version>
<pdi-xml-plugin.version>8.1.0-SNAPSHOT</pdi-xml-plugin.version>
<pdi-json-plugin.version>8.1.0-SNAPSHOT</pdi-json-plugin.version>
<pdi-sap-plugin.version>8.1.0-SNAPSHOT</pdi-sap-plugin.version>
<big-data-plugin.version>8.1.0-SNAPSHOT</big-data-plugin.version>
<pentaho-cassandra-plugin.version>8.1.0-SNAPSHOT</pentaho-cassandra-plugin.version>
<pdi-xml-plugin.version>8.1.0.0-SNAPSHOT</pdi-xml-plugin.version>
<pdi-json-plugin.version>8.1.0.0-SNAPSHOT</pdi-json-plugin.version>
<pdi-sap-plugin.version>8.1.0.0-SNAPSHOT</pdi-sap-plugin.version>
<big-data-plugin.version>8.1.0.0-SNAPSHOT</big-data-plugin.version>
<pentaho-cassandra-plugin.version>8.1.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>8.1.0-SNAPSHOT</pdi-platform-utils-plugin.version>
<vertica-bulkloader-plugin.version>8.1.0-SNAPSHOT</vertica-bulkloader-plugin.version>
<pdi-pur-plugin.version>8.1.0-SNAPSHOT</pdi-pur-plugin.version>
<pentaho-hadoop-shims-api.version>8.1.0-SNAPSHOT</pentaho-hadoop-shims-api.version>
<pdi-platform-utils-plugin.version>8.1.0.0-SNAPSHOT</pdi-platform-utils-plugin.version>
<vertica-bulkloader-plugin.version>8.1.0.0-SNAPSHOT</vertica-bulkloader-plugin.version>
<pdi-pur-plugin.version>8.1.0.0-SNAPSHOT</pdi-pur-plugin.version>
<pentaho-hadoop-shims-api.version>8.1.0.0-SNAPSHOT</pentaho-hadoop-shims-api.version>

<!-- build plugins -->
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Assemblies</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<modules>
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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PDI Core</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PDI DB Dialog</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<dependencies>
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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>PDI Engine API</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-engine-ext</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Engine Extensions</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PDI Engine</name>

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.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>8.1.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-registry.version>8.1.0-SNAPSHOT</pentaho-registry.version>
<pentaho-connections.version>8.1.0-SNAPSHOT</pentaho-connections.version>
<mondrian.version>8.1.0-SNAPSHOT</mondrian.version>
<pentaho-reporting.version>8.1.0.0-SNAPSHOT</pentaho-reporting.version>
<pentaho-registry.version>8.1.0.0-SNAPSHOT</pentaho-registry.version>
<pentaho-connections.version>8.1.0.0-SNAPSHOT</pentaho-connections.version>
<mondrian.version>8.1.0.0-SNAPSHOT</mondrian.version>

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

<groupId>org.pentaho</groupId>
<artifactId>pdi-integration-tests</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>

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

<parent>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<properties>
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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>aggregate-rows-plugin</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

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

<properties>
<project.revision>8.1.0-SNAPSHOT</project.revision>
<project.revision>8.1.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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>aggregate-rows-assemblies</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.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>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>aggregate-rows-core</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.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>8.1.0-SNAPSHOT</pdi.version>
<pdi.version>8.1.0.0-SNAPSHOT</pdi.version>
<build.revision>${project.version}</build.revision>
<timestamp>${maven.build.timestamp}</timestamp>
<build.description>${project.description}</build.description>
Expand Down
4 changes: 2 additions & 2 deletions plugins/aggregate-rows/pom.xml
View file
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>pdi-plugins</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>aggregate-rows</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Aggregate Rows Plugin</name>
Expand Down
2 changes: 1 addition & 1 deletion plugins/core/assemblies/plugin/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>pdi-core-plugins-assemblies</artifactId>
<groupId>org.pentaho.di.plugins</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/core/assemblies/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>pdi-core</artifactId>
<groupId>org.pentaho.di.plugins</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions plugins/core/impl/pom.xml
View file
Expand Up @@ -5,15 +5,15 @@
<parent>
<artifactId>pdi-core</artifactId>
<groupId>org.pentaho.di.plugins</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>pdi-core-plugins-impl</artifactId>
<name>PDI Core Plugins Impl</name>

<properties>
<pdi.version>8.1.0-SNAPSHOT</pdi.version>
<pdi.version>8.1.0.0-SNAPSHOT</pdi.version>
<mockito-core.version>1.10.19</mockito-core.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion plugins/core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>pdi-plugins</artifactId>
<groupId>org.pentaho.di.plugins</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/drools/assemblies/plugin/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>drools-assemblies</artifactId>
<groupId>org.pentaho.di.plugins</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>kettle-drools5-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/drools/assemblies/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>drools</artifactId>
<groupId>org.pentaho.di.plugins</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions plugins/drools/core/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>drools</artifactId>
<groupId>org.pentaho.di.plugins</groupId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>kettle-drools5-core</artifactId>
Expand All @@ -18,7 +18,7 @@
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy/MM/dd hh\:mm</maven.build.timestamp.format>

<pdi.version>8.1.0-SNAPSHOT</pdi.version>
<pdi.version>8.1.0.0-SNAPSHOT</pdi.version>
<drools.version>6.4.0.Final</drools.version>
<xstream.version>1.4.10</xstream.version>
<mvel2.version>2.2.8.Final</mvel2.version>
Expand Down
2 changes: 1 addition & 1 deletion plugins/drools/pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>pdi-plugins</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>drools</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions plugins/dummy/assemblies/plugin/pom.xml
View file
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>dummy-assemblies</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>kettle-dummy-plugin</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Dummy Plugin Distribution</name>
Expand Down

0 comments on commit f483c79

Please sign in to comment.