You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/08/27 13:58:14 UTC
[plc4x] 26/44: fixed plugin build
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit bf4ca89051bc578457f79660f4eeb7a98bd200e4
Author: Till Voss <ti...@codecentric.de>
AuthorDate: Tue Aug 20 17:21:05 2019 +0200
fixed plugin build
---
plc4j/integrations/logstash-plugin/pom.xml | 6 +-----
.../logstash-plugin/src/gem/lib/logstash/inputs/plc4x.rb | 2 +-
.../src/main/java/org/apache/plc4x/logstash/Plc4xInput.java | 2 +-
plc4j/pom.xml | 1 +
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index c3b49c9..b8ea0c0 100644
--- 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
index 8227271..262f329 100644
--- 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
index 65acc0f..5e36106 100644
--- 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 @@ import java.util.concurrent.CountDownLatch;
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
index 8f85e15..5f1f374 100644
--- 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>