You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/09/23 10:44:26 UTC
[incubator-hop] branch master updated: HOP-3292 : Align apache
commons lang3 library versions
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 683d1cc HOP-3292 : Align apache commons lang3 library versions
new 9a4239c Merge pull request #1076 from mattcasters/master
683d1cc is described below
commit 683d1cc2addc9d1299fdcf393f86e5923f129f8e
Author: Matt Casters <ma...@gmail.com>
AuthorDate: Thu Sep 23 10:45:09 2021 +0200
HOP-3292 : Align apache commons lang3 library versions
---
assemblies/core/lib/pom.xml | 11 +
.../plugins/engines/beam/src/assembly/assembly.xml | 1 -
assemblies/plugins/misc/import/pom.xml | 42 ++--
.../plugins/misc/import/src/assembly/assembly.xml | 65 +++--
.../plugins/tech/azure/src/assembly/assembly.xml | 2 -
assemblies/plugins/tech/cassandra/pom.xml | 137 +++++------
.../tech/cassandra/src/assembly/assembly.xml | 1 -
.../transforms/fake/src/assembly/assembly.xml | 76 +++---
core/pom.xml | 12 +-
plugins/misc/import/pom.xml | 270 ++++++++++-----------
plugins/tech/cassandra/pom.xml | 3 -
pom.xml | 1 +
12 files changed, 305 insertions(+), 316 deletions(-)
diff --git a/assemblies/core/lib/pom.xml b/assemblies/core/lib/pom.xml
index 42cdcac..bb7e271 100644
--- a/assemblies/core/lib/pom.xml
+++ b/assemblies/core/lib/pom.xml
@@ -181,6 +181,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>net.sf.flexjson</groupId>
<artifactId>flexjson</artifactId>
<version>${flexjson.version}</version>
diff --git a/assemblies/plugins/engines/beam/src/assembly/assembly.xml b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
index e23e6c9..eb7313c 100644
--- a/assemblies/plugins/engines/beam/src/assembly/assembly.xml
+++ b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
@@ -251,7 +251,6 @@
<include>org.apache.beam:beam-vendor-sdks-java-extensions-protobuf</include>
<include>org.apache.hbase:hbase-shaded-client</include>
<include>org.apache.commons:commons-crypto</include>
- <include>org.apache.commons:commons-lang3</include>
<include>org.apache.commons:commons-math3</include>
<include>org.apache.curator:curator-client</include>
<include>org.apache.curator:curator-framework</include>
diff --git a/assemblies/plugins/misc/import/pom.xml b/assemblies/plugins/misc/import/pom.xml
index d553e5f..c365ee1 100644
--- a/assemblies/plugins/misc/import/pom.xml
+++ b/assemblies/plugins/misc/import/pom.xml
@@ -14,36 +14,30 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-assemblies-plugins-misc</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>hop-assemblies-plugins-misc-import</artifactId>
+ <parent>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-assemblies-plugins-misc</artifactId>
<version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Hop Assemblies Plugins Miscellaneous Import</name>
- <description></description>
+ </parent>
+
+ <artifactId>hop-assemblies-plugins-misc-import</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Hop Assemblies Plugins Miscellaneous Import</name>
+ <description></description>
- <dependencies>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-misc-import</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.10</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-plugins-misc-import</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/misc/import/src/assembly/assembly.xml b/assemblies/plugins/misc/import/src/assembly/assembly.xml
index 4974da4..1e136b5 100644
--- a/assemblies/plugins/misc/import/src/assembly/assembly.xml
+++ b/assemblies/plugins/misc/import/src/assembly/assembly.xml
@@ -13,46 +13,37 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>hop-assemblies-plugins-misc-import</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>misc/import</baseDirectory>
- <files>
- <file>
- <source>${project.basedir}/src/main/resources/version.xml</source>
- <outputDirectory>.</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.hop:hop-plugins-misc-import:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.commons:commons-lang3</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <id>hop-assemblies-plugins-misc-import</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>misc/import</baseDirectory>
+ <files>
+ <file>
+ <source>${project.basedir}/src/main/resources/version.xml</source>
+ <outputDirectory>.</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.apache.hop:hop-plugins-misc-import:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/tech/azure/src/assembly/assembly.xml b/assemblies/plugins/tech/azure/src/assembly/assembly.xml
index aa5438c..9b0aee3 100644
--- a/assemblies/plugins/tech/azure/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/azure/src/assembly/assembly.xml
@@ -13,7 +13,6 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
@@ -54,7 +53,6 @@
<includes>
<include>com.microsoft.azure:azure-storage</include>
<include>com.microsoft.azure:azure-keyvault-core</include>
- <include>org.apache.commons:commons-lang3</include>
<include>com.microsoft.azure:azure-eventhubs:jar</include>
<include>org.apache.qpid:proton-j:jar</include>
<include>com.microsoft.azure:qpid-proton-j-extensions:jar</include>
diff --git a/assemblies/plugins/tech/cassandra/pom.xml b/assemblies/plugins/tech/cassandra/pom.xml
index ebc83f6..8ebf723 100644
--- a/assemblies/plugins/tech/cassandra/pom.xml
+++ b/assemblies/plugins/tech/cassandra/pom.xml
@@ -14,91 +14,88 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-assemblies-plugins-tech</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>hop-assemblies-plugins-tech-cassandra</artifactId>
+ <parent>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-assemblies-plugins-tech</artifactId>
<version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Hop Assemblies Plugins Technology Cassandra</name>
- <description></description>
+ </parent>
- <properties>
- <cassandra.version>3.11.10</cassandra.version>
- <cassandra-driver.version>3.11.0</cassandra-driver.version>
+ <artifactId>hop-assemblies-plugins-tech-cassandra</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Hop Assemblies Plugins Technology Cassandra</name>
+ <description></description>
- <snakeyaml.version>1.11</snakeyaml.version>
- <netty.version>4.0.44.Final</netty.version>
- <clearspring-stream.version>2.8.0</clearspring-stream.version>
- <sigar.version>1.6.4</sigar.version>
- <dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
- <lz4.version>1.3.0</lz4.version>
- <jna.version>4.0.0</jna.version>
- <jamm.version>0.3.0</jamm.version>
- <high-scale-lib.version>1.0.6</high-scale-lib.version>
- <supercsv.version>2.1.0</supercsv.version>
- <libthrift.version>0.12.0</libthrift.version>
+ <properties>
+ <cassandra.version>3.11.10</cassandra.version>
+ <cassandra-driver.version>3.11.0</cassandra-driver.version>
- <apache.commons.lang3.version>3.10</apache.commons.lang3.version>
- </properties>
+ <snakeyaml.version>1.11</snakeyaml.version>
+ <netty.version>4.0.44.Final</netty.version>
+ <clearspring-stream.version>2.8.0</clearspring-stream.version>
+ <sigar.version>1.6.4</sigar.version>
+ <dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
+ <lz4.version>1.3.0</lz4.version>
+ <jna.version>4.0.0</jna.version>
+ <jamm.version>0.3.0</jamm.version>
+ <high-scale-lib.version>1.0.6</high-scale-lib.version>
+ <supercsv.version>2.1.0</supercsv.version>
+ <libthrift.version>0.12.0</libthrift.version>
+ </properties>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-tech-cassandra</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-plugins-tech-cassandra</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
- <!-- Cassandra: APL -->
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-all</artifactId>
- <version>${cassandra.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.addthis.metrics</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- Cassandra: APL -->
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-all</artifactId>
+ <version>${cassandra.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.addthis.metrics</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>com.datastax.cassandra</groupId>
- <artifactId>cassandra-driver-core</artifactId>
- <version>${cassandra-driver.version}</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.cassandra</groupId>
- <artifactId>cassandra-driver-extras</artifactId>
- <version>${cassandra-driver.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.datastax.cassandra</groupId>
+ <artifactId>cassandra-driver-core</artifactId>
+ <version>${cassandra-driver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.datastax.cassandra</groupId>
+ <artifactId>cassandra-driver-extras</artifactId>
+ <version>${cassandra-driver.version}</version>
+ </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-shaded-guava</artifactId>
- <version>25.1-jre</version>
- </dependency>
+ <dependency>
+ <groupId>com.datastax.oss</groupId>
+ <artifactId>java-driver-shaded-guava</artifactId>
+ <version>25.1-jre</version>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
index 67c45ca..ad073bc 100644
--- a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
@@ -78,7 +78,6 @@
<include>org.antlr:ST4:jar</include>
<include>org.apache.cassandra:cassandra-all:jar</include>
<include>org.apache.cassandra:cassandra-thrift:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
<include>org.apache.commons:commons-math3:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
<include>org.caffinitas.ohc:ohc-core-j8:jar</include>
diff --git a/assemblies/plugins/transforms/fake/src/assembly/assembly.xml b/assemblies/plugins/transforms/fake/src/assembly/assembly.xml
index 9d83af0..5329fc9 100644
--- a/assemblies/plugins/transforms/fake/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/fake/src/assembly/assembly.xml
@@ -13,48 +13,46 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>hop-assemblies-plugins-transforms-fake</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>transforms/fake</baseDirectory>
- <files>
- <file>
- <source>${project.basedir}/src/main/resources/version.xml</source>
- <outputDirectory>.</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.hop:hop-transform-fake:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.github.javafaker:javafaker:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
- <include>com.github.mifmif:generex:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <id>hop-assemblies-plugins-transforms-fake</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>transforms/fake</baseDirectory>
+ <files>
+ <file>
+ <source>${project.basedir}/src/main/resources/version.xml</source>
+ <outputDirectory>.</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.apache.hop:hop-transform-fake:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>com.github.javafaker:javafaker:jar</include>
+ <include>org.yaml:snakeyaml:jar</include>
+ <include>com.github.mifmif:generex:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index dccdfb5..7cf1c69 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,7 +14,6 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
@@ -320,6 +319,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${commons-net.version}</version>
diff --git a/plugins/misc/import/pom.xml b/plugins/misc/import/pom.xml
index 5d61305..4825e05 100644
--- a/plugins/misc/import/pom.xml
+++ b/plugins/misc/import/pom.xml
@@ -14,158 +14,152 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>hop-plugins-misc-import</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <artifactId>hop-plugins-misc-import</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hop Plugins Miscellaneous Import</name>
+ <name>Hop Plugins Miscellaneous Import</name>
- <parent>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-misc</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-plugins-misc</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-ui</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-engine</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-misc-projects</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.10</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito-all.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-ui</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-engine</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-plugins-misc-projects</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <classifier>test</classifier>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>test</classifier>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-engine</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-engine</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
- </dependencyManagement>
+ </dependencies>
+ </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>target/lib</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- <excludeScope>test</excludeScope>
- <excludeScope>system</excludeScope>
- <excludeScope>runtime</excludeScope>
- <excludeScope>compile</excludeScope>
- <excludeScope>provided</excludeScope>
- <includeArtifactIds>commons-collections4,commons-lang3</includeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.svg</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.svg</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <excludeScope>test</excludeScope>
+ <excludeScope>system</excludeScope>
+ <excludeScope>runtime</excludeScope>
+ <excludeScope>compile</excludeScope>
+ <excludeScope>provided</excludeScope>
+ <includeArtifactIds>commons-collections4</includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.svg</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.svg</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/plugins/tech/cassandra/pom.xml b/plugins/tech/cassandra/pom.xml
index b362c4b..0981287 100644
--- a/plugins/tech/cassandra/pom.xml
+++ b/plugins/tech/cassandra/pom.xml
@@ -14,7 +14,6 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- ~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -60,8 +59,6 @@
<supercsv.version>2.1.0</supercsv.version>
<libthrift.version>0.12.0</libthrift.version>
- <apache.commons.lang3.version>3.10</apache.commons.lang3.version>
-
<mockito.version>1.9.5</mockito.version>
<junit.version>4.11</junit.version>
</properties>
diff --git a/pom.xml b/pom.xml
index 02be54a..ba2b4bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@
<httpccore.version>4.4.6</httpccore.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
+ <commons-lang3.version>3.12.0</commons-lang3.version>
<commons-logging.version>1.1.3</commons-logging.version>
<google-api-client.version>1.31.1</google-api-client.version>
<guava.version>27.0-jre</guava.version>