Skip to content

Commit f76c9cc

Browse files
committed
About as working as I can make things for now
I believe the issue in spring-projects/spring-framework#21515 affects this code, and it means that I can't yet recommend adopting this PR as we currently fail all sorts of tests because classpath scanning just collapses completely after module-isation. The workaround is to run tests with the module path disabled, but at least Eclipse seems completely unable to do anything useful with that; you get a total failure to run tests. This is an abysmal mess!
1 parent 03ae75a commit f76c9cc

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

SpiNNaker-allocserv/pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
201201
</annotationProcessorPaths>
202202
</configuration>
203203
</plugin>
204+
<plugin>
205+
<groupId>org.apache.maven.plugins</groupId>
206+
<artifactId>maven-surefire-plugin</artifactId>
207+
<configuration>
208+
<useModulePath>false</useModulePath>
209+
</configuration>
210+
</plugin>
204211
<plugin>
205212
<groupId>org.apache.maven.plugins</groupId>
206213
<artifactId>maven-war-plugin</artifactId>
@@ -373,11 +380,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
373380
<artifactId>spring-boot-starter-log4j2</artifactId>
374381
<scope>runtime</scope>
375382
</dependency>
376-
<dependency>
377-
<groupId>javax</groupId>
378-
<artifactId>javaee-api</artifactId>
379-
<scope>provided</scope>
380-
</dependency>
381383
<dependency>
382384
<groupId>org.slf4j</groupId>
383385
<artifactId>slf4j-api</artifactId>

SpiNNaker-allocserv/src/main/java/module-info.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// Base dependencies
3434
requires java.annotation;
3535
requires java.desktop;
36-
requires java.mail;
36+
requires jakarta.mail;
3737
requires java.validation;
3838
requires java.ws.rs;
3939

@@ -89,13 +89,14 @@
8989
requires spring.security.oauth2.jose;
9090
requires spring.security.oauth2.resource.server;
9191

92-
opens uk.ac.manchester.spinnaker.alloc
93-
to com.fasterxml.jackson.databind,
94-
spring.core, spring.beans, spring.context;
95-
opens uk.ac.manchester.spinnaker.alloc.db
96-
to spring.core, spring.beans, spring.context;
97-
opens uk.ac.manchester.spinnaker.alloc.model
98-
to com.fasterxml.jackson.databind;
99-
opens uk.ac.manchester.spinnaker.alloc.web
100-
to com.fasterxml.jackson.databind;
92+
opens uk.ac.manchester.spinnaker.alloc;
93+
opens uk.ac.manchester.spinnaker.alloc.admin;
94+
opens uk.ac.manchester.spinnaker.alloc.allocator;
95+
opens uk.ac.manchester.spinnaker.alloc.bmp;
96+
opens uk.ac.manchester.spinnaker.alloc.compat;
97+
opens uk.ac.manchester.spinnaker.alloc.db;
98+
opens uk.ac.manchester.spinnaker.alloc.model;
99+
opens uk.ac.manchester.spinnaker.alloc.proxy;
100+
opens uk.ac.manchester.spinnaker.alloc.security;
101+
opens uk.ac.manchester.spinnaker.alloc.web;
101102
}

0 commit comments

Comments
 (0)