Skip to content

Commit

Permalink
Create tag from build job '7.1/pdi-client-assembly' b376, source bran…
Browse files Browse the repository at this point in the history 
…ch '7.1.0.5'
  • Loading branch information
buildguy committed Oct 3, 2017
1 parent 91a755c commit f64d59b
Show file tree
Hide file tree
Showing 54 changed files with 348 additions and 632 deletions.
48 changes: 24 additions & 24 deletions assembly/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project.revision=7.1-SNAPSHOT
project.revision=7.1.0.5-67
ivy.artifact.group=pentaho-kettle
ivy.artifact.id=pdi-ce
impl.vendor=Pentaho Corporation
Expand All @@ -13,31 +13,31 @@ lib.zip.filename=lib.zip
oss-license.filename=PentahoDataIntegration_OSS_Licenses.html

# Dependency revisions
dependency.pentaho-platform.revision=${project.revision}
dependency.pentaho-platform.revision=7.1.0.5-67
ael.revision=${project.revision}
dependency.pentaho-metadata.revision=${project.revision}
dependency.pentaho-connections.revision=${project.revision}
dependency.pentaho-big-data-plugin.revision=${project.revision}
dependency.pentaho-cassandra-plugin.revision=${project.revision}
dependency.pentaho-database-model.revision=${project.revision}
dependency.pentaho-mongodb-plugin.revision=${project.revision}
dependency.pentaho-registry.revision=${project.revision}
dependency.pdi-spark-plugin.revision=${project.revision}
dependency.pdi-teradata-tpt-plugin.revision=${project.revision}
dependency.vertica-bulkloader-plugin.revision=${project.revision}
dependency.pentaho-reporting.revision=${project.revision}
dependency.pentaho-metadata.revision=7.1.0.5-67
dependency.pentaho-connections.revision=7.1.0.5-67
dependency.pentaho-big-data-plugin.revision=7.1.0.5-67
dependency.pentaho-cassandra-plugin.revision=7.1.0.5-67
dependency.pentaho-database-model.revision=7.1.0.5-67
dependency.pentaho-mongodb-plugin.revision=7.1.0.5-67
dependency.pentaho-registry.revision=7.1.0.5-67
dependency.pdi-spark-plugin.revision=7.1.0.5-67
dependency.pdi-teradata-tpt-plugin.revision=7.1.0.5-67
dependency.vertica-bulkloader-plugin.revision=7.1.0.5-67
dependency.pentaho-reporting.revision=7.1.0.5-67
dependency.reporting-engine.group=org.pentaho.reporting.engine
dependency.pentaho-xul.revision=${project.revision}
dependency.pentaho-vfs-browser.revision=${project.revision}
dependency.pentaho-reporting-core.revision=${project.revision}
dependency.pdi-palo-plugin.revision=${project.revision}
dependency.launcher.revision=${project.revision}
dependency.pdi-platform-utils-plugin.revision=${project.revision}
dependency.pdi-pur-plugin.revision=${project.revision}
dependency.oss-licenses.revision=${project.revision}
dependency.pdi-osgi-bridge.revision=${project.revision}
pentaho-eula-wrap-config.version=${project.revision}
dependency.mondrian.revision=3.14-SNAPSHOT
dependency.pentaho-xul.revision=7.1.0.5-67
dependency.pentaho-vfs-browser.revision=7.1.0.5-67
dependency.pentaho-reporting-core.revision=7.1.0.5-67
dependency.pdi-palo-plugin.revision=7.1.0.5-67
dependency.launcher.revision=7.1.0.5-67
dependency.pdi-platform-utils-plugin.revision=7.1.0.5-67
dependency.pdi-pur-plugin.revision=7.1.0.5-67
dependency.oss-licenses.revision=7.1.0.5-67
dependency.pdi-osgi-bridge.revision=7.1.0.5-67
pentaho-eula-wrap-config.version=7.1.0.5-67
dependency.mondrian.revision=3.14.0.5-67
dependency.documentation.revision=6.0.0.0
dependency.spring.framework.revision=3.2.14.RELEASE
dependency.spring.framework.revision=4.3.2.RELEASE
Expand Down
6 changes: 3 additions & 3 deletions build-res/publish.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project.revision=7.1-SNAPSHOT
project.revision=7.1.0.5-67
impl.title=kettle
ivy.artifact.group=pentaho-kettle-restruct
pentaho.group=pentaho
dependency.kettle.revision=7.1-SNAPSHOT
dependency.pentaho-xul.revision=7.1-SNAPSHOT
dependency.kettle.revision=7.1.0.5-67
dependency.pentaho-xul.revision=7.1.0.5-67
kettle.plugin.list=kettle-gpload-plugin,kettle-palo-plugin,kettle-hl7-plugin,kettle5-log4j-plugin
24 changes: 12 additions & 12 deletions build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#System Properties
cr=${line.separator}
project.revision=7.1-SNAPSHOT
version=7.1-SNAPSHOT
project.revision=7.1.0.5-67
version=7.1.0.5-67
impl.vendor=Pentaho Corporation
impl.version=${version}
impl.title=Pentaho Data Integration
Expand Down Expand Up @@ -94,17 +94,17 @@ lib.dir=lib
ivyfile=ivy.xml

