Skip to content

Commit

Permalink
Merge pull request #70 from robbavey/fix_jar_dependencies
Browse files Browse the repository at this point in the history
Remove `jar-dependencies` dependency
  • Loading branch information
robbavey authored Dec 9, 2024
2 parents be394c0 + a5a4588 commit d0b3e33
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import:
- logstash-plugins/.ci:travis/defaults.yml@1.x
- logstash-plugins/.ci:travis/exec.yml@1.x
- logstash-plugins/.ci:travis/travis.yml@1.x

env:
jobs:
# lock on version 8.x because use of Guava 26+ available from 8.2.0
- ELASTIC_STACK_VERSION=8.x DOCKER_ENV=dockerjdk17.env
- SNAPSHOT=true ELASTIC_STACK_VERSION=8.x DOCKER_ENV=dockerjdk17.env
jobs:
# lock on version 8.x because use of Guava 26+ available from 8.2.0
exclude:
- env: ELASTIC_STACK_VERSION=7.current
- env: SNAPSHOT=true ELASTIC_STACK_VERSION=7.current
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Unreleased
- Removed `jar-dependencies` dependency. [#70](https://github.com/logstash-plugins/logstash-input-google_pubsub/pull/70)

## 1.4.0
- Added optional field json_key_file_content to get Service Account JSON key as an String input. [#68](https://github.com/logstash-plugins/logstash-input-google_pubsub/pull/68)

Expand Down
2 changes: 1 addition & 1 deletion lib/logstash-input-google_pubsub_jars.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
require_jar('org.codehaus.mojo', 'animal-sniffer-annotations', '1.23')
require_jar('org.conscrypt', 'conscrypt-openjdk-uber', '2.5.2')
require_jar('org.threeten', 'threetenbp', '1.6.8')
require_jar('org.logstash.inputs', 'logstash-input-google_pubsub', '1.3.0')
require_jar('org.logstash.inputs', 'logstash-input-google_pubsub', '1.4.0')
1 change: 0 additions & 1 deletion logstash-input-google_pubsub.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ Gem::Specification.new do |s|
s.requirements << "jar 'com.google.api:api-common', '1.2.0'"
s.requirements << "jar 'com.google.auth:google-auth-library-oauth2-http', '0.9.0'"
s.add_development_dependency 'logstash-devutils'
s.add_development_dependency 'jar-dependencies', '~> 0.4'
end

0 comments on commit d0b3e33

Please sign in to comment.