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/12 04:39:50 UTC

[isis] branch master updated (7372640 -> abceebb)

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 7372640  ISIS-2426: tooling: add java code analyzer
     new 47f2795  ISIS-2426: base the 'tooling' POM on top of 'isis-parent' POM
     new abceebb  ISIS-2426: tooling: fixing tests

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:
 tooling/pom.xml                                      |  9 ++++-----
 .../tooling/projectmodel/test/ProjectTreeTest.java   | 20 +++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)


[isis] 02/02: ISIS-2426: tooling: fixing tests

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 abceebbcaf4cc7cf019df660767af8b5e3392bd3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Sep 12 06:39:29 2020 +0200

    ISIS-2426: tooling: fixing tests
---
 .../tooling/projectmodel/test/ProjectTreeTest.java   | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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 6bff2cc..5504bf2 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
@@ -55,8 +55,11 @@ class ProjectTreeTest {
         
         val artifactKeys = new HashSet<String>();
         
-        ProjectVisitor projectVisitor = projModel -> {artifactKeys.add(projModel.getArtifactKey().toString());};
-        //ProjectVisitor projectVisitor = projModel -> {System.out.println(projModel.getArtifactKey());};
+        ProjectVisitor projectVisitor = projModel -> {
+            artifactKeys.add(projModel.getArtifactKey().toString());
+            System.out.println(projModel.getArtifactKey());
+        };
+
         projTree.depthFirst(projectVisitor);
         
         assertHasSomeArtifactKeys(artifactKeys);
@@ -70,7 +73,10 @@ class ProjectTreeTest {
         
         val artifactKeys = new HashSet<String>();
         
-        ProjectVisitor projectVisitor = projModel -> {artifactKeys.add(projModel.getArtifactKey().toString());};
+        ProjectVisitor projectVisitor = projModel -> {
+            artifactKeys.add(projModel.getArtifactKey().toString());
+            System.out.println(projModel.getArtifactKey());
+        };
         
         projTree.depthFirst(projectVisitor);
         
@@ -79,10 +85,10 @@ class ProjectTreeTest {
     
     private void assertHasSomeArtifactKeys(Set<String> artifactKeys) {
         assertTrue(artifactKeys.size()>50);
-        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-commons:2.0.0-SNAPSHOT"));
-        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-config:2.0.0-SNAPSHOT"));
-        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-metamodel:2.0.0-SNAPSHOT"));
-        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-runtime:2.0.0-SNAPSHOT"));
+        assertTrue(artifactKeys.contains("org.apache.isis.core:isis:pom:2.0.0-SNAPSHOT"));
+        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-config:jar:2.0.0-SNAPSHOT"));
+        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-metamodel:jar:2.0.0-SNAPSHOT"));
+        assertTrue(artifactKeys.contains("org.apache.isis.core:isis-core-runtime:jar:2.0.0-SNAPSHOT"));
         
         for(val key : artifactKeys) {
             assertFalse(key.startsWith("?"), ()->"incomplete key " + key);


[isis] 01/02: ISIS-2426: base the 'tooling' POM on top of 'isis-parent' POM

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 47f27956939690f5a6dba32efad3b2a0a2bfaa75
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Sep 12 06:11:26 2020 +0200

    ISIS-2426: base the 'tooling' POM on top of 'isis-parent' POM
    
    supposed fix for build failure: 'tooling' artifacts have no maven repo
    declared as push target
---
 tooling/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tooling/pom.xml b/tooling/pom.xml
index 61fbbbb..ffda819 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -15,15 +15,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.2.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
+		<groupId>org.apache.isis.core</groupId>
+		<artifactId>isis-parent</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
+		<relativePath>../isis-parent/pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.apache.isis.tooling</groupId>
 	<artifactId>isis-tooling</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
 
 	<name>Apache Isis Tooling</name>
 	<description>