diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2018-07-11 14:53:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-11 14:53:12 +0000 |
| commit | 2156ac762315a2ba18e3fe9b59a98a673c818162 (patch) | |
| tree | d525b1f523404bbef03bc57405c445e4f5d17e36 | |
| parent | b461c6505afddacbef90e3dc0bfa9d49609a626b (diff) | |
| parent | fe1c4796744261dc760680dc6e40e479d2015b3b (diff) | |
Merge "Change JNR and DOM4J license versions"
| -rw-r--r-- | plugins/plugins-executor/plugins-executor-jruby/pom.xml | 22 | ||||
| -rw-r--r-- | plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml | 11 |
2 files changed, 33 insertions, 0 deletions
diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml index 901d30e9f..759cfb6b0 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml +++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml @@ -48,7 +48,29 @@ <groupId>org.jruby</groupId> <artifactId>jruby-stdlib</artifactId> </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-posix:</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-posix:</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jffi</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-posix</artifactId> + <version>3.0.45</version> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jffi</artifactId> + <version>1.2.10</version> + </dependency> </dependencies> </project> diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml index 29c0519e8..f20a06c1f 100644 --- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml +++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml @@ -39,6 +39,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernate.version}</version> + <exclusions> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -50,5 +56,10 @@ <artifactId>h2</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6</version> + </dependency> </dependencies> </project>
\ No newline at end of file |