diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml index f1848797c1ff32e914312d5deee3981eab33c48a..500d5e4117d4d6834211a556aa293b09803bbc56 100644 --- a/oaipmh-core/pom.xml +++ b/oaipmh-core/pom.xml @@ -69,6 +69,16 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> + </dependency> <dependency> <groupId>org.elasticsearch.client</groupId> <artifactId>elasticsearch-rest-high-level-client</artifactId> diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml index f6001715a2733028cb89b8c0978682a997fe6372..611870c102efaa928660b7364f42fc193afe44aa 100644 --- a/oaipmh-webapp/pom.xml +++ b/oaipmh-webapp/pom.xml @@ -1,17 +1,14 @@ -<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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>4.3.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> - <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-webapp</artifactId> <packaging>war</packaging> <name>DARIAHDE :: OAI-PMH DataProvider :: Webapp</name> - <url>https://projects.gwdg.de/projects/oai-pmh</url> + <url>https://projects.gwdg.de/projects/oai-pmh</url> <profiles> <profile> <id>dhrep.deb</id> @@ -51,12 +48,6 @@ </profile> </profiles> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties index b99f3870360f345c8cb85b74646907f40fdcc479..faff8c1e3f4b2e46d95fbab95f5539e807788048 100644 --- a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties +++ b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties @@ -9,8 +9,8 @@ RS_ENDPOINT = https://repository.de.dariah.eu/1.0/oaipmh ############################ elasticSearch.url = 127.0.0.1 -elasticSearch.port = 9202, 9203 -elasticSearch.clusterName = *** +elasticSearch.ports = 9202, 9203 +elasticSearch.index = *** elasticSearch.type = metadata elasticSearch.itemLimit = 100 diff --git a/pom.xml b/pom.xml index 96b744d377d144f648e417ecb8ba439eac97bc0c..14b1ce9bffcd99087057b41abdac7d16dcbcc3ce 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version> <junit.version>4.13.1</junit.version> <json.version>20190722</json.version> + <log4j.version>2.17.1</log4j.version> <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version> <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>