Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Commit

Permalink
Issue #49, Beam 2.18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mattcasters committed Feb 5, 2020
1 parent 081cf37 commit 9a9a0c5
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
22 changes: 12 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@
<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">
<modelVersion>4.0.0</modelVersion>

<groupId>kettle-beam</groupId>
<artifactId>kettle-beam</artifactId>
<name>Kettle Beam</name>
<description>Kettle runtime plugins for Apache Beam</description>
<version>1.0.1-SNAPSHOT</version>

<parent>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-ce-jar-parent-pom</artifactId>
<version>8.2.0.7-719</version>
</parent>
<artifactId>kettle-beam</artifactId>
<name>${project.artifactId}</name>
<description>Kettle runtime plugins for Apache Beam</description>

<licenses>
<license>
<name>Apache License, version 2.0</name>
Expand All @@ -22,8 +27,8 @@
<pentaho-kettle.version>8.2.0.0-342</pentaho-kettle.version>
<mockito-all.version>1.9.5</mockito-all.version>
<junit.version>4.4</junit.version>
<apache-beam-version>2.16.0</apache-beam-version>
<kettle-beam-version>1.0.0-SNAPSHOT</kettle-beam-version>
<apache-beam-version>2.18.0</apache-beam-version>
<kettle-beam-version>1.0.1-SNAPSHOT</kettle-beam-version>
<spark-version>2.4.3</spark-version>
</properties>

Expand Down Expand Up @@ -78,7 +83,7 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-flink_2.11</artifactId>
<version>${apache-beam-version}</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.beam</groupId>
Expand Down Expand Up @@ -258,7 +263,7 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-flink_2.11</artifactId>
<version>${apache-beam-version}</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.beam</groupId>
Expand Down Expand Up @@ -349,7 +354,4 @@
</dependencies>
</dependencyManagement>


<groupId>kettle-beam</groupId>
<version>1.0.0-SNAPSHOT</version>
</project>
6 changes: 3 additions & 3 deletions src/main/java/org/kettle/beam/core/BeamKettle.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static final void init( List<String> stepPluginClasses, List<String> xpPl

XMLHandlerCache.getInstance();

LOG.info( "Registering " + stepPluginClasses.size() + " extra step plugins, and " + xpPluginClasses.size() + " XP plugins" );
// LOG.info( "Registering " + stepPluginClasses.size() + " extra step plugins, and " + xpPluginClasses.size() + " XP plugins" );

// Register extra classes from the plugins...
// If they're already in the classpath, this should be fast.
Expand All @@ -57,7 +57,7 @@ public static final void init( List<String> stepPluginClasses, List<String> xpPl

// The plugin class is already in the classpath so we simply call Class.forName() on it.
//
LOG.info( "Registering step plugin class: " + stepPluginClass );
// LOG.info( "Registering step plugin class: " + stepPluginClass );
stepPluginType.handlePluginAnnotation( stepPluginClass, annotation, new ArrayList<String>(), true, null );
} else {
LOG.debug( "Plugin " + stepPluginClassName + " is already registered" );
Expand All @@ -81,7 +81,7 @@ public static final void init( List<String> stepPluginClasses, List<String> xpPl

// The plugin class is already in the classpath so we simply call Class.forName() on it.
//
LOG.info( "Registering step plugin class: " + xpPluginClass );
// LOG.info( "Registering step plugin class: " + xpPluginClass );
xpPluginType.handlePluginAnnotation( xpPluginClass, annotation, new ArrayList<String>(), true, null );
} else {
LOG.debug( "Plugin " + xpPluginClassName + " is already registered" );
Expand Down

0 comments on commit 9a9a0c5

Please sign in to comment.