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/11/29 14:39:49 UTC
[hop] branch master updated: HOP-4642: move jakarta mail to main lib
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 684b355fca HOP-4642: move jakarta mail to main lib
new 442710e7c7 Merge pull request #1844 from hansva/master
684b355fca is described below
commit 684b355fca9345657681a5b622ada8e385c8c392
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Tue Nov 29 15:04:23 2022 +0100
HOP-4642: move jakarta mail to main lib
---
assemblies/lib/pom.xml | 5 +++++
assemblies/plugins/actions/getpop/pom.xml | 10 ----------
assemblies/plugins/actions/getpop/src/assembly/assembly.xml | 8 --------
assemblies/plugins/actions/mail/pom.xml | 10 ----------
assemblies/plugins/actions/mail/src/assembly/assembly.xml | 8 --------
assemblies/plugins/transforms/javascript/pom.xml | 10 ----------
.../plugins/transforms/javascript/src/assembly/assembly.xml | 8 --------
assemblies/plugins/transforms/mail/pom.xml | 10 ----------
assemblies/plugins/transforms/mail/src/assembly/assembly.xml | 8 --------
assemblies/plugins/transforms/mailinput/pom.xml | 10 ----------
.../plugins/transforms/mailinput/src/assembly/assembly.xml | 8 --------
11 files changed, 5 insertions(+), 90 deletions(-)
diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml
index e36b1d0001..d10b510a8e 100644
--- a/assemblies/lib/pom.xml
+++ b/assemblies/lib/pom.xml
@@ -223,6 +223,11 @@
<artifactId>jakarta.activation</artifactId>
<version>${jakarta-mail.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>${jakarta-mail.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
diff --git a/assemblies/plugins/actions/getpop/pom.xml b/assemblies/plugins/actions/getpop/pom.xml
index 2aeafd866a..85ad777c54 100644
--- a/assemblies/plugins/actions/getpop/pom.xml
+++ b/assemblies/plugins/actions/getpop/pom.xml
@@ -40,15 +40,5 @@
<artifactId>hop-action-getpop</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${jakarta-mail.version}</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 3c53caf3b8..e8b873177c 100644
--- a/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
+++ b/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
@@ -46,13 +46,5 @@
<include>org.apache.hop:hop-action-getpop:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.sun.mail:jakarta.mail</include>
- <include>com.sun.activation:jakarta.activation</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/actions/mail/pom.xml b/assemblies/plugins/actions/mail/pom.xml
index 835d0e3d74..dbf3278b59 100644
--- a/assemblies/plugins/actions/mail/pom.xml
+++ b/assemblies/plugins/actions/mail/pom.xml
@@ -40,15 +40,5 @@
<artifactId>hop-action-mail</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${jakarta-mail.version}</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 6ff2e8d40f..db7270732b 100644
--- a/assemblies/plugins/actions/mail/src/assembly/assembly.xml
+++ b/assemblies/plugins/actions/mail/src/assembly/assembly.xml
@@ -46,13 +46,5 @@
<include>org.apache.hop:hop-action-mail:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.sun.mail:jakarta.mail</include>
- <include>com.sun.activation:jakarta.activation</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/javascript/pom.xml b/assemblies/plugins/transforms/javascript/pom.xml
index d0002746b8..19855973da 100644
--- a/assemblies/plugins/transforms/javascript/pom.xml
+++ b/assemblies/plugins/transforms/javascript/pom.xml
@@ -60,15 +60,5 @@
<version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml b/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml
index cb54d2fad9..087a626c2f 100644
--- a/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/javascript/src/assembly/assembly.xml
@@ -57,13 +57,5 @@
<include>org.apache.hop:hop-transform-javascript:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.sun.mail:jakarta.mail:jar</include>
- <include>com.sun.activation:jakarta.activation:jar</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/mail/pom.xml b/assemblies/plugins/transforms/mail/pom.xml
index ebd0673450..64e8597ef2 100644
--- a/assemblies/plugins/transforms/mail/pom.xml
+++ b/assemblies/plugins/transforms/mail/pom.xml
@@ -42,15 +42,5 @@
<artifactId>hop-transform-mail</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/mail/src/assembly/assembly.xml b/assemblies/plugins/transforms/mail/src/assembly/assembly.xml
index 21ce66db2c..a8500506f9 100644
--- a/assemblies/plugins/transforms/mail/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/mail/src/assembly/assembly.xml
@@ -46,13 +46,5 @@
<include>org.apache.hop:hop-transform-mail:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.sun.mail:jakarta.mail</include>
- <include>com.sun.activation:jakarta.activation</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/mailinput/pom.xml b/assemblies/plugins/transforms/mailinput/pom.xml
index 5d78dcbc0b..2fc96651f0 100644
--- a/assemblies/plugins/transforms/mailinput/pom.xml
+++ b/assemblies/plugins/transforms/mailinput/pom.xml
@@ -48,15 +48,5 @@
<version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta-mail.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${jakarta-mail.version}</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 cd121c1e60..070b853c22 100644
--- a/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/mailinput/src/assembly/assembly.xml
@@ -51,13 +51,5 @@
<include>org.apache.hop:hop-transform-mailinput:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>com.sun.mail:jakarta.mail</include>
- <include>com.sun.activation:jakarta.activation</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file