forked from pentaho/pentaho-kettle
-
Notifications
You must be signed in to change notification settings - Fork 0
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 pentaho#9018 from ssindhu23/BACKLOG-38436
[BACKLOG-38436] Code changes for moving mail-validator-job from core to plugin
- Loading branch information
Showing
24 changed files
with
420 additions
and
6 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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.di.plugins</groupId> | ||
| <artifactId>mail-validator-job-assemblies</artifactId> | ||
| <version>10.1.0.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
|
|
||
| <artifactId>mail-validator-job-plugins</artifactId> | ||
| <version>10.1.0.0-SNAPSHOT</version> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <name>PDI Mail Validator Job Plugins Distribution</name> | ||
| <description></description> | ||
| <properties> | ||
| <resources.directory>${project.basedir}/src/main/resources</resources.directory> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.pentaho.di.plugins</groupId> | ||
| <artifactId>mail-validator-job-plugins-impl</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.pentaho.di.plugins</groupId> | ||
| <artifactId>mail-validator-job-plugins-ui</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>add-libs</id> | ||
| <phase>generate-resources</phase> | ||
| <goals> | ||
| <goal>copy-dependencies</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/assembly/lib</outputDirectory> | ||
| <includeScope>compile</includeScope> | ||
| <excludeArtifactIds>mail-validator-job-plugins-impl,mail-validator-job-plugins-ui</excludeArtifactIds> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
41 changes: 41 additions & 0 deletions
41
plugins/mail-validator-job/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,41 @@ | ||
| <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>mail-validator-job-plugin</id> | ||
| <formats> | ||
| <format>zip</format> | ||
| </formats> | ||
| <baseDirectory>mail-validator-job-plugins</baseDirectory> | ||
|
|
||
| <files> | ||
| <file> | ||
| <source>${project.basedir}/src/main/resources/version.xml</source> | ||
| <outputDirectory>.</outputDirectory> | ||
| <filtered>true</filtered> | ||
| </file> | ||
| </files> | ||
|
|
||
| <fileSets> | ||
| <!-- the staging dir --> | ||
| <fileSet> | ||
| <directory>${project.build.directory}/assembly</directory> | ||
| <outputDirectory>.</outputDirectory> | ||
| </fileSet> | ||
|
|
||
| <fileSet> | ||
| <directory>${resources.directory}</directory> | ||
| <outputDirectory>.</outputDirectory> | ||
| <filtered>true</filtered> | ||
| </fileSet> | ||
| </fileSets> | ||
|
|
||
| <dependencySets> | ||
| <dependencySet> | ||
| <outputDirectory>.</outputDirectory> | ||
| <includes> | ||
| <include>org.pentaho.di.plugins:mail-validator-job-plugins-impl:jar</include> | ||
| <include>org.pentaho.di.plugins:mail-validator-job-plugins-ui:jar</include> | ||
| </includes> | ||
| <useProjectArtifact>false</useProjectArtifact> | ||
| </dependencySet> | ||
| </dependencySets> | ||
| </assembly> |
2 changes: 2 additions & 0 deletions
2
plugins/mail-validator-job/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>${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,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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.di.plugins</groupId> | ||
| <artifactId>mail-validator-job</artifactId> | ||
| <version>10.1.0.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>mail-validator-job-assemblies</artifactId> | ||
| <version>10.1.0.0-SNAPSHOT</version> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <name>PDI Mail Validator Job Plugins Assemblies</name> | ||
|
|
||
| <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,58 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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.di.plugins</groupId> | ||
| <artifactId>mail-validator-job</artifactId> | ||
| <version>10.1.0.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>mail-validator-job-plugins-impl</artifactId> | ||
| <name>PDI Mail Validator Job Plugins Impl</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-core</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-engine</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.healthmarketscience.jackcess</groupId> | ||
| <artifactId>jackcess</artifactId> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
|
|
||
| <!-- Test dependencies --> | ||
| <dependency> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-all</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hamcrest</groupId> | ||
| <artifactId>hamcrest-core</artifactId> | ||
| <version>1.3</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-core</artifactId> | ||
| <classifier>tests</classifier> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>pentaho-kettle</groupId> | ||
| <artifactId>kettle-engine</artifactId> | ||
| <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
2 changes: 2 additions & 0 deletions
2
...idator/messages/messages_en_US.properties → ...idator/messages/messages_en_US.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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
Oops, something went wrong.