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:07 UTC
[isis] branch ISIS-2181 updated (4fabf1b -> f51922d)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2181
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 4fabf1b ISIS-2181: adds dependencyManagement from platform modules
new a4b5621 ISIS-2181: removes unnecessary scope=import
new 400c4dc ISIS-2181: removes unnecessary dependencyManagement declarations.
new 398aeca ISIS-2181: upgrades hamcrest from 1.3 to 2.1
new 8aa5cc8 ISIS-2181: fixes dependency convergence issues
new f51922d ISIS-2181: moves dependencyManagement up to core/pom.xml
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/commons/pom.xml | 1 -
.../metamodel/commons/matchers/IsisMatchers.java | 3 ---
core/pom.xml | 19 ++++++++++++--
extensions/pom.xml | 30 ----------------------
mavendeps/webapp/pom.xml | 1 -
5 files changed, 17 insertions(+), 37 deletions(-)
[isis] 01/05: ISIS-2181: removes unnecessary scope=import
Posted by da...@apache.org.
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/a4b562131a3859b1869a4377d61a8c75554a490c
commit a4b562131a3859b1869a4377d61a8c75554a490c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 19:18:01 2019 +0000
ISIS-2181: removes unnecessary scope=import
---
extensions/pom.xml | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index ca5b06a..c7a3aa3 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -141,16 +141,6 @@
<dependencyManagement>
<dependencies>
- <!-- ISIS CORE -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <!-- extensions -->
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-asciidoc</artifactId>
[isis] 04/05: ISIS-2181: fixes dependency convergence issues
Posted by da...@apache.org.
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/8aa5cc892add7267082b55a00313df7b99a2a565
commit 8aa5cc892add7267082b55a00313df7b99a2a565
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 20:16:56 2019 +0000
ISIS-2181: fixes dependency convergence issues
---
core/pom.xml | 4 ++--
mavendeps/webapp/pom.xml | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index e654a1b..a44fb34 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -161,8 +161,8 @@
<togglz.version>2.1.0.Final</togglz.version>
<wicket.version>8.6.1</wicket.version>
- <wicket-bootstrap.version>2.0.10</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
- <wicket-bootstrap-core.version>2.0.4</wicket-bootstrap-core.version>
+ <wicket-bootstrap.version>2.0.11</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
+ <wicket-bootstrap-core.version>2.0.11</wicket-bootstrap-core.version>
<wicket-bootstrap-datetimepicker.version>4.17.37-1</wicket-bootstrap-datetimepicker.version>
<wicket-fullcalendar.version>2.2.0</wicket-fullcalendar.version>
<wicket-source.version>7.0.0</wicket-source.version>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 5e2a6d8..6b65390 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -39,6 +39,25 @@
</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 -->
[isis] 03/05: ISIS-2181: upgrades hamcrest from 1.3 to 2.1
Posted by da...@apache.org.
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/398aeca999162379a8834a612becd801c4f4037f
commit 398aeca999162379a8834a612becd801c4f4037f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 20:16:32 2019 +0000
ISIS-2181: upgrades hamcrest from 1.3 to 2.1
---
.../java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java
index ce9faf2..6860c3b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java
@@ -20,7 +20,6 @@
package org.apache.isis.metamodel.commons.matchers;
import org.hamcrest.Description;
-import org.hamcrest.Factory;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -33,7 +32,6 @@ public final class IsisMatchers {
private IsisMatchers() {
}
- @Factory
public static Matcher<String> nonEmptyString() {
return new TypeSafeMatcher<String>() {
@Override
@@ -49,7 +47,6 @@ public final class IsisMatchers {
};
}
- @Factory
public static Matcher<Class<?>> classEqualTo(final Class<?> operand) {
class ClassEqualsMatcher extends TypeSafeMatcher<Class<?>> {
[isis] 02/05: ISIS-2181: removes unnecessary dependencyManagement
declarations.
Posted by da...@apache.org.
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/400c4dc77e01b184086dacacfa078dff0baa629a
commit 400c4dc77e01b184086dacacfa078dff0baa629a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 19:18:36 2019 +0000
ISIS-2181: removes unnecessary dependencyManagement declarations.
---
extensions/pom.xml | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index c7a3aa3..2927059 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -192,26 +192,6 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
- <!-- LOMBOK -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- POI -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- </dependency>
-
-
</dependencies>
</dependencyManagement>
[isis] 05/05: ISIS-2181: moves dependencyManagement up to
core/pom.xml
Posted by da...@apache.org.
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>