From db2fac36cfb300bf4416d236e244d32e14f23d2d Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Fri, 18 Mar 2022 14:17:52 +0100
Subject: [PATCH] Add new submodule update
---
.classpath | 137 +++++++++++++++++++++++++++++++++++++++++++++----
.gitlab-ci.yml | 7 +--
2 files changed, 130 insertions(+), 14 deletions(-)
diff --git a/.classpath b/.classpath
index 44f31bf..c0b859c 100644
--- a/.classpath
+++ b/.classpath
@@ -6,6 +6,11 @@
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="src" path="src/main/webapp/WEB-INF" including="aggregator.properties" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar" sourcepath="M2_REPO/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
@@ -44,12 +49,12 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.11/cxf-api-2.7.11.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.18/cxf-api-2.7.18.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.1/woodstox-core-asl-4.2.1.jar">
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.4.1/woodstox-core-asl-4.4.1.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -74,7 +79,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.11/cxf-rt-core-2.7.11.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.18/cxf-rt-core-2.7.18.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -94,7 +99,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.11/cxf-rt-bindings-xml-2.7.11.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.18/cxf-rt-bindings-xml-2.7.18.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -119,7 +124,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.11/cxf-rt-transports-http-2.7.11.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.18/cxf-rt-transports-http-2.7.18.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -129,12 +134,12 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/tgsearch-client/3.6.2/tgsearch-client-3.6.2.jar">
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/tgsearch-client/4.0.1/tgsearch-client-4.0.1.jar" sourcepath="M2_REPO/info/textgrid/middleware/tgsearch-client/4.0.1/tgsearch-client-4.0.1-sources.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.11/cxf-rt-frontend-jaxrs-2.7.11.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.18/cxf-rt-frontend-jaxrs-2.7.18.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -154,12 +159,122 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/tgsearch-api/3.6.2/tgsearch-api-3.6.2.jar">
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/tgsearch-api/4.0.1/tgsearch-api-4.0.1.jar" sourcepath="M2_REPO/info/textgrid/middleware/tgsearch-api/4.0.1/tgsearch-api-4.0.1-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/namespaces/portalconfig-jaxb/4.0.1/portalconfig-jaxb-4.0.1.jar" sourcepath="M2_REPO/info/textgrid/namespaces/portalconfig-jaxb/4.0.1/portalconfig-jaxb-4.0.1-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-service-description-openapi-v3/3.3.6/cxf-rt-rs-service-description-openapi-v3-3.3.6.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-service-description-openapi-v3/3.3.6/cxf-rt-rs-service-description-openapi-v3-3.3.6-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-service-description-common-openapi/3.3.6/cxf-rt-rs-service-description-common-openapi-3.3.6.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-service-description-common-openapi/3.3.6/cxf-rt-rs-service-description-common-openapi-3.3.6-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-service-description-swagger-ui/3.3.6/cxf-rt-rs-service-description-swagger-ui-3.3.6.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-service-description-swagger-ui/3.3.6/cxf-rt-rs-service-description-swagger-ui-3.3.6-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/io/swagger/core/v3/swagger-jaxrs2/2.0.10/swagger-jaxrs2-2.0.10.jar" sourcepath="M2_REPO/io/swagger/core/v3/swagger-jaxrs2/2.0.10/swagger-jaxrs2-2.0.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.9.10/jackson-databind-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.9.10/jackson-databind-2.9.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.9.10/jackson-annotations-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.9.10/jackson-annotations-2.9.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.9.10/jackson-core-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.9.10/jackson-core-2.9.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/io/github/classgraph/classgraph/4.6.32/classgraph-4.6.32.jar" sourcepath="M2_REPO/io/github/classgraph/classgraph/4.6.32/classgraph-4.6.32-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.22.0-GA/javassist-3.22.0-GA.jar" sourcepath="M2_REPO/org/javassist/javassist/3.22.0-GA/javassist-3.22.0-GA-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/io/swagger/core/v3/swagger-models/2.0.10/swagger-models-2.0.10.jar" sourcepath="M2_REPO/io/swagger/core/v3/swagger-models/2.0.10/swagger-models-2.0.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/io/swagger/core/v3/swagger-annotations/2.0.10/swagger-annotations-2.0.10.jar" sourcepath="M2_REPO/io/swagger/core/v3/swagger-annotations/2.0.10/swagger-annotations-2.0.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/io/swagger/core/v3/swagger-integration/2.0.10/swagger-integration-2.0.10.jar" sourcepath="M2_REPO/io/swagger/core/v3/swagger-integration/2.0.10/swagger-integration-2.0.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/io/swagger/core/v3/swagger-core/2.0.10/swagger-core-2.0.10.jar" sourcepath="M2_REPO/io/swagger/core/v3/swagger-core/2.0.10/swagger-core-2.0.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.9.10/jackson-dataformat-yaml-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.9.10/jackson-dataformat-yaml-2.9.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.23/snakeyaml-1.23-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.10/jackson-datatype-jsr310-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.10/jackson-datatype-jsr310-2.9.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.9.10/jackson-jaxrs-json-provider-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.9.10/jackson-jaxrs-json-provider-2.9.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.9.10/jackson-jaxrs-base-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.9.10/jackson-jaxrs-base-2.9.10-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.9.10/jackson-module-jaxb-annotations-2.9.10.jar" sourcepath="M2_REPO/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.9.10/jackson-module-jaxb-annotations-2.9.10-sources.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/confclient/1.4.0/confclient-1.4.0.jar">
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/confclient/4.1.0/confclient-4.1.0.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -189,12 +304,12 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-security-cors/2.7.11/cxf-rt-rs-security-cors-2.7.11.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-security-cors/2.7.18/cxf-rt-rs-security-cors-2.7.18.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-management/2.7.11/cxf-rt-management-2.7.11.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-management/2.7.18/cxf-rt-management-2.7.18.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0ccbc0..39a44e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,10 +67,11 @@ build_and_deploy:
# - main
stage: deploy_java
script:
- - 'git submodule init'
- - 'git submodule update'
+ - git submodule init
+ - git submodule update --remote --force
+ - git submodule foreach git pull
# REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!!
- - 'mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true'
+ - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true
artifacts:
name: WEBAPP_DEB_PACKAGES
paths:
--
GitLab