Skip to content

Commit ef1dd45

Browse files
tdonohuetdonohue
authored
Merge pull request DSpace#11990 from tdonohue/fix_handle_server_startup
[Docker] Fix `docker-deploy` issues with running Handle Server by excluding `spring-jcl` from classpath
2 parents c3f2f6d + 5a7d4a9 commit ef1dd45

9 files changed

Lines changed: 8 additions & 51 deletions

File tree

‎dspace-api/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,6 @@
386386
<dependency>
387387
<groupId>org.springframework</groupId>
388388
<artifactId>spring-orm</artifactId>
389-
<exclusions>
390-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
391-
<exclusion>
392-
<groupId>org.springframework</groupId>
393-
<artifactId>spring-jcl</artifactId>
394-
</exclusion>
395-
</exclusions>
396389
</dependency>
397390

398391
<dependency>

‎dspace-iiif/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
<groupId>org.springframework.boot</groupId>
4545
<artifactId>spring-boot-starter-logging</artifactId>
4646
</exclusion>
47-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
48-
<exclusion>
49-
<groupId>org.springframework</groupId>
50-
<artifactId>spring-jcl</artifactId>
51-
</exclusion>
5247
</exclusions>
5348
</dependency>
5449

‎dspace-oai/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@
7878
<groupId>org.springframework.boot</groupId>
7979
<artifactId>spring-boot-starter-logging</artifactId>
8080
</exclusion>
81-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
82-
<exclusion>
83-
<groupId>org.springframework</groupId>
84-
<artifactId>spring-jcl</artifactId>
85-
</exclusion>
8681
</exclusions>
8782
</dependency>
8883

‎dspace-rdf/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@
6767
<groupId>org.springframework.boot</groupId>
6868
<artifactId>spring-boot-starter-logging</artifactId>
6969
</exclusion>
70-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
71-
<exclusion>
72-
<groupId>org.springframework</groupId>
73-
<artifactId>spring-jcl</artifactId>
74-
</exclusion>
7570
</exclusions>
7671
</dependency>
7772

‎dspace-server-webapp/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,11 +460,6 @@
460460
<groupId>org.springframework.boot</groupId>
461461
<artifactId>spring-boot-starter-logging</artifactId>
462462
</exclusion>
463-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
464-
<exclusion>
465-
<groupId>org.springframework</groupId>
466-
<artifactId>spring-jcl</artifactId>
467-
</exclusion>
468463
</exclusions>
469464
</dependency>
470465

‎dspace-services/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@
9090
<artifactId>spring-context-support</artifactId>
9191
<version>${spring.version}</version>
9292
<scope>compile</scope>
93-
<exclusions>
94-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
95-
<exclusion>
96-
<groupId>org.springframework</groupId>
97-
<artifactId>spring-jcl</artifactId>
98-
</exclusion>
99-
</exclusions>
10093
</dependency>
10194
<dependency>
10295
<groupId>org.apache.commons</groupId>

‎dspace-sword/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646
<groupId>org.springframework.boot</groupId>
4747
<artifactId>spring-boot-starter-logging</artifactId>
4848
</exclusion>
49-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
50-
<exclusion>
51-
<groupId>org.springframework</groupId>
52-
<artifactId>spring-jcl</artifactId>
53-
</exclusion>
5449
</exclusions>
5550
</dependency>
5651

‎dspace-swordv2/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@
8383
<groupId>org.springframework.boot</groupId>
8484
<artifactId>spring-boot-starter-logging</artifactId>
8585
</exclusion>
86-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
87-
<exclusion>
88-
<groupId>org.springframework</groupId>
89-
<artifactId>spring-jcl</artifactId>
90-
</exclusion>
9186
</exclusions>
9287
</dependency>
9388

‎pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,20 +1204,21 @@
12041204
<groupId>org.springframework</groupId>
12051205
<artifactId>spring-orm</artifactId>
12061206
<version>${spring.version}</version>
1207-
<exclusions>
1208-
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath -->
1209-
<exclusion>
1210-
<groupId>org.springframework</groupId>
1211-
<artifactId>spring-jcl</artifactId>
1212-
</exclusion>
1213-
</exclusions>
12141207
</dependency>
12151208

12161209
<!-- Explicitly Specify Latest Version of Spring -->
12171210
<dependency>
12181211
<artifactId>spring-core</artifactId>
12191212
<groupId>org.springframework</groupId>
12201213
<version>${spring.version}</version>
1214+
<exclusions>
1215+
<!-- Spring JCL is unnecessary and conflicts with commons-logging when both are on classpath.
1216+
NOTE: When Spring JCL is on the classpath, this results in Handle Server issues. -->
1217+
<exclusion>
1218+
<groupId>org.springframework</groupId>
1219+
<artifactId>spring-jcl</artifactId>
1220+
</exclusion>
1221+
</exclusions>
12211222
</dependency>
12221223

12231224
<dependency>

0 commit comments

Comments
 (0)