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 ad60407a20 HOP-4014: remove activation-api from distribution bundles
new cf3d9b09ac Merge pull request #1551 from hansva/master
ad60407a20 is described below
commit ad60407a20e4557d00513f9b16fa3212ab43854f
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Thu Jun 23 09:24:28 2022 +0200
HOP-4014: remove activation-api from distribution bundles
---
assemblies/plugins/actions/getpop/pom.xml | 11 +++--------
assemblies/plugins/actions/getpop/src/assembly/assembly.xml | 1 -
assemblies/plugins/actions/mail/pom.xml | 11 +++--------
assemblies/plugins/actions/mail/src/assembly/assembly.xml | 2 +-
assemblies/plugins/tech/parquet/src/assembly/assembly.xml | 2 +-
assemblies/plugins/transforms/mail/pom.xml | 11 +++--------
assemblies/plugins/transforms/mailinput/pom.xml | 11 +++--------
.../plugins/transforms/mailinput/src/assembly/assembly.xml | 1 -
assemblies/plugins/transforms/tika/src/assembly/assembly.xml | 2 +-
plugins/actions/getpop/pom.xml | 11 +++--------
plugins/actions/mail/pom.xml | 11 +++--------
plugins/transforms/mail/pom.xml | 11 +++--------
plugins/transforms/mailinput/pom.xml | 11 +++--------
13 files changed, 27 insertions(+), 69 deletions(-)
diff --git a/assemblies/plugins/actions/getpop/pom.xml
b/assemblies/plugins/actions/getpop/pom.xml
index 43ab598300..ffea64bbe9 100644
--- a/assemblies/plugins/actions/getpop/pom.xml
+++ b/assemblies/plugins/actions/getpop/pom.xml
@@ -46,14 +46,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
b/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
index 551046a2fe..3c53caf3b8 100644
--- a/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
+++ b/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
@@ -52,7 +52,6 @@
<includes>
<include>com.sun.mail:jakarta.mail</include>
<include>com.sun.activation:jakarta.activation</include>
- <include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/assemblies/plugins/actions/mail/pom.xml
b/assemblies/plugins/actions/mail/pom.xml
index bfdcafd370..c0717f7da3 100644
--- a/assemblies/plugins/actions/mail/pom.xml
+++ b/assemblies/plugins/actions/mail/pom.xml
@@ -46,14 +46,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/actions/mail/src/assembly/assembly.xml
b/assemblies/plugins/actions/mail/src/assembly/assembly.xml
index a1e79b7479..6ff2e8d40f 100644
--- a/assemblies/plugins/actions/mail/src/assembly/assembly.xml
+++ b/assemblies/plugins/actions/mail/src/assembly/assembly.xml
@@ -52,7 +52,7 @@
<includes>
<include>com.sun.mail:jakarta.mail</include>
<include>com.sun.activation:jakarta.activation</include>
- <include>jakarta.activation:jakarta.activation-api</include>
</includes>
+ </includes>
</dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/tech/parquet/src/assembly/assembly.xml
b/assemblies/plugins/tech/parquet/src/assembly/assembly.xml
index 6947c6072a..b486b075ff 100644
--- a/assemblies/plugins/tech/parquet/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/parquet/src/assembly/assembly.xml
@@ -59,7 +59,7 @@
<include>com.sun.jersey:jersey-client:jar</include>
<include>com.sun.jersey:jersey-core:jar</include>
<include>io.netty:netty:jar</include>
-
<include>jakarta.activation:jakarta.activation-api:jar</include>
+ <include>jakarta.activation:jakarta.activation:jar</include>
<include>javax.xml.bind:jaxb-api:jar</include>
<include>javax.xml.stream:stax-api:jar</include>
<include>org.apache.curator:curator-client:jar</include>
diff --git a/assemblies/plugins/transforms/mail/pom.xml
b/assemblies/plugins/transforms/mail/pom.xml
index 340f3d35c1..dff8a201e7 100644
--- a/assemblies/plugins/transforms/mail/pom.xml
+++ b/assemblies/plugins/transforms/mail/pom.xml
@@ -48,14 +48,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/mailinput/pom.xml
b/assemblies/plugins/transforms/mailinput/pom.xml
index 46005b0ded..401e174b56 100644
--- a/assemblies/plugins/transforms/mailinput/pom.xml
+++ b/assemblies/plugins/transforms/mailinput/pom.xml
@@ -54,14 +54,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
b/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
index 82841da48d..cd121c1e60 100644
--- a/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
@@ -57,7 +57,6 @@
<includes>
<include>com.sun.mail:jakarta.mail</include>
<include>com.sun.activation:jakarta.activation</include>
- <include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/assemblies/plugins/transforms/tika/src/assembly/assembly.xml
b/assemblies/plugins/transforms/tika/src/assembly/assembly.xml
index 4677c1d05d..446630dac7 100644
--- a/assemblies/plugins/transforms/tika/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/tika/src/assembly/assembly.xml
@@ -62,7 +62,7 @@
<include>com.pff:java-libpst:jar</include>
<include>com.rometools:rome:jar</include>
<include>com.rometools:rome-utils:jar</include>
- <include>jakarta.activation:jakarta.activation-api:jar</include>
+ <include>jakarta.activation:jakarta.activation:jar</include>
<include>com.sun.istack:istack-commons-runtime:jar</include>
<include>com.zaxxer:SparseBitSet:jar</include>
<include>de.l3s.boilerpipe:boilerpipe:jar</include>
diff --git a/plugins/actions/getpop/pom.xml b/plugins/actions/getpop/pom.xml
index 24fbe64f78..29f9ef9e19 100644
--- a/plugins/actions/getpop/pom.xml
+++ b/plugins/actions/getpop/pom.xml
@@ -44,14 +44,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
</dependencies>
diff --git a/plugins/actions/mail/pom.xml b/plugins/actions/mail/pom.xml
index dd0e049d6e..eb9b4935c8 100644
--- a/plugins/actions/mail/pom.xml
+++ b/plugins/actions/mail/pom.xml
@@ -40,14 +40,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
</dependencies>
diff --git a/plugins/transforms/mail/pom.xml b/plugins/transforms/mail/pom.xml
index c548957402..e538ad3882 100644
--- a/plugins/transforms/mail/pom.xml
+++ b/plugins/transforms/mail/pom.xml
@@ -40,14 +40,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plugins/transforms/mailinput/pom.xml
b/plugins/transforms/mailinput/pom.xml
index dff11f2de7..0b118598a7 100644
--- a/plugins/transforms/mailinput/pom.xml
+++ b/plugins/transforms/mailinput/pom.xml
@@ -40,14 +40,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
