From c5d194b4d522f9ec51ad451028c4772466b21d6e Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Wed, 27 Mar 2019 11:50:04 +0100
Subject: [PATCH] ARGL! Removed rs311 krams again!
---
oaipmh-core/pom.xml | 80 +++++++++++++++++++++++++--------------------
1 file changed, 45 insertions(+), 35 deletions(-)
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 19958291..92630d26 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -38,24 +38,27 @@
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <!--dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.0</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <!--dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId>
- <version>2.1</version> </dependency -->
+ <!--dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency-->
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
@@ -93,10 +96,16 @@
<artifactId>metsModsMapping</artifactId>
<version>1.0</version>
</dependency>
- <!--dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId>
- <version>3.4.0</version> </dependency -->
- <!-- dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-arq</artifactId>
- <version>3.6.0</version> </dependency -->
+ <!--dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>3.4.0</version>
+ </dependency-->
+ <!-- dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>3.6.0</version>
+ </dependency-->
</dependencies>
<build>
@@ -161,28 +170,29 @@
</executions>
</plugin>
<plugin>
- <!-- We use this plugin to ensure that our usage of the maven-jaxb2-plugin
- is JDK 8 compatible in absence of a fix for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <id>set-additional-system-properties</id>
- <goals>
- <goal>set-system-properties</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <properties>
- <property>
- <name>javax.xml.accessExternalSchema</name>
- <value>file,http</value>
- </property>
- </properties>
- </configuration>
- </plugin>
+<!-- We use this plugin to ensure that our usage of the
+maven-jaxb2-plugin is JDK 8 compatible in absence of a fix
+for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <id>set-additional-system-properties</id>
+ <goals>
+ <goal>set-system-properties</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <properties>
+ <property>
+ <name>javax.xml.accessExternalSchema</name>
+ <value>file,http</value>
+ </property>
+ </properties>
+ </configuration>
+</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
--
GitLab