From e0bd048bf5e83a55b8659eb3863c4db6fa85f623 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Tue, 5 Jul 2022 17:29:18 +0200
Subject: [PATCH] fix: remove log4j logging
---
oaipmh-core/.gitignore | 2 ++
oaipmh-core/TODO | 22 ----------------------
oaipmh-core/pom.xml | 20 ++++++++++----------
oaipmh-webapp/.gitignore | 2 ++
oaipmh-webapp/pom.xml | 4 +++-
pom.xml | 38 +++++++++++++++++++-------------------
6 files changed, 36 insertions(+), 52 deletions(-)
delete mode 100644 oaipmh-core/TODO
diff --git a/oaipmh-core/.gitignore b/oaipmh-core/.gitignore
index 76a620d2..6a8a18ad 100644
--- a/oaipmh-core/.gitignore
+++ b/oaipmh-core/.gitignore
@@ -4,3 +4,5 @@
/.project
/.settings/
/bin/
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/oaipmh-core/TODO b/oaipmh-core/TODO
deleted file mode 100644
index 64694748..00000000
--- a/oaipmh-core/TODO
+++ /dev/null
@@ -1,22 +0,0 @@
-1.
-change identifier from 123.0 to textgrid:123.0 in all/the getRecord requests,
-must be equal to the identifiers we get with the getIdentifiers() method
-DONE
-
-2.
-implement sets (for the prootype :)
-DONE
-
-3.
-implement resumption tokens (later)
-DONE
-4.
-remove "yo" in class RecordDeliverer :-)
-DONE
-
-5.
-DONE :D
-
-6.
-Fetch earliestTimestamp from ElasticSearch?
-DONE
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 500d5e41..cf2bb79f 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -69,16 +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.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/.gitignore b/oaipmh-webapp/.gitignore
index d814cc02..a48a4aef 100644
--- a/oaipmh-webapp/.gitignore
+++ b/oaipmh-webapp/.gitignore
@@ -3,3 +3,5 @@
/.settings/
/target/
/bin/
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 611870c1..1e5268a7 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -1,4 +1,6 @@
-<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>
diff --git a/pom.xml b/pom.xml
index 14b1ce9b..19e26a3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
<?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"
+<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>
@@ -11,27 +12,26 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.8</jdk.version>
<antlr-maven-plugin.version>3.2</antlr-maven-plugin.version>
- <antlr-runtime.version>3.2</antlr-runtime.version>
+ <antlr-runtime.version>3.2</antlr-runtime.version>
<common.version>4.4.0</common.version>
<cxf.version>3.3.13</cxf.version>
<cyclonedx-maven-plugin.version>2.7.0</cyclonedx-maven-plugin.version>
- <elasticsearch.version>6.5.4</elasticsearch.version>
- <jaxb2-namespace-prefix.version>1.3</jaxb2-namespace-prefix.version>
- <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version>
+ <elasticsearch.version>6.5.4</elasticsearch.version>
+ <jaxb2-namespace-prefix.version>1.3</jaxb2-namespace-prefix.version>
+ <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>
- <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
- <maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
- <mets-mods-mapping.version>1.1.40</mets-mods-mapping.version>
- <package-info-maven-plugin.version>1.4.5</package-info-maven-plugin.version>
- <properties-maven-plugin.version>1.0-alpha-2</properties-maven-plugin.version>
- <rdf4j-repository-api.version>3.0.2</rdf4j-repository-api.version>
+ <json.version>20190722</json.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>
+ <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+ <maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
+ <mets-mods-mapping.version>1.1.40</mets-mods-mapping.version>
+ <package-info-maven-plugin.version>1.4.5</package-info-maven-plugin.version>
+ <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.18</spring.version>
- <xstream.version>1.4.18</xstream.version>
+ <xstream.version>1.4.18</xstream.version>
</properties>
<url>https://gitlab.gwdg.de/dariah-de/dariah-de-oai-pmh-services</url>
<scm>
@@ -79,7 +79,7 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
@@ -107,7 +107,7 @@
<module>oaipmh-webapp</module>
</modules>
<repositories>
- <repository>
+ <repository>
<id>maven-dariah-public</id>
<name>GWDG Nexus DARIAH-DE Repository</name>
<url>https://nexus.gwdg.de/repository/maven-dariah-public/</url>
--
GitLab