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 1a16982 HOP-3166 : Remove duplicate json-simple libs
new 0a8722e Merge pull request #985 from mattcasters/master
1a16982 is described below
commit 1a16982137ba0be21ad3765ac853ef14c4dfe244
Author: Matt Casters <[email protected]>
AuthorDate: Fri Aug 6 22:15:02 2021 +0200
HOP-3166 : Remove duplicate json-simple libs
---
.../plugins/engines/beam/src/assembly/assembly.xml | 1 -
.../tech/cassandra/src/assembly/assembly.xml | 1 -
.../transforms/rest/src/assembly/assembly.xml | 64 ++++++++++------------
3 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/assemblies/plugins/engines/beam/src/assembly/assembly.xml
b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
index 338c64b..a521b2e 100644
--- a/assemblies/plugins/engines/beam/src/assembly/assembly.xml
+++ b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
@@ -129,7 +129,6 @@
<include>com.google.cloud:google-cloud-storage</include>
<include>com.google.code.findbugs:jsr305</include>
<include>com.google.code.gson:gson</include>
- <include>com.googlecode.json-simple:json-simple</include>
<include>com.google.errorprone:error_prone_annotations</include>
<include>com.google.flogger:flogger</include>
<include>com.google.flogger:flogger-system-backend</include>
diff --git a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
index b73f399..2d558a3 100644
--- a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
@@ -61,7 +61,6 @@
<include>com.github.rholder:snowball-stemmer:jar</include>
<include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:jar</include>
<include>com.googlecode.concurrent-trees:concurrent-trees:jar</include>
- <include>com.googlecode.json-simple:json-simple:jar</include>
<include>com.lmax:disruptor:jar</include>
<include>com.ning:compress-lzf:jar</include>
<include>com.thinkaurelius.thrift:thrift-server:jar</include>
diff --git a/assemblies/plugins/transforms/rest/src/assembly/assembly.xml
b/assemblies/plugins/transforms/rest/src/assembly/assembly.xml
index da702b2..76a8929 100644
--- a/assemblies/plugins/transforms/rest/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/rest/src/assembly/assembly.xml
@@ -13,45 +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-transforms-rest</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>transforms/rest</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-rest:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.googlecode.json-simple:json-simple:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <id>hop-assemblies-plugins-transforms-rest</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>transforms/rest</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-rest:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