# Dependency revisions
dependency.kettle.revision=7.1-SNAPSHOT
dependency.pentaho-metadata.revision=7.1-SNAPSHOT
dependency.mondrian.revision=3.14-SNAPSHOT
dependency.pentaho-connections.revision=7.1-SNAPSHOT
dependency.pentaho-reporting.revision=7.1-SNAPSHOT
dependency.kettle.revision=7.1.0.5-67
dependency.pentaho-metadata.revision=7.1.0.5-67
dependency.mondrian.revision=3.14.0.5-67
dependency.pentaho-connections.revision=7.1.0.5-67
dependency.pentaho-reporting.revision=7.1.0.5-67
dependency.reporting-engine.group=pentaho-reporting-engine
dependency.pentaho-xul.revision=7.1-SNAPSHOT
dependency.pentaho-vfs-browser.revision=7.1-SNAPSHOT
dependency.pentaho-reporting-core.revision=7.1-SNAPSHOT
dependency.pdi-palo-plugin.revision=7.1-SNAPSHOT
dependency.launcher.revision=7.1-SNAPSHOT
dependency.pentaho-xul.revision=7.1.0.5-67
dependency.pentaho-vfs-browser.revision=7.1.0.5-67
dependency.pentaho-reporting-core.revision=7.1.0.5-67
dependency.pdi-palo-plugin.revision=7.1.0.5-67
dependency.launcher.revision=7.1.0.5-67

# Checkstyle Properties
checkstyle.version=6.12
Expand Down
6 changes: 3 additions & 3 deletions core/build-res/publish.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project.revision=7.1-SNAPSHOT
project.revision=7.1.0.5-67
impl.title=core
ivy.artifact.group=pentaho-kettle-restruct
pentaho.group=pentaho
dependency.kettle.revision=7.1-SNAPSHOT
dependency.pentaho-xul.revision=7.1-SNAPSHOT
dependency.kettle.revision=7.1.0.5-67
dependency.pentaho-xul.revision=7.1.0.5-67
4 changes: 2 additions & 2 deletions core/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
project.revision=7.1-SNAPSHOT
project.revision=7.1.0.5-67
ivy.artifact.group=pentaho-kettle
ivy.artifact.id=kettle-core
impl.vendor=Pentaho Corporation
impl.title=Pentaho Data Integration Core
impl.productID=kettle-core
impl.version=${project.revision}

dependency.pentaho-metastore.revision=7.1-SNAPSHOT
dependency.pentaho-metastore.revision=7.1.0.5-67
dependency.batik.revision=1.8
dependency.xml-apis-ext.revision=1.3.04
dependency.spring.framework.revision=4.3.2.RELEASE
Expand Down
2 changes: 1 addition & 1 deletion dbdialog/build-res/publish.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project.revision=7.1-SNAPSHOT
project.revision=7.1.0.5-67
ivy.artifact.group=pentaho-kettle-restruct
ivy.artifact.id=kettle-dbdialog
impl.vendor=Pentaho Corporation
Expand Down
16 changes: 8 additions & 8 deletions dbdialog/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#System Properties
dependency.kettle.revision=7.1-SNAPSHOT
dependency.kettle.revision=7.1.0.5-67
ivy.artifact.id=kettle-dbdialog
ivy.artifact.group=pentaho-kettle
version=7.1-SNAPSHOT
project.revision=7.1-SNAPSHOT
version=7.1.0.5-67
project.revision=7.1.0.5-67
impl.vendor=Pentaho Corporation
impl.version=${version}
impl.title=Pentaho Data Integration
Expand All @@ -15,12 +15,12 @@ build=bin
dist=dist

# Dependency revisions
dependency.mondrian.revision=3.14-SNAPSHOT
dependency.pentaho-metadata.revision=7.1-SNAPSHOT
dependency.pentaho-connections.revision=7.1-SNAPSHOT
dependency.pentaho-reporting.revision=7.1-SNAPSHOT
dependency.mondrian.revision=3.14.0.5-67
dependency.pentaho-metadata.revision=7.1.0.5-67
dependency.pentaho-connections.revision=7.1.0.5-67
dependency.pentaho-reporting.revision=7.1.0.5-67
dependency.reporting-engine.group=pentaho-reporting-engine
dependency.pentaho-xul.revision=7.1-SNAPSHOT
dependency.pentaho-xul.revision=7.1.0.5-67

# Release type is either "se" or "open"
product.release.type=open
Expand Down
2 changes: 1 addition & 1 deletion engine/build-res/publish.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project.revision=7.1-SNAPSHOT
project.revision=7.1.0.5-67
ivy.artifact.group=pentaho-kettle-restruct
ivy.artifact.id=kettle-engine
impl.vendor=Pentaho Corporation
Expand Down
16 changes: 8 additions & 8 deletions engine/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#System Properties
dependency.kettle.revision=7.1-SNAPSHOT
dependency.kettle.revision=7.1.0.5-67
ivy.artifact.id=kettle-engine
ivy.artifact.group=pentaho-kettle
version=7.1-SNAPSHOT
project.revision=7.1-SNAPSHOT
version=7.1.0.5-67
project.revision=7.1.0.5-67
impl.vendor=Pentaho Corporation
impl.version=${version}
impl.title=Pentaho Data Integration
Expand All @@ -16,10 +16,10 @@ build=bin
dist=dist

# Dependency revisions
dependency.pentaho-registry.revision=7.1-SNAPSHOT
dependency.mondrian.revision=3.14-SNAPSHOT
dependency.pentaho-connections.revision=7.1-SNAPSHOT
dependency.pentaho-reporting.revision=7.1-SNAPSHOT
dependency.pentaho-registry.revision=7.1.0.5-67
dependency.mondrian.revision=3.14.0.5-67
dependency.pentaho-connections.revision=7.1.0.5-67
dependency.pentaho-reporting.revision=7.1.0.5-67
dependency.reporting-engine.group=org.pentaho.reporting.engine

# Release type is either "se" or "open"
Expand All @@ -36,4 +36,4 @@ coverage.dir=${build}/kettle-coverage
coverage.xml.dir=${coverage.dir}/xml
coverage.html.dir=${coverage.dir}/html

dependency.pentaho-metastore.revision=7.1-SNAPSHOT
dependency.pentaho-metastore.revision=7.1.0.5-67
40 changes: 4 additions & 36 deletions pdi-engine/api/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ ******************************************************************************
~
~ Pentaho Data Integration
~
~ Copyright (C) 2002-2017 by Pentaho : http://www.pentaho.com
~
~ *******************************************************************************
~ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
~ this file except in compliance with the License. You may obtain a copy of the
~ License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ******************************************************************************
~
-->

<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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.pentaho</groupId>
<artifactId>pdi-engine</artifactId>
<version>7.1-SNAPSHOT</version>
<version>7.1.0.5-67</version>
</parent>

<artifactId>pdi-engine-api</artifactId>
<version>7.1-SNAPSHOT</version>
<version>7.1.0.5-67</version>
<packaging>bundle</packaging>

<properties>
<guava.dependency.version>17.0</guava.dependency.version>
<maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
</properties>

<dependencies>
<dependency>
<groupId>org.reactivestreams</groupId>
Expand All @@ -55,7 +26,6 @@
<version>${guava.dependency.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -72,6 +42,4 @@
</plugin>
</plugins>
</build>


</project>
27 changes: 10 additions & 17 deletions pdi-engine/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-ce-jar-parent-pom</artifactId>
<version>7.1-SNAPSHOT</version>
<version>7.1.0.5-67</version>
</parent>

<properties>
<hamcrest.version>2.0.0.0</hamcrest.version>
<mockito.version>1.9.5</mockito.version>
<guava.dependency.version>17.0</guava.dependency.version>
<maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
</properties>


<groupId>org.pentaho</groupId>
<artifactId>pdi-engine</artifactId>
<version>7.1-SNAPSHOT</version>
<version>7.1.0.5-67</version>
<packaging>pom</packaging>

<modules>
<module>api</module>
<module>serializers</module>
</modules>

<properties>
<mockito.version>1.9.5</mockito.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
<guava.dependency.version>17.0</guava.dependency.version>
<maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
</properties>
</project>
Loading

0 comments on commit f64d59b

Please sign in to comment.