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/01/13 17:44:43 UTC

[isis] branch master updated: ISIS-2158: removes module 'isis-core-webspringboot'

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


The following commit(s) were added to refs/heads/master by this push:
     new c64e4af  ISIS-2158: removes module 'isis-core-webspringboot'
c64e4af is described below

commit c64e4afe27099071b86771007cbe3b674c6a5b8b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 13 18:44:31 2020 +0100

    ISIS-2158: removes module 'isis-core-webspringboot'
---
 core/detached-tests/pom.xml                        |  6 --
 core/pom.xml                                       | 13 ---
 .../IsisModuleCoreRuntimeServices.java             | 17 +++-
 core/webspringboot/pom.xml                         | 94 ----------------------
 core/webspringboot/src/main/doc/antora.yml         |  2 -
 .../main/doc/modules/webboot-springboot/nav.adoc   |  1 -
 .../modules/webboot-springboot/pages/about.adoc    |  3 -
 .../webboot-springboot/partials/module-nav.adoc    |  1 -
 .../webspringboot/IsisModuleCoreWebSpringBoot.java | 51 ------------
 .../demo/src/main/java/demoapp/webapp/DemoApp.java |  4 +-
 .../testdomain/conf/Configuration_headless.java    |  4 +-
 .../testdomain/conf/Configuration_usingJdo.java    |  6 +-
 .../conf/Configuration_usingJdoAndShiro.java       |  8 +-
 legacy/testing/mavenplugin/pom.xml                 |  6 --
 mavendeps/webapp/pom.xml                           |  2 +-
 persistence/jdo/datanucleus-5/pom.xml              |  7 --
 .../integtests/ExcelModuleIntegTestAbstract.java   |  4 +-
 .../FakeDataModuleIntegTestAbstract.java           |  7 +-
 testing/integtestsupport/applib/pom.xml            |  4 -
 testing/specsupport/applib/pom.xml                 |  5 --
 20 files changed, 33 insertions(+), 212 deletions(-)

diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 4e95b61..25ecf46 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -63,12 +63,6 @@
 			<scope>test</scope>
 		</dependency>
         
-        <dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-webspringboot</artifactId>
-			<scope>test</scope>
-		</dependency>
-        
         <!-- core plugins required to run this module's own tests -->
         <dependency>
             <groupId>org.apache.isis.core</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 8d4749e..a26328c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -773,18 +773,6 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-webspringboot</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-core-webspringboot</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-				<type>test-jar</type>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
 				<artifactId>isis-core-runtimeservices</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
@@ -1854,7 +1842,6 @@
 		<module>runtime</module>
 		<module>runtimeservices</module>
 		<module>webapp</module>
-		<module>webspringboot</module>
 
 		<module>unittestsupport</module>
 
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index ddace5c..5f58f6d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -18,8 +18,13 @@
  */
 package org.apache.isis.core.runtimeservices;
 
+import javax.inject.Singleton;
+
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.OrderComparator;
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
 import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
@@ -92,6 +97,16 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
         // @DomainService's
         TranslationServicePoMenu.class,
 })
