diff --git a/pom.xml b/pom.xml index 69c5b366f51a6be504e7529a68021914b5d5dd7d..3c45e6642da33e517084cb1d0057c0da6901a52d 100644 --- a/pom.xml +++ b/pom.xml @@ -164,6 +164,7 @@ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <outputDirectory>${basedir}/target/classes</outputDirectory> <testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory> + <pluginManagement> <plugins> <plugin> <groupId>org.antlr</groupId> @@ -232,7 +233,7 @@ <plugin> <groupId>com.coveo</groupId> <artifactId>fmt-maven-plugin</artifactId> - <version>2.5.1</version> + <version>2.8</version> <executions> <execution> <goals> @@ -242,6 +243,7 @@ </executions> </plugin> </plugins> + </pluginManagement> </build> <url>bmp.ds.mpg.de</url> diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java index 73092a97e89994782733748fff636edc83b8e07c..2bf51e76e7357839ee0c52d28caa18017691849f 100644 --- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java +++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java @@ -9,7 +9,6 @@ import caosdb.server.datatype.Value; import caosdb.server.entity.EntityInterface; import caosdb.server.entity.wrapper.Property; import caosdb.server.utils.mail.Mail; - import java.util.TimeZone; public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel { @@ -83,11 +82,11 @@ public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel { } return s.toString(); } - + protected void sendCuratorEmail(String body, String subject) { - for (String addr : CURATOR_EMAIL.split(" ")) { - Mail m = new Mail(FROM_NAME, FROM_EMAIL, null, addr, subject, body); - m.send(); - } + for (String addr : CURATOR_EMAIL.split(" ")) { + Mail m = new Mail(FROM_NAME, FROM_EMAIL, null, addr, subject, body); + m.send(); + } } } diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java index 74302f4f127619fcfe69fb596ffc2e6ad3433b02..ff490e99a72e93b03b04a0134c81790b1a2a1bec 100644 --- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java +++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java @@ -3,7 +3,6 @@ package caosdb.server.jobs.extension; import caosdb.server.entity.EntityInterface; import caosdb.server.jobs.JobAnnotation; import caosdb.server.jobs.JobExecutionTime; -import caosdb.server.utils.mail.Mail; @JobAnnotation(time = JobExecutionTime.POST_TRANSACTION) public class AWIBoxLoanRequestLoanCuratorEmail extends AWIBoxLoanCuratorEmail { diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java index fd3f3485ef2b38404f6a1a5a44e424f4257523d7..373ce0b8d10ef6db560decb6afcc3e7ab5aa71b3 100644 --- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java +++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java @@ -19,6 +19,4 @@ public class AWIBoxLoanRequestReturnCuratorEmail extends AWIBoxLoanCuratorEmail this.sendCuratorEmail(body.toString(), SUBJECT); } } - - }