From 5ff3874e0474006b0c90d6c009864fd8f878bd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20H=2E=20Ho=C3=9Ffeld?=
 <felix.hossfeld@thoughtgang.de>
Date: Mon, 26 Jun 2017 14:15:22 +0200
Subject: [PATCH] Simplified build script. Allows building for different
 Kafka/Scala versions by changing the properties kafka.version and
 kafka.scale.version

---
 README.md    |  4 ++++
 assembly.xml | 24 +++---------------------
 pom.xml      | 37 ++++++++++---------------------------
 3 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index 27b150e..b080c83 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,10 @@ Apache Kafka consumer step plug-in for Pentaho Kettle.
 
 The consumer depends on Apache Kafka 0.8.1.1, which means that the broker must be of 0.8.x version or later.
 
+If you want to build the plugin for a different Kafka version you have to
+modify the values of kafka.version and kafka.scala.version in the properties
+section of the pom.xml. 
+
 ### Maximum Duration Of Consumption ###
 
 Note that the maximum duration of consumption is a limit on the duration of the
diff --git a/assembly.xml b/assembly.xml
index 52fffa0..fd4f0fe 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -3,6 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
+	<id>dist</id>
+
 	<baseDirectory>${project.artifactId}</baseDirectory>
 
 	<formats>
@@ -15,33 +17,13 @@
 				<include>LICENSE</include>
 			</includes>
 		</fileSet>
-		<fileSet>
-			<directory>target/lib</directory>
-			<outputDirectory>lib</outputDirectory>
-			<includes>
-				<include>jline-0.9.94.jar</include>
-				<include>jopt-simple-3.2.jar</include>
-				<include>junit-3.8.1.jar</include>
-				<include>kafka_2.10-0.8.2.1.jar</include>
-				<include>kafka-clients-0.8.2.1.jar</include>
-				<include>log4j-1.2.17.jar</include>
-				<include>lz4-1.2.0.jar</include>
-				<include>metrics-core-2.2.0.jar</include>
-				<include>netty-3.7.0.Final.jar</include>
-				<include>scala-library-2.10.4.jar</include>
-				<include>slf4j-api-1.7.2.jar</include>
-				<include>slf4j-log4j12-1.6.1.jar</include>
-				<include>snappy-java-1.1.1.6.jar</include>
-				<include>zkclient-0.3.jar</include>
-				<include>zookeeper-3.4.6.jar</include>
-			</includes>
-		</fileSet>
 		<fileSet>
 			<directory>target</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
 				<include>*.jar</include>
 				<include>version.xml</include>
+                                <include>lib/*.jar</include>
 			</includes>
 		</fileSet>
 	</fileSets>
diff --git a/pom.xml b/pom.xml
index 670e10e..d49bad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,15 @@
 	<groupId>com.ruckuswireless</groupId>
 	<artifactId>pentaho-kafka-consumer</artifactId>
 	<version>TRUNK-SNAPSHOT</version>
-	<name>Apache Kafka Integration Plug-In for Pentaho</name>
+	<name>Apache Kafka Consumer Plug-In for Pentaho</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.6</maven.compiler.target>
 		<maven.compiler.source>1.6</maven.compiler.source>
         <kettle.version>6.1.0.2-208</kettle.version>
+        <kafka.scala.version>2.10</kafka.scala.version>
+        <kafka.version>0.8.2.1</kafka.version>
 		<buildId>${maven.build.timestamp}</buildId>
 		<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
 	</properties>
@@ -30,8 +32,8 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.10</artifactId>
-			<version>0.8.2.1</version>
+			<artifactId>kafka_${kafka.scala.version}</artifactId>
+			<version>${kafka.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.sun.jmx</groupId>
@@ -51,31 +53,14 @@
 			<groupId>pentaho-kettle</groupId>
 			<artifactId>kettle-engine</artifactId>
 			<version>${kettle.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>pentaho-kettle</groupId>
-			<artifactId>kettle-core</artifactId>
-			<version>${kettle.version}</version>
-			<scope>compile</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>pentaho-kettle</groupId>
 			<artifactId>kettle-ui-swt</artifactId>
 			<version>${kettle.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.swt</groupId>
-			<artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
-			<version>4.3</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-		    <groupId>log4j</groupId>
-		    <artifactId>log4j</artifactId>
-		    <version>1.2.17</version>
-		</dependency>				
+			<scope>provided</scope>
+		</dependency>			
 	</dependencies>
 
 
@@ -85,16 +70,12 @@
 			<resource>
 				<directory>src/main/resources</directory>
 				<excludes>
-					<exclude>logo.png</exclude>
-					<exclude>plugin.xml</exclude>
 					<exclude>version.xml</exclude>
 				</excludes>
 			</resource>
 			<resource>
 				<directory>src/main/resources</directory>
 				<includes>
-					<include>logo.png</include>
-					<include>plugin.xml</include>
 					<include>version.xml</include>
 				</includes>
 				<filtering>true</filtering>
@@ -112,6 +93,8 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
+							<excludeScope>provided</excludeScope>
+							<includeScope>runtime</includeScope>
 							<outputDirectory>${project.build.directory}/lib</outputDirectory>
 						</configuration>
 					</execution>