From 7430d8f6204b49eefe47fd0a0885d54dc26d49f9 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Tue, 1 Feb 2022 14:52:47 +0100
Subject: [PATCH] Re-set versions
---
.classpath | 12 ++++++------
pom.xml | 30 +++++++++++-------------------
2 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/.classpath b/.classpath
index 3adad48..fdec603 100644
--- a/.classpath
+++ b/.classpath
@@ -89,7 +89,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.2.2.RELEASE/spring-core-3.2.2.RELEASE.jar">
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.2.6.RELEASE/spring-core-3.2.6.RELEASE.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -109,7 +109,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.2.2.RELEASE/spring-web-3.2.2.RELEASE.jar">
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.2.6.RELEASE/spring-web-3.2.6.RELEASE.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -119,22 +119,22 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.2.2.RELEASE/spring-beans-3.2.2.RELEASE.jar">
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.2.6.RELEASE/spring-beans-3.2.6.RELEASE.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.2.2.RELEASE/spring-context-3.2.2.RELEASE.jar">
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.2.6.RELEASE/spring-context-3.2.6.RELEASE.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.2.2.RELEASE/spring-aop-3.2.2.RELEASE.jar">
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.2.6.RELEASE/spring-aop-3.2.6.RELEASE.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.2.2.RELEASE/spring-expression-3.2.2.RELEASE.jar">
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.2.6.RELEASE/spring-expression-3.2.6.RELEASE.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
diff --git a/pom.xml b/pom.xml
index 8f5be43..64b0e12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,20 +27,20 @@
<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.11</cxf-version-->
- <cxf-version>2.7.18</cxf-version>
- <!--confclient-version>1.4.0</confclient-version-->
- <confclient-version>4.1.0</confclient-version>
- <!--tgsearch-version>3.6.2</tgsearch-version-->
- <tgsearch-version>4.0.1</tgsearch-version>
- <!--tgcrud-version>2.6.0</tgcrud-version-->
- <tgcrud-version>11.3.0-TG-RELEASE</tgcrud-version>
+ <cxf-version>2.7.11</cxf-version>
+ <!--cxf-version>2.7.18</cxf-version-->
+ <confclient-version>1.4.0</confclient-version>
+ <!--confclient-version>4.1.0</confclient-version-->
+ <tgsearch-version>3.6.2</tgsearch-version>
+ <!--tgsearch-version>4.0.1</tgsearch-version-->
+ <tgcrud-version>2.6.0</tgcrud-version>
+ <!--tgcrud-version>11.3.0-TG-RELEASE</tgcrud-version-->
<guava-version>15.0</guava-version>
<junit-version>4.13.2</junit-version>
<!--servlet-api.version>2.5</servlet-api.version-->
<servlet-api.version>3.0.1</servlet-api.version>
- <!--spring-version>3.2.2.RELEASE</spring-version-->
- <spring-version>3.2.6.RELEASE</spring-version>
+ <spring-version>3.2.2.RELEASE</spring-version>
+ <!--spring-version>3.2.6.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>
@@ -58,11 +58,10 @@
<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>
- <url>http://dev.digital-humanities.de/nexus/content/repositories/releases</url>
+ <url>https://dev.digital-humanities.de/nexus/content/repositories/releases</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -81,7 +80,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- -->
</repositories>
<distributionManagement>
@@ -118,12 +116,6 @@
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgsearch-client</artifactId>
<version>${tgsearch-version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>info.textgrid.middleware</groupId>
--
GitLab