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 2022/08/17 12:26:10 UTC
[hop] branch master updated: HOP-4137 (#1638)
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/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 4b3188e40a HOP-4137 (#1638)
4b3188e40a is described below
commit 4b3188e40a6abbce3d01f6c78c7a52f187d7115d
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Wed Aug 17 14:26:04 2022 +0200
HOP-4137 (#1638)
* HOP-4137: cleanup dependencies
---
assemblies/client/pom.xml | 12 ------------
assemblies/core/lib/pom.xml | 24 ------------------------
assemblies/lib/pom.xml | 24 ------------------------
engine/pom.xml | 16 +++++++++++++++-
plugins/transforms/rest/pom.xml | 11 +++++++++++
5 files changed, 26 insertions(+), 61 deletions(-)
diff --git a/assemblies/client/pom.xml b/assemblies/client/pom.xml
index 0783f0e293..1581941151 100644
--- a/assemblies/client/pom.xml
+++ b/assemblies/client/pom.xml
@@ -32,7 +32,6 @@
</parent>
<properties>
- <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<!-- swt -->
<org.eclipse.swt.gtk.linux.x86_64.version>${org.eclipse.platform.version}
</org.eclipse.swt.gtk.linux.x86_64.version>
@@ -192,17 +191,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- swt -->
<dependency>
diff --git a/assemblies/core/lib/pom.xml b/assemblies/core/lib/pom.xml
index 6d4f581fce..1986936d50 100644
--- a/assemblies/core/lib/pom.xml
+++ b/assemblies/core/lib/pom.xml
@@ -43,8 +43,6 @@
<blueprints-core.version>2.6.0</blueprints-core.version>
<commons-configuration.version>1.10</commons-configuration.version>
<flexjson.version>2.1</flexjson.version>
- <mimepull.version>1.9.3</mimepull.version>
- <jsr311-api.version>1.1.1</jsr311-api.version>
<tyrus-standalone-client.version>1.13.1</tyrus-standalone-client.version>
<databricks.version>4.0.0</databricks.version>
<paho.version>1.2.0</paho.version>
@@ -185,28 +183,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>${mimepull.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr311-api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml
index 4c02b3b4f5..2806b8a4e9 100644
--- a/assemblies/lib/pom.xml
+++ b/assemblies/lib/pom.xml
@@ -41,8 +41,6 @@
<blueprints-core.version>2.6.0</blueprints-core.version>
<commons-configuration.version>1.10</commons-configuration.version>
<flexjson.version>2.1</flexjson.version>
- <mimepull.version>1.9.3</mimepull.version>
- <jsr311-api.version>1.1.1</jsr311-api.version>
<tyrus-standalone-client.version>1.13.1</tyrus-standalone-client.version>
<spark.version>2.1.0</spark.version>
<kafka.spark.version>2.3.2</kafka.spark.version>
@@ -190,28 +188,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>${mimepull.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr311-api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!--- XML Graphics commons -->
<dependency>
diff --git a/engine/pom.xml b/engine/pom.xml
index 1a15b8b28f..e8cd68f885 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -49,10 +49,12 @@
<snappy-java.version>1.1.8.4</snappy-java.version>
<commons-cli.version>1.2</commons-cli.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+ <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<javax.websocket-api.version>1.1</javax.websocket-api.version>
<picocli-version>4.6.3</picocli-version>
<json-simple.version>1.1.1</json-simple.version>
<commons-vfs2.version>2.9.0</commons-vfs2.version>
+ <osgi-core.version>6.0.0</osgi-core.version>
</properties>
<dependencies>
@@ -121,6 +123,7 @@
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jaxrs.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -184,16 +187,26 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.connectors</groupId>
+ <artifactId>jersey-jetty-connector</artifactId>
+ <version>${jersey2.version}</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
+ <version>${javax.annotation-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>${osgi-core.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
@@ -319,6 +332,7 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/plugins/transforms/rest/pom.xml b/plugins/transforms/rest/pom.xml
index 78d2e5835d..2da435c9a1 100644
--- a/plugins/transforms/rest/pom.xml
+++ b/plugins/transforms/rest/pom.xml
@@ -33,6 +33,10 @@
<name>Hop Plugins Transforms REST</name>
+ <properties>
+ <jaxrs.version>2.1.6</jaxrs.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -51,6 +55,13 @@
<version>2.0.9</version>
<scope>test</scope>
</dependency>
+ <!-- JAX-RS -->
+ <dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jaxrs.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file