Merge branch 'develop' into 'main'

New Release

See merge request dariah-de/dariah-de-oai-pmh-services!114

.gitlab-ci.yml

@@ -73,7 +73,7 @@ validate-java:
     - tags
   image: maven:3.8.3-jdk-8
   script:
-    - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean validate package -Pdhrep.deb
+    - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean validate package
   artifacts:
     reports:
       # Declare the JUnit reports (recursive pattern for multi-module projects)
@@ -89,7 +89,7 @@ build-and-deploy-jars:
     - develop
     - tags
   script:
-    - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean deploy -Pdhrep.deb -Psbom
+    - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean deploy -Psbom
     - cp target/bom.json .
   artifacts:
     paths:
@@ -99,29 +99,3 @@ build-and-deploy-jars:
       # Declare the JUnit reports (recursive pattern for multi-module projects)
       junit:
         - "**/target/*-reports/TEST-*.xml"
-
-# Deploy DEB files to APTLY SNAPSHOT repository.
-deploy-snapshot-deb:
-  stage: deploy
-  only:
-    - develop
-  variables:
-    PNAME: 'oaipmh-webapp'
-    PPATH: '${PNAME}/target'
-    PKEY: 'SNAPSHOT'
-    APTLY_TARGET: 'indy-snapshots'
-  extends:
-    - .deploy-deb
-
-# Deploy DEB files to APTLY RELEASE repository.
-deploy-release-deb:
-  stage: deploy
-  only:
-    - tags
-  variables:
-    PNAME: 'oaipmh-webapp'
-    PPATH: '${PNAME}/target'
-    PKEY: '${PVERSION}'
-    APTLY_TARGET: 'indy-releases'
-  extends:
-    - .deploy-deb

oaipmh-core/pom.xml

@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>info.textgrid.middleware.clients</groupId>
 			<artifactId>textgrid-clients</artifactId>
-			<version>${common.version}</version>
+			<version>${tgclients.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>

oaipmh-webapp/pom.xml

@@ -11,44 +11,6 @@
 	<packaging>war</packaging>
 	<name>DARIAHDE :: OAI-PMH DataProvider :: Webapp</name>
 	<url>https://gitlab.gwdg.de/dariah-de/dariah-de-oai-pmh-services</url>
-	<profiles>
-		<profile>
-			<id>dhrep.deb</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>jdeb</artifactId>
-						<groupId>org.vafer</groupId>
-						<version>1.4</version>
-						<executions>
-							<execution>
-								<phase>package</phase>
-								<goals>
-									<goal>jdeb</goal>
-								</goals>
-								<configuration>
-									<snapshotExpand>true</snapshotExpand>
-									<dataSet>
-										<data>
-											<type>directory</type>
-											<src>${project.build.directory}/${project.build.finalName}</src>
-											<mapper>
-												<type>perm</type>
-												<prefix>/var/dhrep/webapps/${project.build.finalName}</prefix>
-												<user>root</user>
-												<group>tomcat7</group>
-												<filemode>755</filemode>
-											</mapper>
-										</data>
-									</dataSet>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>

pom.xml

@@ -31,6 +31,7 @@
 		<properties-maven-plugin.version>1.0-alpha-2</properties-maven-plugin.version>
 		<rdf4j-repository-api.version>3.0.2</rdf4j-repository-api.version>
 		<spring.version>5.3.22</spring.version>
+		<tgclients.version>4.4.3</tgclients.version>
 		<xstream.version>1.4.18</xstream.version>
 	</properties>
 	<url>https://gitlab.gwdg.de/dariah-de/dariah-de-oai-pmh-services</url>