From 8c954c4aae977ea8cd48bf74701e97dec035c7b4 Mon Sep 17 00:00:00 2001
From: Ubbo Veentjer <veentjer@sub.uni-goettingen.de>
Date: Mon, 27 Jun 2022 21:37:45 +0200
Subject: [PATCH] cxf and spring up
---
pom.xml | 26 ++++++++++++++++++++++++--
src/main/webapp/WEB-INF/beans.xml | 5 +----
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2c13fa9..8c62560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<commons-io-version>2.4</commons-io-version>
<link-rewriter-version>0.4.1-RELEASE</link-rewriter-version>
<saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
- <cxf-version>2.7.18</cxf-version>
+ <cxf-version>3.3.13</cxf-version>
<confclient-version>4.1.0</confclient-version>
<cyclonedx-maven-plugin.version>2.7.0</cyclonedx-maven-plugin.version>
<tgsearch-version>4.0.3</tgsearch-version>
@@ -42,7 +42,7 @@
<guava-version>15.0</guava-version>
<junit-version>4.13.2</junit-version>
<servlet-api-version>3.1.0</servlet-api-version>
- <spring-version>3.2.6.RELEASE</spring-version>
+ <spring-version>5.1.20.RELEASE</spring-version>
<git-commit-id-plugin-version>2.1.15</git-commit-id-plugin-version>
<maven-compiler-plugin-version>3.9.0</maven-compiler-plugin-version>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
@@ -73,6 +73,7 @@
<name>GWDG Nexus DARIAH-DE Repository</name>
<url> https://nexus.gwdg.de/repository/maven-dariah-public/</url>
</repository>
+ <!--
<repository>
<id>dh.nexus.releases</id>
<name>Cophi Nexus Releases</name>
@@ -95,6 +96,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ -->
</repositories>
<distributionManagement>
@@ -157,6 +159,11 @@
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
@@ -172,11 +179,26 @@
<artifactId>cxf-rt-management</artifactId>
<version>${cxf-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-service-description</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
index 93d4235..23ec1ff 100644
--- a/src/main/webapp/WEB-INF/beans.xml
+++ b/src/main/webapp/WEB-INF/beans.xml
@@ -17,7 +17,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<context:annotation-config/>
- <bean id="propertyPlaceholderConfigurer"
+ <bean id="propertyPlaceholderConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
<list>
@@ -30,9 +30,6 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<property name="ignoreUnresolvablePlaceholders" value="false" />
</bean>
-
-
- <bean class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"/>
<bean class="org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer"/>
<cxf:bus id="aggregator"/>
--
GitLab