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 0fb031950f0ec3b42e2429c70955d1eedc3335a0
Author: danhaywood <[email protected]>
AuthorDate: Sat Feb 10 15:04:59 2024 +0000

    CAUSEWAY-3676: adds causeway-viewer-graphql-testsupport
    
    placeholder for Scenario etc
---
 bom/pom.xml                                     | 10 ++++
 viewers/graphql/applib/pom.xml                  |  4 +-
 viewers/graphql/model/pom.xml                   |  4 +-
 viewers/graphql/pom.xml                         |  1 +
 viewers/graphql/test/pom.xml                    |  4 +-
 viewers/graphql/{viewer => testsupport}/pom.xml | 67 +++++++++++--------------
 viewers/graphql/viewer/pom.xml                  |  4 +-
 7 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 10425e5a6f..4f49c6aef1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -513,6 +513,16 @@ It is therefore a copy of org.apache:apache, with 
customisations clearly identif
                 <artifactId>causeway-viewer-graphql-model</artifactId>
                 <version>2.0.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.causeway.viewer</groupId>
+                <artifactId>causeway-viewer-graphql-testsupport</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.causeway.viewer</groupId>
+                <artifactId>causeway-viewer-graphql-test</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.viewer</groupId>
                 <artifactId>causeway-viewer-graphql-viewer</artifactId>
diff --git a/viewers/graphql/applib/pom.xml b/viewers/graphql/applib/pom.xml
index 86edc7a0ea..2788f45e04 100644
--- a/viewers/graphql/applib/pom.xml
+++ b/viewers/graphql/applib/pom.xml
@@ -33,8 +33,8 @@
        <name>Apache Causeway Viewer - GraphQL (Applib)</name>
 
        <properties>
-               
<jar-plugin.automaticModuleName>org.apache.causeway.incubator.viewer.graphql.applib</jar-plugin.automaticModuleName>
-               
<git-plugin.propertiesDir>org/apache/causeway/incubator/viewer/graphql/applib</git-plugin.propertiesDir>
+               
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.graphql.applib</jar-plugin.automaticModuleName>
+               
<git-plugin.propertiesDir>org/apache/causeway/viewer/graphql/applib</git-plugin.propertiesDir>
        </properties>
 
        <dependencies>
diff --git a/viewers/graphql/model/pom.xml b/viewers/graphql/model/pom.xml
index f03dc54daf..6006583e39 100644
--- a/viewers/graphql/model/pom.xml
+++ b/viewers/graphql/model/pom.xml
@@ -33,8 +33,8 @@
        <name>Apache Causeway Viewer - GraphQL (Model)</name>
 
        <properties>
-               
<jar-plugin.automaticModuleName>org.apache.causeway.incubator.viewer.graphql.model</jar-plugin.automaticModuleName>
-               
<git-plugin.propertiesDir>org/apache/causeway/incubator/viewer/graphql/model</git-plugin.propertiesDir>
+               
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.graphql.model</jar-plugin.automaticModuleName>
+               
<git-plugin.propertiesDir>org/apache/causeway/viewer/graphql/model</git-plugin.propertiesDir>
        </properties>
 
        <dependencies>
diff --git a/viewers/graphql/pom.xml b/viewers/graphql/pom.xml
index d370efce48..4c7c3bbbdf 100644
--- a/viewers/graphql/pom.xml
+++ b/viewers/graphql/pom.xml
@@ -52,6 +52,7 @@
                <module>model</module>
                <module>viewer</module>
                <module>test</module>
+               <module>testsupport</module>
        </modules>
 
 </project>
diff --git a/viewers/graphql/test/pom.xml b/viewers/graphql/test/pom.xml
index 7efc32f6da..399401cb5c 100644
--- a/viewers/graphql/test/pom.xml
+++ b/viewers/graphql/test/pom.xml
@@ -33,8 +33,8 @@
        <name>Apache Causeway Viewer - GraphQL (Test)</name>
 
        <properties>
