fixed plugin build

apache · Aug 20, 2019 · bf4ca89 · bf4ca89
1 parent 139895d
commit bf4ca89
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
@@ -130,7 +130,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-${project.version}.gem</file>
+                  <file>${project.build.directory}/gem/${project.artifactId}-${project.version}.gem</file>
                   <type>gem</type>
                 </artifact>
               </artifacts>
@@ -168,10 +168,6 @@
       <version>0.5.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash/inputs/plc4x.rb b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash/inputs/plc4x.rb
@@ -19,7 +19,7 @@
 
 require "logstash/inputs/base"
 require "logstash/namespace"
-require "logstash-input-java_input_example_jars"
+require "logstash-input-plc4x_jars"
 require "java"
 
 class LogStash::Inputs::Plc4xInput < LogStash::Inputs::Base

diff --git a/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4xInput.java b/plc4j/integrations/logstash-plugin/src/main/java/org/apache/plc4x/logstash/Plc4xInput.java
@@ -38,7 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.function.Consumer;
 
 // class name must match plugin name
-@LogstashPlugin(name="plc4x_input")
+@LogstashPlugin(name="plc4x")
 public class Plc4xInput implements Input {
 
     public static final PluginConfigSpec<Map<String, Object>> JOB_CONFIG =

diff --git a/plc4j/pom.xml b/plc4j/pom.xml
@@ -252,6 +252,7 @@
                 <ignoredDependency>org.codehaus.groovy:groovy-test-junit5</ignoredDependency>
                 <ignoredDependency>org.codehaus.groovy:groovy</ignoredDependency>
                 <ignoredDependency>com.athaydes:spock-reports</ignoredDependency>
+                <ignoredDependency>org.apache.plc4x:plc4j-driver-simulated</ignoredDependency>
               </ignoredDependencies>
             </configuration>
           </execution>