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 320a406f28828b3dbdc53c91fc04be15e31e28d6 Author: Christofer Dutz <[email protected]> AuthorDate: Wed Aug 21 14:31:42 2019 +0200 - Updated the assembly to be as defined in the kafka plugin. --- plc4j/integrations/logstash-plugin/pom.xml | 55 ++++++++++++++++++++-- .../logstash-plugin/src/assembly/assembly.xml | 38 +++++++++++++++ 2 files changed, 88 insertions(+), 5 deletions(-) diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml index 666f5b3..8810de6 100644 --- a/plc4j/integrations/logstash-plugin/pom.xml +++ b/plc4j/integrations/logstash-plugin/pom.xml @@ -94,9 +94,7 @@ <goal>single</goal> </goals> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <descriptors>src/assembly/assembly.xml</descriptors> <outputDirectory>${project.build.directory}/gem/vendor/jar-dependencies/org/apache/plc4x/logstash-input-plc4x/${project.version}</outputDirectory> <finalName>logstash-input-plc4x-${project.version}</finalName> <appendAssemblyId>false</appendAssemblyId> @@ -116,6 +114,7 @@ <goal>exec</goal> </goals> <configuration> + <skip>true</skip> <executable>jruby/jruby-${jruby.version}/bin/jruby</executable> <arguments> <argument>-S</argument> @@ -142,7 +141,7 @@ </execution> </executions> </plugin> - <plugin> + <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>3.0.0</version> @@ -163,6 +162,20 @@ </configuration> </execution> </executions> + </plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <usedDependencies combine.children="append"> + <usedDependency>org.apache.plc4x:plc4j-driver-ads</usedDependency> + <usedDependency>org.apache.plc4x:plc4j-driver-ethernet-ip</usedDependency> + <usedDependency>org.apache.plc4x:plc4j-driver-modbus</usedDependency> + <usedDependency>org.apache.plc4x:plc4j-driver-opcua</usedDependency> + <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency> + <usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency> + </usedDependencies> + </configuration> </plugin> </plugins> </build> @@ -188,11 +201,43 @@ <artifactId>plc4x-tools-logstash-core</artifactId> <version>${project.version}-${logstash.version}</version> </dependency> + + <!-- Include all drivers --> + <dependency> + <groupId>org.apache.plc4x</groupId> + <artifactId>plc4j-driver-ads</artifactId> + <version>0.5.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.plc4x</groupId> + <artifactId>plc4j-driver-ethernet-ip</artifactId> + <version>0.5.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.plc4x</groupId> + <artifactId>plc4j-driver-modbus</artifactId> + <version>0.5.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.plc4x</groupId> + <artifactId>plc4j-driver-opcua</artifactId> + <version>0.5.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.plc4x</groupId> + <artifactId>plc4j-driver-s7</artifactId> + <version>0.5.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.apache.plc4x</groupId> <artifactId>plc4j-driver-simulated</artifactId> <version>0.5.0-SNAPSHOT</version> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> diff --git a/plc4j/integrations/logstash-plugin/src/assembly/assembly.xml b/plc4j/integrations/logstash-plugin/src/assembly/assembly.xml new file mode 100644 index 0000000..d18b085 --- /dev/null +++ b/plc4j/integrations/logstash-plugin/src/assembly/assembly.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<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>jar-with-dependencies</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <useProjectArtifact>true</useProjectArtifact> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <containerDescriptorHandlers> + <!-- Make sure the service descriptors are merged (Otherwise only one driver is found) --> + <containerDescriptorHandler> + <handlerName>metaInf-services</handlerName> + </containerDescriptorHandler> + </containerDescriptorHandlers> +</assembly> \ No newline at end of file
