diff --git a/Jenkinsfile b/Jenkinsfile index dbd16f8407ec34e1e8136bf846db2e916db8e4cf..b508c841cc4caa582143f671fe1c13a2ac48b96b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ node { } stage('Build') { - sh "'${mvnHome}/bin/mvn' -U clean verify deploy -Pdhrep.deb" + sh "'${mvnHome}/bin/mvn' -U clean deploy -Pdhrep.deb" } stage('Publish') { diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml index 600bd2c00d9c56f94b499f8c74a508677e708fd5..302b5685e781f853738067839efe824a96f64c25 100644 --- a/oaipmh-core/pom.xml +++ b/oaipmh-core/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-core</artifactId> diff --git a/oaipmh-core/src/main/xsd/oai_dc.xsd b/oaipmh-core/src/main/xsd/oai_dc.xsd index bae1bbf375f5dd03bfa5dfec9f867dcbeb02ece0..88479d78648ab89020b97d1d347cfabc4972e79b 100644 --- a/oaipmh-core/src/main/xsd/oai_dc.xsd +++ b/oaipmh-core/src/main/xsd/oai_dc.xsd @@ -15,7 +15,7 @@ </annotation> <import namespace="http://purl.org/dc/elements/1.1/" - schemaLocation="http://dublincore.org/schemas/xmls/simpledc20021212.xsd"/> + schemaLocation="https://dublincore.org/schemas/xmls/simpledc20021212.xsd"/> <element name="dc" type="oai_dc:oai_dcType"/> diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml index 418ec8a9a8d1e9885f34bff6e5f054d6370c357b..dfe73f77a4bda27c75ba9e79569ae9226d24c5f7 100644 --- a/oaipmh-webapp/pom.xml +++ b/oaipmh-webapp/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-webapp</artifactId> @@ -81,19 +81,19 @@ <build> <finalName>oaipmh</finalName> <plugins> + <!-- Do not deploy WAR and DEB files to the Nexus repository --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.0</version> + <artifactId>maven-deploy-plugin</artifactId> + <version>${maven-deploy-plugin.version}</version> <configuration> - <source>${jdk.version}</source> - <target>${jdk.version}</target> + <skip>true</skip> </configuration> </plugin> <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.4.12.v20180830</version> + <version>${jetty-maven-plugin.version}</version> <configuration> <scanIntervalSeconds>1</scanIntervalSeconds> <webApp> diff --git a/pom.xml b/pom.xml index 06015ba96de10120c832fae82a870e875f8016c0..aaabc1f6d94b1fc0aa7e67041097c41a2bef122b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.2-SNAPSHOT</version> <packaging>pom</packaging> <name>DARIAHDE :: OAI-PMH DataProvider</name> <properties> @@ -20,6 +20,10 @@ <junit.version>4.11</junit.version> <jdk.version>1.8</jdk.version> <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version> + <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> + <maven-compiler-plugin.version>3.0</maven-compiler-plugin.version> + <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version> + <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version> </properties> <url>https://projects.gwdg.de/projects/oai-pmh</url> <scm> @@ -48,7 +52,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>${jdk.version}</source> <target>${jdk.version}</target> @@ -61,12 +65,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> - <version>2.9</version> + <version>${maven-eclipse-plugin.version}</version> <configuration> <downloadSources>true</downloadSources> <downloadJavadocs>true</downloadJavadocs> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>${maven-deploy-plugin.version}</version> + </plugin> </plugins> </build> <modules> @@ -74,26 +83,22 @@ <module>oaipmh-webapp</module> </modules> <repositories> - <repository> - <id>nexus.dariah</id> - <name>DARIAH Nexus Public Repository</name> - <url>https://ci.de.dariah.eu/nexus/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> + <repository> + <id>maven-dariah-public</id> + <name>GWDG Nexus DARIAH-DE Repository</name> + <url>https://nexus.gwdg.de/repository/maven-dariah-public/</url> </repository> </repositories> <distributionManagement> <snapshotRepository> - <id>dariah.nexus.snapshots</id> - <url>https://ci.de.dariah.eu/nexus/content/repositories/snapshots</url> + <id>maven-dariah-public</id> + <name>GWDG Nexus DARIAH-DE Repository</name> + <url>https://nexus.gwdg.de/repository/maven-dariah-public/</url> </snapshotRepository> <repository> - <id>dariah.nexus.releases</id> - <url>https://ci.de.dariah.eu/nexus/content/repositories/releases</url> + <id>maven-dariah-public</id> + <name>GWDG Nexus DARIAH-DE Repository</name> + <url>https://nexus.gwdg.de/repository/maven-dariah-public/</url> </repository> </distributionManagement> </project>