You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/20 21:31:12 UTC
[isis] 05/05: ISIS-2181: moves dependencyManagement up to
core/pom.xml
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2181
in repository https://gitbox.apache.org/repos/asf/isis.git
View the commit online:
https://github.com/apache/isis/commit/f51922d4e78b235c7a3cdc9cc77c1014bb84478e
commit f51922d4e78b235c7a3cdc9cc77c1014bb84478e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 21:30:41 2019 +0000
ISIS-2181: moves dependencyManagement up to core/pom.xml
---
core/commons/pom.xml | 1 -
core/pom.xml | 15 +++++++++++++++
mavendeps/webapp/pom.xml | 20 --------------------
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 24f21844..7723461 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -59,7 +59,6 @@
<artifactId>javaee-api</artifactId>
</dependency>
- <!-- provides @Nullable -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index a44fb34..78d7016 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -107,6 +107,7 @@
<docx4j.version>3.2.1</docx4j.version>
<easymock.version>2.5.2</easymock.version>
+ <error_prone_annotations.version>2.3.2</error_prone_annotations.version>
<findbugs-annotations.version>2.0.1</findbugs-annotations.version>
@@ -133,6 +134,8 @@
<jopt-simple.version>6.0-alpha-3</jopt-simple.version>
<jquery-ui.version>1.12.1</jquery-ui.version>
+ <jsr305.version>3.0.2</jsr305.version>
+
<junit.jupiter.version>5.3.2</junit.jupiter.version>
<junit-legacy.version>4.12</junit-legacy.version>
@@ -1113,6 +1116,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>${error_prone_annotations.version}</version>
+ </dependency>
+
<!-- provides @Nullable -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -1121,6 +1130,12 @@
</dependency>
<dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 6b65390..defa142 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -39,27 +39,7 @@
</property>
</activation>
- <properties>
- <jsr305.version>3.0.2</jsr305.version>
- <error_prone_annotations.version>2.3.2</error_prone_annotations.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${jsr305.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <version>${error_prone_annotations.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
-
<!-- SPRING -->
<dependency>