You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/01/27 07:23:28 UTC
(causeway) 02/02: CAUSEWAY-3676: fixes mvn build
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit c438b742d3281076750eb1b0c91361b193b14da5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 27 07:21:51 2024 +0000
CAUSEWAY-3676: fixes mvn build
---
antora/playbooks/site.yml | 6 +++---
viewers/graphql/adoc/antora.yml | 6 +++++-
viewers/graphql/adoc/modules/graphql/nav.adoc | 8 +++++++-
.../viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java | 6 +++---
.../graphql/viewer/test/e2e/StaffMember-photo-Bar.pdf} | Bin
.../graphql/viewer/test/e2e/StaffMember-photo-Fizz.pdf} | Bin
.../graphql/viewer/test/e2e/StaffMember-photo-Foo.pdf} | Bin
.../Staff_IntegTest.list_all_staff_members.approved.json | 6 +++---
8 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 9899e2cd39..ba6324f947 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -170,9 +170,6 @@ content:
# - url: .
# start_path: incubator/extensions/core/commandreplay/adoc # incubator
# branches: HEAD
- - url: .
- start_path: incubator/viewers/graphql/adoc # incubator
- branches: HEAD
# mavendeps
- url: .
@@ -270,6 +267,9 @@ content:
branches: HEAD
# viewers
+ - url: .
+ start_path: viewers/graphql/adoc
+ branches: HEAD
- url: .
start_path: viewers/restfulobjects/adoc # vro
branches: HEAD
diff --git a/viewers/graphql/adoc/antora.yml b/viewers/graphql/adoc/antora.yml
index bc87cdc73c..3f939b74c8 100644
--- a/viewers/graphql/adoc/antora.yml
+++ b/viewers/graphql/adoc/antora.yml
@@ -15,5 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-name: incubator
+name: gqlv
+title: "GraphQL Viewer"
version: latest
+start_page: ROOT:about.adoc
+nav:
+ - modules/ROOT/nav.adoc
diff --git a/viewers/graphql/adoc/modules/graphql/nav.adoc b/viewers/graphql/adoc/modules/graphql/nav.adoc
index b97852230f..d120380bca 100644
--- a/viewers/graphql/adoc/modules/graphql/nav.adoc
+++ b/viewers/graphql/adoc/modules/graphql/nav.adoc
@@ -1,4 +1,10 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::incubator:ROOT:partial$component-nav.adoc[]
+
+
+include::gqlv:ROOT:partial$module-nav.adoc[]
+
+// * Extensions
+//
+// include::gqlv:ROOT:partial$extensions.adoc[]
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
index 672ec23124..2a11f5a30d 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
@@ -71,9 +71,9 @@ public abstract class Abstract_IntegTest extends CausewayViewerGraphqlTestModule
deptHeadRepository.create("Dr. George Harwood", civilEngineering);
// staff
- staffMemberRepository.create("Letitia Leadbetter", classics, asBlob("Foo.pdf"));
- staffMemberRepository.create("Gerry Jones", classics, asBlob("Bar.pdf"));
- staffMemberRepository.create("Mervin Hughes", physics, asBlob("Fizz.pdf"));
+ staffMemberRepository.create("Letitia Leadbetter", classics, asBlob("StaffMember-photo-Foo.pdf"));
+ staffMemberRepository.create("Gerry Jones", classics, asBlob("StaffMember-photo-Bar.pdf"));
+ staffMemberRepository.create("Mervin Hughes", physics, asBlob("StaffMember-photo-Fizz.pdf"));
staffMemberRepository.create("John Gartner", physics);
staffMemberRepository.create("Margaret Randall", physics);
diff --git a/viewers/graphql/test/src/test/resources/org/apache/causeway/viewer/graphql/viewer/test/e2e/Bar.pdf b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMember-photo-Bar.pdf
similarity index 100%
rename from viewers/graphql/test/src/test/resources/org/apache/causeway/viewer/graphql/viewer/test/e2e/Bar.pdf
rename to viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMember-photo-Bar.pdf
diff --git a/viewers/graphql/test/src/test/resources/org/apache/causeway/viewer/graphql/viewer/test/e2e/Fizz.pdf b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMember-photo-Fizz.pdf
similarity index 100%
rename from viewers/graphql/test/src/test/resources/org/apache/causeway/viewer/graphql/viewer/test/e2e/Fizz.pdf
rename to viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMember-photo-Fizz.pdf
diff --git a/viewers/graphql/test/src/test/resources/org/apache/causeway/viewer/graphql/viewer/test/e2e/Foo.pdf b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMember-photo-Foo.pdf
similarity index 100%
rename from viewers/graphql/test/src/test/resources/org/apache/causeway/viewer/graphql/viewer/test/e2e/Foo.pdf
rename to viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMember-photo-Foo.pdf
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.list_all_staff_members.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.list_all_staff_members.approved.json
index 7c8e2ea04a..c32dbd6127 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.list_all_staff_members.approved.json
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.list_all_staff_members.approved.json
@@ -10,7 +10,7 @@
"get" : "LECTURER"
},
"photo" : {
- "get" : "Foo.pdf [application/pdf]: 80261 bytes"
+ "get" : "StaffMember-photo-Foo.pdf [application/pdf]: 80261 bytes"
}
}, {
"name" : {
@@ -20,7 +20,7 @@
"get" : "LECTURER"
},
"photo" : {
- "get" : "Bar.pdf [application/pdf]: 80970 bytes"
+ "get" : "StaffMember-photo-Bar.pdf [application/pdf]: 80970 bytes"
}
}, {
"name" : {
@@ -30,7 +30,7 @@
"get" : "LECTURER"
},
"photo" : {
- "get" : "Fizz.pdf [application/pdf]: 79681 bytes"
+ "get" : "StaffMember-photo-Fizz.pdf [application/pdf]: 79681 bytes"
}
}, {
"name" : {