-public class IsisModuleCoreRuntimeServices {
+public class IsisModuleCoreRuntimeServices /*implements ApplicationContextAware*/ {
+
+//    @Override
+//    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+//        // just make sure we wait for the context; (not sure if need anymore)
+//    }
 
+    @Bean @Singleton // also used by _Spring utility
+    public OrderComparator orderComparator() {
+        return new AnnotationAwareOrderComparator();
+    }
+    
 }
diff --git a/core/webspringboot/pom.xml b/core/webspringboot/pom.xml
deleted file mode 100644
index e66536b..0000000
--- a/core/webspringboot/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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 agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
-        <version>2.0.0-M3-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>isis-core-webspringboot</artifactId>
-    <name>Apache Isis Core - Web Spring Boot</name>
-    <description>
-        Bootstraps the webapp using Spring Bppt, by defining the main Spring @Configuration, transitively depending on
-        the rest of core. Viewers don't have dependencies on this module.
-    </description>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.core.webspringboot</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/webboot/springboot</git-plugin.propertiesDir>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-    </build>
-
-    <dependencies>
-	
-		<dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-runtimeservices</artifactId>
-        </dependency>
-        
-        
-		<dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-unittestsupport</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-		<!-- HSQL-DB -->
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/core/webspringboot/src/main/doc/antora.yml b/core/webspringboot/src/main/doc/antora.yml
deleted file mode 100644
index 08ddbf7..0000000
--- a/core/webspringboot/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: core
-version: master
diff --git a/core/webspringboot/src/main/doc/modules/webboot-springboot/nav.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/nav.adoc
deleted file mode 100644
index 3e815f1..0000000
--- a/core/webspringboot/src/main/doc/modules/webboot-springboot/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::core:ROOT:partial$component-nav.adoc[]
diff --git a/core/webspringboot/src/main/doc/modules/webboot-springboot/pages/about.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
deleted file mode 100644
index 666722c..0000000
--- a/core/webspringboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= Runtime Spring
-
-
diff --git a/core/webspringboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
deleted file mode 100644
index 614006d..0000000
--- a/core/webspringboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:core:webboot-springboot:about.adoc[SpringBoot]
diff --git a/core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java b/core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
deleted file mode 100644
index 939a349..0000000
--- a/core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  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 agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.core.webspringboot;
-
-import javax.inject.Singleton;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.OrderComparator;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-
-import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-
-@Configuration
-@Import({
-        // modules
-        IsisModuleCoreRuntimeServices.class,
-})
-public class IsisModuleCoreWebSpringBoot implements ApplicationContextAware {
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        // just make sure we wait for the context
-    }
-
-    @Bean @Singleton //XXX as used by _Spring utility
-    public OrderComparator orderComparator() {
-        return new AnnotationAwareOrderComparator();
-    }
-  
-}
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 8e0aba2..a97409c 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -83,7 +83,7 @@ public class DemoApp extends SpringBootServletInitializer {
         @PropertySource(IsisPresets.DataNucleusAutoCreate),
     })
     @Import({
-        IsisModuleCoreWebSpringBoot.class,
+        IsisModuleCoreRuntimeServices.class,
         IsisModuleSecurityShiro.class,
         IsisModuleJdoDataNucleus5.class,
         IsisModuleViewerWicketViewer.class,
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index 218e563..2dfdc6a 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -37,13 +37,13 @@ import org.apache.isis.applib.services.xactn.TransactionId;
 import org.apache.isis.applib.services.xactn.TransactionService;
 import org.apache.isis.applib.services.xactn.TransactionState;
 import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
 import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
 import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
 
 @Configuration
 @Import({
-    IsisModuleCoreWebSpringBoot.class,
+    IsisModuleCoreRuntimeServices.class,
     IsisModuleSecurityBypass.class,
     IsisModuleIncModelMetaModel.class // @Model support
 })
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index 97534f7..b83c7b9 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -25,15 +25,15 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
 import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
-import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 
 @Configuration
 @Import({
-    IsisModuleCoreWebSpringBoot.class,
+    IsisModuleCoreRuntimeServices.class,
     IsisModuleSecurityBypass.class,
     IsisModuleJdoDataNucleus5.class,
     IsisModuleTestingFixturesApplib.class
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 1f92459..6352589 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -28,21 +28,19 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
 import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
 import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
-import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 
 @Configuration
 @Import({
-    IsisModuleCoreWebSpringBoot.class,
-
+    IsisModuleCoreRuntimeServices.class,
     IsisModuleSecurityShiro.class,
-
     IsisModuleJdoDataNucleus5.class,
     IsisModuleTestingFixturesApplib.class
 })
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 6e0dd57..6b104bc 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -92,12 +92,6 @@
 			<artifactId>isis-core-runtimeservices</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-webspringboot</artifactId>
-		</dependency>
-
-
 	</dependencies>
 
 </project>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 1c050ef..7fc51a8 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -134,7 +134,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-webspringboot</artifactId>
+			<artifactId>isis-core-runtimeservices</artifactId>
 		</dependency>
 
 	</dependencies>
diff --git a/persistence/jdo/datanucleus-5/pom.xml b/persistence/jdo/datanucleus-5/pom.xml
index 8d59bca..622eaea 100644
--- a/persistence/jdo/datanucleus-5/pom.xml
+++ b/persistence/jdo/datanucleus-5/pom.xml
@@ -119,13 +119,6 @@
         
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-webspringboot</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-core-metamodel</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index 82d3cee..ef64591 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -10,7 +10,7 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.transaction.annotation.Transactional;
 
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
 import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubdomainsExcelFixtures;
@@ -32,7 +32,7 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
             @PropertySource(IsisPresets.DataNucleusAutoCreate),
     })
     @Import({
-            IsisModuleCoreWebSpringBoot.class,
+            IsisModuleCoreRuntimeServices.class,
             IsisModuleSecurityBypass.class,
             IsisModuleJdoDataNucleus5.class,
             IsisModuleTestingFixturesApplib.class,
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 740e92a..7fb794e 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -1,6 +1,8 @@
 package org.apache.isis.testing.fakedata.integtests;
 
 
+import javax.transaction.Transactional;
+
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -8,10 +10,9 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.transaction.annotation.Transactional;
 
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
 import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.testing.fakedata.fixtures.IsisModuleTestingFakeDataFixtures;
@@ -33,7 +34,7 @@ public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTes
                 @PropertySource(IsisPresets.DataNucleusAutoCreate),
         })
         @Import({
-                IsisModuleCoreWebSpringBoot.class,
+                IsisModuleCoreRuntimeServices.class,
                 IsisModuleSecurityBypass.class,
                 IsisModuleJdoDataNucleus5.class,
                 IsisModuleTestingFixturesApplib.class,
diff --git a/testing/integtestsupport/applib/pom.xml b/testing/integtestsupport/applib/pom.xml
index 1e95c69..dc3178b 100644
--- a/testing/integtestsupport/applib/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -151,10 +151,6 @@
 			<artifactId>isis-core-runtimeservices</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-webspringboot</artifactId>
-		</dependency>
 	</dependencies>
 
 	<profiles>
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index f1db5cd..81d7900 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -38,11 +38,6 @@
             <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-core-runtime</artifactId>
         </dependency>
-
-		<dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-webspringboot</artifactId>
-        </dependency>
         
         <!-- ISIS TESTING -->