Skip to content
Snippets Groups Projects
Verified Commit 8c954c4a authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

cxf and spring up

parent bdbca93e
No related branches found
No related tags found
No related merge requests found
Pipeline #305468 passed
......@@ -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>
......
......@@ -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"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment