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:18 UTC
[plc4x] 30/44: - Removed the "SNAPSHOT"
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 2a307bef04885348c52b618d9c65413df48d5bae
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Aug 21 14:47:35 2019 +0200
- Removed the "SNAPSHOT"
---
plc4j/integrations/logstash-plugin/pom.xml | 9 ++++++---
.../logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb | 2 +-
.../logstash-plugin/src/gem/logstash-input-plc4x.gemspec | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index 575ac9a..972fadc 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -36,8 +36,10 @@
<properties>
<jruby.version>9.2.8.0</jruby.version>
</properties>
+
<build>
<plugins>
+ <!-- Download and unpack jruby -->
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
@@ -59,7 +61,7 @@
</execution>
</executions>
</plugin>
- <!-- Prepare the gemspec file containing the project information -->
+ <!-- Prepare all the resources the gem build needs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -95,14 +97,15 @@
</goals>
<configuration>
<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>
+ <outputDirectory>${project.build.directory}/gem/vendor/jar-dependencies/org/apache/plc4x/logstash-input-plc4x/0.5.0</outputDirectory>
+ <finalName>logstash-input-plc4x-0.5.0</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
</configuration>
</execution>
</executions>
</plugin>
+ <!-- Execute the gem build using jruby -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
diff --git a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
index a1a0836..fed2279 100644
--- a/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
+++ b/plc4j/integrations/logstash-plugin/src/gem/lib/logstash-input-plc4x_jars.rb
@@ -18,4 +18,4 @@
# ----------------------------------------------------------------------------
require 'jar_dependencies'
-require_jar('${project.groupId}', 'logstash-input-plc4x', '${project.version}')
\ No newline at end of file
+require_jar('${project.groupId}', 'logstash-input-plc4x', '0.5.0')
\ No newline at end of file
diff --git a/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec b/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec
index c96d7b9..a440d09 100644
--- a/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec
+++ b/plc4j/integrations/logstash-plugin/src/gem/logstash-input-plc4x.gemspec
@@ -19,7 +19,7 @@
Gem::Specification.new do |s|
s.name = '${project.artifactId}'
- s.version = '${project.version}'
+ s.version = '0.5.0'
s.licenses = ['Apache-2.0']
s.summary = "${project.name}"
s.description = "${project.description}"