Skip to content

Commit

Permalink
Upgrade gson, log4j2 and jackson dependencies (#83)
Browse files Browse the repository at this point in the history
  • Loading branch information
mashhurs committed Jul 4, 2023
1 parent a1bf84e commit af09a1c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .ci/integration/docker-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ if [ "$ELASTIC_STACK_VERSION" ]; then

# Build the gem
find . -name *.gemspec | xargs gem build
cp *.gem ci/integration/this.gem
source ci/integration/env.sh
cp *.gem .ci/integration/this.gem
source .ci/integration/env.sh

export LS_ARGS="-f $@"
docker-compose -f ci/integration/docker-compose.yml down
docker-compose -f ci/integration/docker-compose.yml up --build --exit-code-from logstash1 --force-recreate
docker-compose -f .ci/integration/docker-compose.yml down
docker-compose -f .ci/integration/docker-compose.yml up --build --exit-code-from logstash1 --force-recreate
# Need to manually stop
else
echo "Please set the ELASTIC_STACK_VERSION environment variable"
Expand Down
6 changes: 3 additions & 3 deletions .ci/integration/event_hub_consumer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.9.1</version>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.9.1</version>
<version>2.20.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
12 changes: 6 additions & 6 deletions .ci/integration/event_hub_producer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,32 +74,32 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.9.1</version>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.9.1</version>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>[2.9.10,3.0)</version>
<version>[2.15.2,3.0)</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>[2.9.10,3.0)</version>
<version>[2.15.2,3.0)</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>[2.9.10.1,3.0)</version>
<version>[2.15.2,3.0)</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.4.5
- Upgrade multiple dependencies such as `gson`, `log4j2`, `jackson` to make the plugin stable [#83](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/83)

## 1.4.4
- Fix: Replace use of block with lambda to fix wrong number of arguments error on jruby-9.3.4.0 [#75](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/75)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.4
1.4.5
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation 'com.microsoft.azure:qpid-proton-j-extensions:1.2.4'
implementation 'com.microsoft.azure:azure-eventhubs-eph:2.5.2'
implementation 'com.microsoft.azure:azure-storage:8.6.6'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'org.apache.qpid:proton-j:0.33.9'
compileOnly 'org.apache.logging.log4j:log4j-api:2.17.0' // provided by Logstash
testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' // provided by Logstash
Expand Down

0 comments on commit af09a1c

Please sign in to comment.