You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/18 06:46:31 UTC
[isis] branch master updated (9fd7b65 -> 172f2b2)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 9fd7b65 ISIS-2433: exclude some projects from gradle build (at least for now)
new 323c05e ISIS-2433: tooling: disable test, that fails due to the fact of yet missing some build.gradle files
new 172f2b2 ISIS-2434: Bump Spring Boot 2.3.2.RELEASE to 2.3.4.RELEASE
The 2 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/pom.xml | 4 ++--
dependencies.gradle | 4 ++--
isis-parent/pom.xml | 2 +-
starters/pom.xml | 4 ++--
.../isis/tooling/adocmodel/test/AsciiDocWriterTest.java | 13 ++++++++-----
.../isis/tooling/projectmodel/test/ProjectTreeTest.java | 3 ++-
6 files changed, 17 insertions(+), 13 deletions(-)
[isis] 02/02: ISIS-2434: Bump Spring Boot 2.3.2.RELEASE to
2.3.4.RELEASE
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 172f2b21b8443454650293a50abd188fcb942fda
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 18 08:46:17 2020 +0200
ISIS-2434: Bump Spring Boot 2.3.2.RELEASE to 2.3.4.RELEASE
also bumps spring-framework.version 5.2.8.RELEASE->5.2.9.RELEASE
---
core/pom.xml | 4 ++--
dependencies.gradle | 4 ++--
isis-parent/pom.xml | 2 +-
starters/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index a110a71..094cd39 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -167,8 +167,8 @@
<shiro.version>1.4.1</shiro.version>
<simpleslackapi.version>1.2.0</simpleslackapi.version>
<slf4j-api.version>1.7.26</slf4j-api.version> <!-- as provided by spring-boot, needed to solve convergence issues -->
- <spring-framework.version>5.2.8.RELEASE</spring-framework.version>
- <spring-boot.version>2.3.2.RELEASE</spring-boot.version> <!-- has no effect here, needs to be set in isis-parent/pom.xml -->
+ <spring-framework.version>5.2.9.RELEASE</spring-framework.version>
+ <spring-boot.version>2.3.4.RELEASE</spring-boot.version> <!-- has no effect here, needs to be set in isis-parent/pom.xml -->
<summernote.version>0.8.11</summernote.version>
<swagger-core.version>1.6.0</swagger-core.version>
diff --git a/dependencies.gradle b/dependencies.gradle
index 38b5eb1..1083ec4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -26,8 +26,8 @@ ext {
lombokVersion = "1.18.12"
poiVersion = "4.1.1"
shiroVersion = "1.4.1"
- springBootVersion = "2.3.2.RELEASE"
- springVersion = "5.2.8.RELEASE"
+ springBootVersion = "2.3.4.RELEASE"
+ springVersion = "5.2.9.RELEASE"
wicketVersion = "8.9.0"
wicketBootstrapVersion = "2.0.13"
xdocreportVersion = "1.0.6"
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 4a50d16..ccd25f1 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -45,7 +45,7 @@ under the License.
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.3.2.RELEASE</version>
+ <version>2.3.4.RELEASE</version>
<relativePath/>
</parent>
diff --git a/starters/pom.xml b/starters/pom.xml
index f5086da..1aea8a9 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.3.2.RELEASE</version>
+ <version>2.3.4.RELEASE</version>
<relativePath />
</parent>
@@ -41,7 +41,7 @@
<maven.compiler.arg>-parameters</maven.compiler.arg>
- <spring-boot.version>2.3.2.RELEASE</spring-boot.version>
+ <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
<approvaltests.version>4.0.2</approvaltests.version>
<resteasy.version>4.4.1.Final</resteasy.version>
[isis] 01/02: ISIS-2433: tooling: disable test,
that fails due to the fact of yet missing some build.gradle files
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 323c05e93613aa69c2495733015315d7332f032c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 18 08:44:54 2020 +0200
ISIS-2433: tooling: disable test, that fails due to the fact of yet
missing some build.gradle files
---
.../isis/tooling/adocmodel/test/AsciiDocWriterTest.java | 13 ++++++++-----
.../isis/tooling/projectmodel/test/ProjectTreeTest.java | 3 ++-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/tooling/model4adoc/src/test/java/org/apache/isis/tooling/adocmodel/test/AsciiDocWriterTest.java b/tooling/model4adoc/src/test/java/org/apache/isis/tooling/adocmodel/test/AsciiDocWriterTest.java
index 5811f11..5bb04f6 100644
--- a/tooling/model4adoc/src/test/java/org/apache/isis/tooling/adocmodel/test/AsciiDocWriterTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/isis/tooling/adocmodel/test/AsciiDocWriterTest.java
@@ -33,7 +33,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.tooling.model4adoc.AsciiDocWriter;
-import static org.apache.isis.tooling.model4adoc.AsciiDocFactory.*;
+import static org.apache.isis.tooling.model4adoc.AsciiDocFactory.cell;
+import static org.apache.isis.tooling.model4adoc.AsciiDocFactory.doc;
+import static org.apache.isis.tooling.model4adoc.AsciiDocFactory.headCell;
+import static org.apache.isis.tooling.model4adoc.AsciiDocFactory.table;
import lombok.val;
@@ -58,7 +61,7 @@ class AsciiDocWriterTest {
String actualAdoc = AsciiDocWriter.toString(doc);
String expectedAdoc = "= Hello World\n\n";
- System.out.println(actualAdoc);
+ // System.out.println(actualAdoc); // debug
assertEquals(expectedAdoc, actualAdoc);
}
@@ -109,7 +112,7 @@ class AsciiDocWriterTest {
String actualAdoc = AsciiDocWriter.toString(doc);
- System.out.println(actualAdoc);
+ //System.out.println(actualAdoc); // debug
assertEquals(adocRef, actualAdoc);
@@ -141,9 +144,9 @@ class AsciiDocWriterTest {
String actualAdoc = AsciiDocWriter.toString(refDoc);
- debug(refDoc);
+ //debug(refDoc);
- System.out.println(actualAdoc);
+ //System.out.println(actualAdoc); // debug
assertEquals(adocRef, actualAdoc);
}
diff --git a/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java b/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java
index 6fcc0d6..94ecb5e 100644
--- a/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java
+++ b/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/ProjectTreeTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -49,7 +50,7 @@ class ProjectTreeTest {
void tearDown() throws Exception {
}
- @Test
+ @Test @Disabled("for now we are missing some build.gradle files")
void testGradle() {
val projTree = ProjectNodeFactory.gradle(projRootFolder);