-               
<jar-plugin.automaticModuleName>org.apache.causeway.incubator.viewer.graphql.test</jar-plugin.automaticModuleName>
-               
<git-plugin.propertiesDir>org/apache/causeway/incubator/viewer/graphql/test</git-plugin.propertiesDir>
+               
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.graphql.test</jar-plugin.automaticModuleName>
+               
<git-plugin.propertiesDir>org/apache/causeway/viewer/graphql/test</git-plugin.propertiesDir>
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
 
diff --git a/viewers/graphql/viewer/pom.xml 
b/viewers/graphql/testsupport/pom.xml
similarity index 53%
copy from viewers/graphql/viewer/pom.xml
copy to viewers/graphql/testsupport/pom.xml
index d9ddfb6ad8..867117a6a0 100644
--- a/viewers/graphql/viewer/pom.xml
+++ b/viewers/graphql/testsupport/pom.xml
@@ -29,54 +29,47 @@
                <version>2.0.0-SNAPSHOT</version>
        </parent>
 
-       <artifactId>causeway-viewer-graphql-viewer</artifactId>
-       <name>Apache Causeway Viewer - GraphQL (Viewer)</name>
+       <artifactId>causeway-viewer-graphql-testsupport</artifactId>
+       <name>Apache Causeway Viewer - GraphQL (Test Support)</name>
 
        <properties>
-               
<jar-plugin.automaticModuleName>org.apache.causeway.incubator.viewer.graphql.viewer</jar-plugin.automaticModuleName>
-               
<git-plugin.propertiesDir>org/apache/causeway/incubator/viewer/graphql/viewer</git-plugin.propertiesDir>
-       </properties>
+               
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.graphql.testsupport</jar-plugin.automaticModuleName>
+               
<git-plugin.propertiesDir>org/apache/causeway/viewer/graphql/testsupport</git-plugin.propertiesDir>
+        <maven.install.skip>true</maven.install.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
 
-       <build>
+        <java.version>17</java.version>
+
+        
<datasource-proxy-spring-boot-starter.version>1.8.1</datasource-proxy-spring-boot-starter.version>
+        <sql-formatter.version>2.0.4</sql-formatter.version>
+
+    </properties>
+
+    <build>
                <testResources>
+                       <testResource>
+                               <directory>src/test/resources</directory>
+                               <filtering>true</filtering>
+                       </testResource>
                        <testResource>
                                <directory>src/test/java</directory>
                                <filtering>false</filtering>
                        </testResource>
                </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+        </plugins>
        </build>
-       <dependencies>
-
-               <dependency>
-                       <groupId>org.apache.causeway.viewer</groupId>
-                       <artifactId>causeway-viewer-graphql-model</artifactId>
-               </dependency>
 
-               <dependency>
-                       <groupId>org.apache.causeway.core</groupId>
-                       <artifactId>causeway-core-webapp</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-websocket</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       
<groupId>org.springframework.boot</groupId>
-                                       
<artifactId>spring-boot-starter-logging</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
+       <dependencies>
 
     </dependencies>
 
diff --git a/viewers/graphql/viewer/pom.xml b/viewers/graphql/viewer/pom.xml
index d9ddfb6ad8..f83bdf9a1c 100644
--- a/viewers/graphql/viewer/pom.xml
+++ b/viewers/graphql/viewer/pom.xml
@@ -33,8 +33,8 @@
        <name>Apache Causeway Viewer - GraphQL (Viewer)</name>
 
        <properties>
-               
<jar-plugin.automaticModuleName>org.apache.causeway.incubator.viewer.graphql.viewer</jar-plugin.automaticModuleName>
-               
<git-plugin.propertiesDir>org/apache/causeway/incubator/viewer/graphql/viewer</git-plugin.propertiesDir>
+               
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.graphql.viewer</jar-plugin.automaticModuleName>
+               
<git-plugin.propertiesDir>org/apache/causeway/viewer/graphql/viewer</git-plugin.propertiesDir>
        </properties>
 
        <build>

Reply via email to