diff --git a/core/pom.xml b/core/pom.xml index 793c7d971..47afdc125 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -56,7 +56,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.3.0 @@ -93,7 +93,7 @@ com.google.guava guava - 32.1.3-jre + 33.0.0-jre org.apache.commons @@ -103,12 +103,12 @@ it.unimi.dsi fastutil - 8.4.4 + 8.5.13 org.roaringbitmap RoaringBitmap - 0.9.39 + 1.0.5 com.univocity @@ -118,12 +118,12 @@ com.ibm.icu icu4j - 72.1 + 74.2 io.github.classgraph classgraph - 4.8.155 + 4.8.168 org.slf4j @@ -149,25 +149,25 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 test org.apache.commons commons-text - 1.10.0 + 1.11.0 test com.github.jbellis jamm - 0.3.3 + 0.4.0 test com.h2database h2 - 2.2.220 + 2.2.224 test @@ -185,7 +185,7 @@ com.google.jimfs jimfs - 1.2 + 1.3.0 test diff --git a/excel/pom.xml b/excel/pom.xml index 262f971b0..ffbdce5b9 100644 --- a/excel/pom.xml +++ b/excel/pom.xml @@ -88,7 +88,7 @@ org.apache.poi poi-ooxml - 5.2.2 + 5.2.5 org.junit.jupiter diff --git a/html/pom.xml b/html/pom.xml index 50f70ad5c..9f004718b 100644 --- a/html/pom.xml +++ b/html/pom.xml @@ -87,7 +87,7 @@ org.jsoup jsoup - 1.15.3 + 1.17.2 org.junit.jupiter diff --git a/json/pom.xml b/json/pom.xml index a64a9675b..c4727d123 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -95,7 +95,7 @@ com.github.wnameless.json json-flattener - 0.16.4 + 0.16.6 org.junit.jupiter diff --git a/jsplot/pom.xml b/jsplot/pom.xml index 27eb03254..639998036 100644 --- a/jsplot/pom.xml +++ b/jsplot/pom.xml @@ -94,7 +94,7 @@ io.pebbletemplates pebble - 3.1.4 + 3.2.2 net.tlabs-data diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/components/Component.java b/jsplot/src/main/java/tech/tablesaw/plotly/components/Component.java index 62c720f44..b030e7755 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/components/Component.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/components/Component.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/components/Figure.java b/jsplot/src/main/java/tech/tablesaw/plotly/components/Figure.java index 47aa3b9dd..5c2b7de9a 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/components/Figure.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/components/Figure.java @@ -1,9 +1,6 @@ package tech.tablesaw.plotly.components; import com.google.common.base.Preconditions; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; @@ -13,6 +10,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import tech.tablesaw.plotly.event.EventHandler; import tech.tablesaw.plotly.traces.Trace; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/components/Layout.java b/jsplot/src/main/java/tech/tablesaw/plotly/components/Layout.java index fdc2571f5..30a258739 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/components/Layout.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/components/Layout.java @@ -1,14 +1,15 @@ package tech.tablesaw.plotly.components; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; import java.io.Writer; import java.util.HashMap; import java.util.Map; + +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import tech.tablesaw.plotly.components.threeD.Scene; public class Layout { diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/components/TemplateUtils.java b/jsplot/src/main/java/tech/tablesaw/plotly/components/TemplateUtils.java index 7a85336e4..a5fd6086c 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/components/TemplateUtils.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/components/TemplateUtils.java @@ -1,11 +1,12 @@ package tech.tablesaw.plotly.components; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.DelegatingLoader; -import com.mitchellbosecke.pebble.loader.FileLoader; -import com.mitchellbosecke.pebble.loader.Loader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.DelegatingLoader; +import io.pebbletemplates.pebble.loader.FileLoader; +import io.pebbletemplates.pebble.loader.Loader; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/components/threeD/Scene.java b/jsplot/src/main/java/tech/tablesaw/plotly/components/threeD/Scene.java index 9041853e3..7d63f341f 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/components/threeD/Scene.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/components/threeD/Scene.java @@ -1,7 +1,7 @@ package tech.tablesaw.plotly.components.threeD; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/AbstractTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/AbstractTrace.java index 0c4baebbd..09a1e95d8 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/AbstractTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/AbstractTrace.java @@ -1,8 +1,9 @@ package tech.tablesaw.plotly.traces; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; + import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/BarTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/BarTrace.java index 36f54ce2e..e36690af6 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/BarTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/BarTrace.java @@ -2,8 +2,8 @@ import static tech.tablesaw.plotly.Utils.dataAsString; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/BoxTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/BoxTrace.java index dd2d3db0d..ed484990d 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/BoxTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/BoxTrace.java @@ -2,8 +2,8 @@ import static tech.tablesaw.plotly.Utils.dataAsString; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/ContourTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/ContourTrace.java index aebee67c1..7c82143b0 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/ContourTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/ContourTrace.java @@ -1,7 +1,7 @@ package tech.tablesaw.plotly.traces; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/HeatmapTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/HeatmapTrace.java index 6aea6b76a..97928ac8f 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/HeatmapTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/HeatmapTrace.java @@ -2,8 +2,8 @@ import static tech.tablesaw.plotly.Utils.dataAsString; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/Histogram2DTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/Histogram2DTrace.java index 82c30c6a9..c9b061ab1 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/Histogram2DTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/Histogram2DTrace.java @@ -1,7 +1,7 @@ package tech.tablesaw.plotly.traces; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/HistogramTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/HistogramTrace.java index fc8e476a2..23893f794 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/HistogramTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/HistogramTrace.java @@ -1,7 +1,7 @@ package tech.tablesaw.plotly.traces; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/PieTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/PieTrace.java index 02af6ad2d..47ec1223a 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/PieTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/PieTrace.java @@ -1,7 +1,7 @@ package tech.tablesaw.plotly.traces; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/Scatter3DTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/Scatter3DTrace.java index 7ce39c2f6..89a99d201 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/Scatter3DTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/Scatter3DTrace.java @@ -3,8 +3,8 @@ import static tech.tablesaw.plotly.Utils.dataAsString; import com.google.common.base.Preconditions; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/ScatterTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/ScatterTrace.java index 0a3eb7df5..7e8ee6fde 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/ScatterTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/ScatterTrace.java @@ -3,8 +3,8 @@ import static tech.tablesaw.plotly.Utils.dataAsString; import com.google.common.base.Preconditions; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/jsplot/src/main/java/tech/tablesaw/plotly/traces/ViolinTrace.java b/jsplot/src/main/java/tech/tablesaw/plotly/traces/ViolinTrace.java index a9a545bfa..ccc02e699 100644 --- a/jsplot/src/main/java/tech/tablesaw/plotly/traces/ViolinTrace.java +++ b/jsplot/src/main/java/tech/tablesaw/plotly/traces/ViolinTrace.java @@ -2,8 +2,8 @@ import static tech.tablesaw.plotly.Utils.dataAsString; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; diff --git a/pom.xml b/pom.xml index 65193322d..597ba4c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,11 @@ org.sonatype.plugins nexus-staging-maven-plugin + + org.codehaus.mojo + versions-maven-plugin + 2.16.2 + @@ -124,7 +129,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M9 + 3.2.5 org.apache.maven.plugins @@ -286,32 +291,32 @@ com.fasterxml.jackson.core jackson-core - 2.13.2 + 2.17.0 com.fasterxml.jackson.core jackson-databind - 2.13.4.2 + 2.17.0 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.13.2 + 2.17.0 org.slf4j slf4j-api - 1.7.30 + 2.0.12 org.junit.jupiter junit-jupiter-engine - 5.5.2 + 5.10.2 org.junit.jupiter junit-jupiter-params - 5.5.2 + 5.10.2