This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new bc432d8be BIGTOP-4369. Upgrade dependencies of bigtop-data-generators
and bigpetstore-transaction-queue. (#1331)
bc432d8be is described below
commit bc432d8be6801ee668ba57404e3253c231b7a696
Author: Kengo Seki <[email protected]>
AuthorDate: Mon Feb 24 15:08:07 2025 +0900
BIGTOP-4369. Upgrade dependencies of bigtop-data-generators and
bigpetstore-transaction-queue. (#1331)
(cherry picked from commit 86f9a7f55a2d34befcddb56b72eac519f8ad430a)
---
.../bigpetstore-transaction-queue/build.gradle | 21 +++++++--------------
.../apache/bigtop/bigpetstore/qstream/LoadGen.java | 1 -
.../apache/bigtop/bigpetstore/qstream/Utils.java | 2 +-
.../bigpetstore-data-generator/build.gradle | 3 ---
.../bigtop-location-data/build.gradle | 4 ++--
.../bigtop-name-generator/build.gradle | 2 --
bigtop-data-generators/bigtop-samplers/build.gradle | 6 +++---
.../bigtop-weatherman/build.gradle | 4 +---
8 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/bigtop-bigpetstore/bigpetstore-transaction-queue/build.gradle
b/bigtop-bigpetstore/bigpetstore-transaction-queue/build.gradle
index 3060edad5..7a0d9afb7 100644
--- a/bigtop-bigpetstore/bigpetstore-transaction-queue/build.gradle
+++ b/bigtop-bigpetstore/bigpetstore-transaction-queue/build.gradle
@@ -21,7 +21,7 @@ apply plugin:'application'
mainClassName = "org.apache.bigtop.bigpetstore.qstream.LoadGen"
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
version = '1.0'
manifest {
@@ -41,22 +41,15 @@ task fatJar(type: Jar) {
repositories {
+ mavenLocal()
mavenCentral()
- maven {
- url "https://dl.bintray.com/rnowling/bigpetstore";
- }
}
dependencies {
- compile('com.fasterxml:jackson-module-json-org:0.9.1') {
- exclude group: 'org.apache.commons', module: 'commons-io'
- }
- compile('org.apache.commons:commons-io:1.3.2') {
- exclude group: 'org.apache.commons', module: 'commons-io'
- exclude group: 'commons-io', module: 'commons-io'
- }
- compile 'org.apache.httpcomponents:httpclient:4.4'
- compile group:'org.apache.commons', name:'commons-lang3',version:'3.3.2'
+ compile 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
+ compile 'commons-io:commons-io:2.18.0'
+ compile 'org.apache.httpcomponents:httpclient:4.5.14'
+ compile 'org.apache.commons:commons-lang3:3.17.0'
compile "com.github.rnowling.bigpetstore:bigpetstore-data-generator:0.2.1"
- testCompile group: 'junit', name: 'junit', version: '4.11'
+ testCompile group: 'junit', name: 'junit', version: '4.13.2'
}
diff --git
a/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/LoadGen.java
b/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/LoadGen.java
index 3e9115f1e..f627b3637 100644
---
a/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/LoadGen.java
+++
b/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/LoadGen.java
@@ -20,7 +20,6 @@ package org.apache.bigtop.bigpetstore.qstream;
import com.github.rnowling.bps.datagenerator.datamodels.inputs.InputData;
import com.github.rnowling.bps.datagenerator.datamodels.inputs.ProductCategory;
import com.github.rnowling.bps.datagenerator.datamodels.*;
-//import
com.github.rnowling.bps.datagenerator.*{DataLoader,StoreGenerator,CustomerGenerator
=> CustGen, PurchasingProfileGenerator,TransactionGenerator}
import com.github.rnowling.bps.datagenerator.*;
import com.github.rnowling.bps.datagenerator.framework.SeedFactory;
import com.google.common.collect.Lists;
diff --git
a/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/Utils.java
b/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/Utils.java
index c54fa0404..78da7afdc 100644
---
a/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/Utils.java
+++
b/bigtop-bigpetstore/bigpetstore-transaction-queue/src/main/java/org/apache/bigtop/bigpetstore/qstream/Utils.java
@@ -8,7 +8,7 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.URIUtils;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.impl.client.HttpClients;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.net.URI;
import java.util.Collection;
diff --git a/bigtop-data-generators/bigpetstore-data-generator/build.gradle
b/bigtop-data-generators/bigpetstore-data-generator/build.gradle
index 2d5b4cd28..ee53a2d99 100644
--- a/bigtop-data-generators/bigpetstore-data-generator/build.gradle
+++ b/bigtop-data-generators/bigpetstore-data-generator/build.gradle
@@ -28,9 +28,6 @@ jar {
}
dependencies {
- compile 'com.google.guava:guava:18.0'
- compile 'com.google.code.gson:gson:2.3'
- compile 'org.apache.commons:commons-lang3:3.4'
compile project(":bigtop-samplers")
compile project(":bigtop-name-generator")
compile project(":bigtop-location-data")
diff --git a/bigtop-data-generators/bigtop-location-data/build.gradle
b/bigtop-data-generators/bigtop-location-data/build.gradle
index bbced98f3..ce18c58e2 100644
--- a/bigtop-data-generators/bigtop-location-data/build.gradle
+++ b/bigtop-data-generators/bigtop-location-data/build.gradle
@@ -27,8 +27,8 @@ jar {
}
dependencies {
- compile 'com.google.guava:guava:18.0'
- compile 'org.apache.commons:commons-lang3:3.4'
+ compile 'com.google.guava:guava:33.4.0-jre'
+ compile 'org.apache.commons:commons-lang3:3.17.0'
testCompile 'junit:junit:4.+'
}
diff --git a/bigtop-data-generators/bigtop-name-generator/build.gradle
b/bigtop-data-generators/bigtop-name-generator/build.gradle
index 133dc9315..ecaea9a3a 100644
--- a/bigtop-data-generators/bigtop-name-generator/build.gradle
+++ b/bigtop-data-generators/bigtop-name-generator/build.gradle
@@ -27,8 +27,6 @@ jar {
}
dependencies {
- compile 'com.google.guava:guava:18.0'
- compile 'org.apache.commons:commons-lang3:3.4'
compile project(":bigtop-samplers")
testCompile 'junit:junit:4.+'
diff --git a/bigtop-data-generators/bigtop-samplers/build.gradle
b/bigtop-data-generators/bigtop-samplers/build.gradle
index 1d9ced0f8..f335ea461 100644
--- a/bigtop-data-generators/bigtop-samplers/build.gradle
+++ b/bigtop-data-generators/bigtop-samplers/build.gradle
@@ -27,9 +27,9 @@ jar {
}
dependencies {
- compile 'com.google.guava:guava:18.0'
- compile 'org.apache.commons:commons-lang3:3.4'
- compile 'org.apache.commons:commons-math3:3.5'
+ compile 'com.google.guava:guava:33.4.0-jre'
+ compile 'org.apache.commons:commons-lang3:3.17.0'
+ compile 'org.apache.commons:commons-math3:3.6.1'
testCompile 'junit:junit:4.+'
}
diff --git a/bigtop-data-generators/bigtop-weatherman/build.gradle
b/bigtop-data-generators/bigtop-weatherman/build.gradle
index a2835f7cb..0f64196b3 100644
--- a/bigtop-data-generators/bigtop-weatherman/build.gradle
+++ b/bigtop-data-generators/bigtop-weatherman/build.gradle
@@ -27,9 +27,7 @@ jar {
}
dependencies {
- compile 'com.google.guava:guava:18.0'
- compile 'org.apache.commons:commons-lang3:3.4'
- compile 'joda-time:joda-time:2.8.2'
+ compile 'joda-time:joda-time:2.13.1'
compile project(':bigtop-samplers')
compile project(':bigtop-location-data')
