Skip to content
Snippets Groups Projects
Commit 0cd751cf authored by Stefan E. Funk's avatar Stefan E. Funk
Browse files

Version increased 

Add new GWDG Nexus deployment
Fix DC simple https bug
parent 1542b21a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Jenkinsfile
+ 1
− 1
View file @ 0cd751cf
...@@ -7,7 +7,7 @@ node { ...@@ -7,7 +7,7 @@ node {
} }
stage('Build') { stage('Build') {
sh "'${mvnHome}/bin/mvn' -U clean verify deploy -Pdhrep.deb" sh "'${mvnHome}/bin/mvn' -U clean deploy -Pdhrep.deb"
} }
stage('Publish') { stage('Publish') {
......
oaipmh-core/pom.xml
+ 1
− 1
View file @ 0cd751cf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>oaipmh</artifactId> <artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<version>3.1.1-SNAPSHOT</version> <version>3.1.2-SNAPSHOT</version>
</parent> </parent>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId> <artifactId>oaipmh-core</artifactId>
......
oaipmh-core/src/main/xsd/oai_dc.xsd
+ 1
− 1
View file @ 0cd751cf
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</annotation> </annotation>
<import namespace="http://purl.org/dc/elements/1.1/" <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"/> <element name="dc" type="oai_dc:oai_dcType"/>
......
oaipmh-webapp/pom.xml
+ 6
− 6
View file @ 0cd751cf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>oaipmh</artifactId> <artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<version>3.1.1-SNAPSHOT</version> <version>3.1.2-SNAPSHOT</version>
</parent> </parent>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId> <artifactId>oaipmh-webapp</artifactId>
...@@ -81,19 +81,19 @@ ...@@ -81,19 +81,19 @@
<build> <build>
<finalName>oaipmh</finalName> <finalName>oaipmh</finalName>
<plugins> <plugins>
<!-- Do not deploy WAR and DEB files to the Nexus repository -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>3.0</version> <version>${maven-deploy-plugin.version}</version>
<configuration> <configuration>
<source>${jdk.version}</source> <skip>true</skip>
<target>${jdk.version}</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>9.4.12.v20180830</version> <version>${jetty-maven-plugin.version}</version>
<configuration> <configuration>
<scanIntervalSeconds>1</scanIntervalSeconds> <scanIntervalSeconds>1</scanIntervalSeconds>
<webApp> <webApp>
......
pom.xml
+ 22
− 17
View file @ 0cd751cf
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId> <artifactId>oaipmh</artifactId>
<version>3.1.1-SNAPSHOT</version> <version>3.1.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>DARIAHDE :: OAI-PMH DataProvider</name> <name>DARIAHDE :: OAI-PMH DataProvider</name>
<properties> <properties>
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<jdk.version>1.8</jdk.version> <jdk.version>1.8</jdk.version>
<maven-antrun-plugin.version>1.3</maven-antrun-plugin.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> </properties>
<url>https://projects.gwdg.de/projects/oai-pmh</url> <url>https://projects.gwdg.de/projects/oai-pmh</url>
<scm> <scm>
...@@ -48,7 +52,7 @@ ...@@ -48,7 +52,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version> <version>${maven-compiler-plugin.version}</version>
<configuration> <configuration>
<source>${jdk.version}</source> <source>${jdk.version}</source>
<target>${jdk.version}</target> <target>${jdk.version}</target>
...@@ -61,12 +65,17 @@ ...@@ -61,12 +65,17 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId> <artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version> <version>${maven-eclipse-plugin.version}</version>
<configuration> <configuration>
<downloadSources>true</downloadSources> <downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs> <downloadJavadocs>true</downloadJavadocs>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
</plugins> </plugins>
</build> </build>
<modules> <modules>
...@@ -74,26 +83,22 @@ ...@@ -74,26 +83,22 @@
<module>oaipmh-webapp</module> <module>oaipmh-webapp</module>
</modules> </modules>
<repositories> <repositories>
<repository> <repository>
<id>nexus.dariah</id> <id>maven-dariah-public</id>
<name>DARIAH Nexus Public Repository</name> <name>GWDG Nexus DARIAH-DE Repository</name>
<url>https://ci.de.dariah.eu/nexus/content/groups/public</url> <url>https://nexus.gwdg.de/repository/maven-dariah-public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository> </repository>
</repositories> </repositories>
<distributionManagement> <distributionManagement>
<snapshotRepository> <snapshotRepository>
<id>dariah.nexus.snapshots</id> <id>maven-dariah-public</id>
<url>https://ci.de.dariah.eu/nexus/content/repositories/snapshots</url> <name>GWDG Nexus DARIAH-DE Repository</name>
<url>https://nexus.gwdg.de/repository/maven-dariah-public/</url>
</snapshotRepository> </snapshotRepository>
<repository> <repository>
<id>dariah.nexus.releases</id> <id>maven-dariah-public</id>
<url>https://ci.de.dariah.eu/nexus/content/repositories/releases</url> <name>GWDG Nexus DARIAH-DE Repository</name>
<url>https://nexus.gwdg.de/repository/maven-dariah-public/</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
</project> </project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment