diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml index 8c0276fa8fb9dd57afe6a23ee308a02eaa1e47b6..f265c29c652ba9c217efacdaf3008bde4fbbc0df 100644 --- a/oaipmh-core/pom.xml +++ b/oaipmh-core/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>2.5.18-SNAPSHOT</version> + <version>2.5.19-SNAPSHOT</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-core</artifactId> @@ -14,7 +14,7 @@ <dependencies> <dependency> <groupId>info.textgrid.middleware</groupId> - <artifactId>tgcrud-common</artifactId> + <artifactId>crud-common</artifactId> <version>${tgcrud.version}</version> </dependency> <dependency> @@ -56,7 +56,7 @@ <dependency> <groupId>info.textgrid.utils</groupId> <artifactId>httpclients</artifactId> - <version>${textgrid.httpclients.version}</version> + <version>${tghttpclients.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -81,19 +81,6 @@ <version>1.2.14</version> </dependency> </dependencies> - <repositories> - <repository> - <id>nexus.snapshots</id> - <name>DARIAH Nexus public Repository</name> - <url>http://dev.dariah.eu/nexus/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> <build> <pluginManagement> <plugins> diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml index 6e6286b47130f2cc8ec9f1cf94a9d52d00e7821c..064a9e06d305789b1a09475fa185ebfa35fa050d 100644 --- a/oaipmh-webapp/pom.xml +++ b/oaipmh-webapp/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>2.5.18-SNAPSHOT</version> + <version>2.5.19-SNAPSHOT</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-webapp</artifactId> @@ -18,7 +18,7 @@ <plugins> <plugin> <artifactId>jdeb</artifactId> - <groupId>org.vafer</groupId> + <groupId>org.vafer</groupId> <version>1.4</version> <executions> <execution> diff --git a/pom.xml b/pom.xml index e4778a7c5ba9e59feb678349fdf5913b02ad4dd5..67ebf52a2daef74c05303fb41c350310e8ba9d93 100644 --- a/pom.xml +++ b/pom.xml @@ -1,104 +1,105 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>info.textgrid.middleware</groupId> - <artifactId>oaipmh</artifactId> - <version>2.5.18-SNAPSHOT</version> - <packaging>pom</packaging> - <name>DARIAHDE :: OAI-PMH DataProvider</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <cxf.version>3.1.7</cxf.version> - <tgcrud.version>6.0.0</tgcrud.version> - <spring.version>4.0.2.RELEASE</spring.version> - <textgrid.httpclients.version>2.0.0</textgrid.httpclients.version> - <jetty.version>6.1.15</jetty.version> - <elasticsearch.version>1.7.5</elasticsearch.version> - <antlr-runtime.version>3.2</antlr-runtime.version> - <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version> - <slf4j.version>1.7.5</slf4j.version> - <junit.version>4.11</junit.version> - <jdk.version>1.7</jdk.version> - <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version> - </properties> - <url>https://projects.gwdg.de/projects/oai-pmh</url> - <scm> - <connection>scm:git@git.projects.gwdg.de:oai-pmh.git</connection> - <developerConnection>scm:git@git.projects.gwdg.de:oai-pmh.git</developerConnection> - <url>https://projects.gwdg.de/projects/oai-pmh</url> - </scm> - <issueManagement> - <system>chili</system> - <url>https://projects.gwdg.de/projects/tg/issues</url> - </issueManagement> - <licenses> - <license> - <name>GNU LESSER GENERAL PUBLIC LICENSE</name> - <url>http://www.gnu.org/licenses/lgpl-3.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <organization> - <name>SUB Göttingen</name> - <url>http://www.sub.uni-goettingen.de</url> - </organization> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>${jdk.version}</source> - <target>${jdk.version}</target> - <fork>true</fork> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.9</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>true</downloadJavadocs> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>9.2.2.v20140723</version> - </plugin> - </plugins> - </build> - <modules> - <module>oaipmh-core</module> - <module>oaipmh-webapp</module> - </modules> - <repositories> - <repository> - <id>nexus.dariah</id> - <name>DARIAH Nexus Public Repository</name> - <url>http://dev.dariah.eu/nexus/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <distributionManagement> - <snapshotRepository> - <id>dariah.nexus.snapshots</id> - <url>http://dev.dariah.eu/nexus/content/repositories/snapshots</url> - </snapshotRepository> - <repository> - <id>dariah.nexus.releases</id> - <url>http://dev.dariah.eu/nexus/content/repositories/releases</url> - </repository> - </distributionManagement> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>info.textgrid.middleware</groupId> + <artifactId>oaipmh</artifactId> + <version>2.5.19-SNAPSHOT</version> + <packaging>pom</packaging> + <name>DARIAHDE :: OAI-PMH DataProvider</name> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <cxf.version>3.1.7</cxf.version> + <tgcrud.version>7.16.0-DH</tgcrud.version> + <spring.version>4.0.2.RELEASE</spring.version> + <tghttpclients.version>2.6.0</tghttpclients.version> + <jetty.version>6.1.15</jetty.version> + <elasticsearch.version>1.7.5</elasticsearch.version> + <antlr-runtime.version>3.2</antlr-runtime.version> + <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version> + <slf4j.version>1.7.5</slf4j.version> + <junit.version>4.11</junit.version> + <jdk.version>1.8</jdk.version> + <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version> + </properties> + <url>https://projects.gwdg.de/projects/oai-pmh</url> + <scm> + <connection>scm:git@git.projects.gwdg.de:oai-pmh.git</connection> + <developerConnection>scm:git@git.projects.gwdg.de:oai-pmh.git</developerConnection> + <url>https://projects.gwdg.de/projects/oai-pmh</url> + </scm> + <issueManagement> + <system>chili</system> + <url>https://projects.gwdg.de/projects/tg/issues</url> + </issueManagement> + <licenses> + <license> + <name>GNU LESSER GENERAL PUBLIC LICENSE</name> + <url>http://www.gnu.org/licenses/lgpl-3.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <organization> + <name>SUB Göttingen</name> + <url>http://www.sub.uni-goettingen.de</url> + </organization> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>${jdk.version}</source> + <target>${jdk.version}</target> + <fork>true</fork> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.9</version> + <configuration> + <downloadSources>true</downloadSources> + <downloadJavadocs>true</downloadJavadocs> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>9.2.2.v20140723</version> + </plugin> + </plugins> + </build> + <modules> + <module>oaipmh-core</module> + <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> + </repositories> + <distributionManagement> + <snapshotRepository> + <id>dariah.nexus.snapshots</id> + <url>https://ci.de.dariah.eu/nexus/content/repositories/snapshots</url> + </snapshotRepository> + <repository> + <id>dariah.nexus.releases</id> + <url>https://ci.de.dariah.eu/nexus/content/repositories/releases</url> + </repository> + </distributionManagement> </project>