Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4266 from tmcsantos/BACKLOG-17632
[Backlog-17632] Decouple of append step from Kettle engine
- Loading branch information
Showing
30 changed files
with
202 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +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"> | ||
| <parent> | ||
| <artifactId>pdi-append-assemblies</artifactId> | ||
| <groupId>org.pentaho.di.plugins</groupId> | ||
| <version>8.0-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>pdi-append-plugin</artifactId> | ||
| <name>PDI Append Step Plugin Distribution</name> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.pentaho.di.plugins</groupId> | ||
| <artifactId>pdi-append-plugin-impl</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> |
26 changes: 26 additions & 0 deletions
26
plugins/core/append/assemblies/plugin/src/assembly/assembly.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> | ||
| <id>plugin</id> | ||
| <formats> | ||
| <format>zip</format> | ||
| </formats> | ||
| <baseDirectory>pdi-append-plugin</baseDirectory> | ||
|
|
||
| <files> | ||
| <file> | ||
| <source>${project.basedir}/src/main/resources/version.xml</source> | ||
| <outputDirectory>.</outputDirectory> | ||
| <filtered>true</filtered> | ||
| </file> | ||
| </files> | ||
|
|
||
| <dependencySets> | ||
| <dependencySet> | ||
| <outputDirectory>.</outputDirectory> | ||
| <includes> | ||
| <include>org.pentaho.di.plugins:pdi-append-plugin-impl:jar</include> | ||
| </includes> | ||
| <useProjectArtifact>false</useProjectArtifact> | ||
| </dependencySet> | ||
| </dependencySets> | ||
| </assembly> |
2 changes: 2 additions & 0 deletions
2
plugins/core/append/assemblies/plugin/src/main/resources/version.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <version branch='TRUNK'>${project.version}</version> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?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"> | ||
| <parent> | ||
| <artifactId>append</artifactId> | ||
| <groupId>org.pentaho.di.plugins</groupId> | ||
| <version>8.0-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>pdi-append-assemblies</artifactId> | ||
| <name>PDI Append Step Plugin Assemblies</name> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <modules> | ||
| <module>plugin</module> | ||
| </modules> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <?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"> | ||
| <parent> | ||
| <artifactId>append</artifactId> | ||
| <groupId>org.pentaho.di.plugins</groupId> | ||
| <version>8.0-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>pdi-append-plugin-impl</artifactId> | ||
| <name>PDI Append Step Plugin Impl</name> | ||
|
|
||
| <properties> | ||
| <kettle.version>8.0-SNAPSHOT</kettle.version> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-core</artifactId> | ||
| <version>${kettle.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-engine</artifactId> | ||
| <version>${kettle.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-ui-swt</artifactId> | ||
| <version>${kettle.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>pentaho</groupId> | ||
| <artifactId>metastore</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <!-- SWT it required to compile any version of any architecture will work --> | ||
| <dependency> | ||
| <groupId>org.eclipse.swt</groupId> | ||
| <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> | ||
| <scope>provided</scope> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>*</groupId> | ||
| <artifactId>*</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-engine</artifactId> | ||
| <version>${kettle.version}</version> | ||
| <classifier>tests</classifier> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
4 changes: 4 additions & 0 deletions
4
plugins/core/append/impl/src/main/resources-filtered/version.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #${project.name} build information | ||
|
|
||
| version=${project.version} | ||
| builddate=${maven.build.timestamp} |
File renamed without changes
30 changes: 15 additions & 15 deletions
30
ui/src/main/resources/ui/images/APP.svg → ...re/append/impl/src/main/resources/APP.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
Oops, something went wrong.