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/04/08 14:47:42 UTC
[incubator-hop] branch master updated: HOP-2764: add missing
dependency
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 de30afb HOP-2764: add missing dependency
new f89caee Merge pull request #738 from hansva/HOP-2764
de30afb is described below
commit de30afb91edadf258045fe2d5035f35a60e86ecf
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Thu Apr 8 16:16:16 2021 +0200
HOP-2764: add missing dependency
---
.../actions/getpop/src/assembly/assembly.xml | 8 +++++
.../plugins/actions/mail/src/assembly/assembly.xml | 1 +
.../transforms/mail/src/assembly/assembly.xml | 1 +
plugins/actions/getpop/pom.xml | 18 ++++++------
plugins/actions/mail/pom.xml | 34 +++++++++++-----------
5 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/assemblies/plugins/actions/getpop/src/assembly/assembly.xml b/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
index e8b8731..8dcc263 100644
--- a/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
+++ b/assemblies/plugins/actions/getpop/src/assembly/assembly.xml
@@ -46,5 +46,13 @@
<include>org.apache.hop:hop-action-getpop:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>javax.mail:mail:jar</include>
+ <include>javax.activation:activation:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
\ 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 29a5fc3..249cd07 100644
--- a/assemblies/plugins/actions/mail/src/assembly/assembly.xml
+++ b/assemblies/plugins/actions/mail/src/assembly/assembly.xml
@@ -51,6 +51,7 @@
<outputDirectory>lib</outputDirectory>
<includes>
<include>javax.mail:mail:jar</include>
+ <include>javax.activation:activation:jar</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/assemblies/plugins/transforms/mail/src/assembly/assembly.xml b/assemblies/plugins/transforms/mail/src/assembly/assembly.xml
index e49b15e..03ed929 100644
--- a/assemblies/plugins/transforms/mail/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/mail/src/assembly/assembly.xml
@@ -51,6 +51,7 @@
<outputDirectory>lib</outputDirectory>
<includes>
<include>javax.mail:mail:jar</include>
+ <include>javax.activation:activation:jar</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/plugins/actions/getpop/pom.xml b/plugins/actions/getpop/pom.xml
index 58ecdb9..19b5227 100644
--- a/plugins/actions/getpop/pom.xml
+++ b/plugins/actions/getpop/pom.xml
@@ -34,16 +34,16 @@
<name>Hop Plugins Actions Get mails (POP3/IMAP)</name>
<properties>
- <mail.version>1.4.7</mail.version>
+ <mail.version>1.4.7</mail.version>
</properties>
-
+
<dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${mail.version}</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${mail.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
-
+
</project>
\ No newline at end of file
diff --git a/plugins/actions/mail/pom.xml b/plugins/actions/mail/pom.xml
index c3a7d96..ff44517 100644
--- a/plugins/actions/mail/pom.xml
+++ b/plugins/actions/mail/pom.xml
@@ -20,26 +20,26 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-actions</artifactId>
- <version>0.99-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-plugins-actions</artifactId>
+ <version>0.99-SNAPSHOT</version>
+ </parent>
- <artifactId>hop-action-mail</artifactId>
- <packaging>jar</packaging>
+ <artifactId>hop-action-mail</artifactId>
+ <packaging>jar</packaging>
- <name>Hop Plugins Actions Mail</name>
+ <name>Hop Plugins Actions Mail</name>
- <dependencies>
- <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.7</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file