diff --git a/pom.xml b/pom.xml
index 4280fd0b1..fe89f2ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,9 +90,11 @@
4.9.3
4.3.1
2.1-SNAPSHOT
- 2.9.2
-
- 1.26.1
+ 2.11.0
+ 2.2.1
+
+ 4.1.2
+ 4.1.2
1.6.2
4.3.1
1.0.0-SNAPSHOT
@@ -377,14 +379,34 @@
${brapi-java-client.version}
- org.apache.tika
- tika-app
- ${tika-app.version}
+ org.apache.commons
+ commons-csv
+ ${apache-commons-csv.version}
+
+
+ org.apache.poi
+ poi
+ ${apache-poi.version}
+
+
+ org.apache.poi
+ poi-ooxml
+ ${apache-poi-ooxml.version}
org.apache.commons
- commons-compress
- ${commons-compress.version}
+ commons-lang3
+ ${apache-commons-lang.version}
+
+
+ commons-io
+ commons-io
+ ${commons-io.version}
+
+
+ org.apache.tika
+ tika-app
+ ${tika-app.version}
com.sun.mail
@@ -468,7 +490,7 @@
shade
-
+
*:*
@@ -477,9 +499,9 @@
META-INF/*.RSA
-
-
-
+
+
+
${exec.mainClass}
@@ -514,98 +536,98 @@
${maven.compiler.target}
-
- org.jooq
- jooq-codegen-maven
- ${jooq.version}
-
-
-
- generate
-
-
-
+
+ org.jooq
+ jooq-codegen-maven
+ ${jooq.version}
+
+
+
+ generate
+
+
+
+
+
+
+ org.postgresql.Driver
+ jdbc:postgresql://${DB_SERVER}/${DB_NAME}
+ ${DB_USER}
+ ${DB_PASSWORD}
+
+
+ org.breedinginsight.generation.JooqDaoGenerator
+
+ org.jooq.meta.postgres.PostgresDatabase
+ .*
+ public
+ true
+ true
+ false
+ true
+ true
+ true
+ true
+ false
+
+ flyway_schema_history|base_entity|base_track_edit_entity|spatial_ref_sys
+
+
-
-
- org.postgresql.Driver
+
+
+
+
+
+ PASCAL
+ $0_ENTITY
+
+
+ PASCAL
+ $0_TABLE
+
+
+
+
+
+
+
+ org.breedinginsight.dao.db
+ target/generated-sources/jooq
+
+
+ true
+ true
+ false
+ true
+
+
+
+
+
+ org.breedinginsight
+ bi-jooq-codegen
+ ${jooq.version}
+
+
+
+
+ org.flywaydb
+ flyway-maven-plugin
+ ${flyway.version}
+
jdbc:postgresql://${DB_SERVER}/${DB_NAME}
${DB_USER}
${DB_PASSWORD}
-
-
- org.breedinginsight.generation.JooqDaoGenerator
-
- org.jooq.meta.postgres.PostgresDatabase
- .*
- public
- true
- true
- false
- true
- true
- true
- true
- false
-
- flyway_schema_history|base_entity|base_track_edit_entity|spatial_ref_sys
-
-
-
-
-
-
-
-
- PASCAL
- $0_ENTITY
-
-
- PASCAL
- $0_TABLE
-
-
-
-
-
-
-
- org.breedinginsight.dao.db
- target/generated-sources/jooq
-
-
- true
- true
- false
- true
-
-
-
-
-
- org.breedinginsight
- bi-jooq-codegen
- ${jooq.version}
-
-
-
-
- org.flywaydb
- flyway-maven-plugin
- ${flyway.version}
-
- jdbc:postgresql://${DB_SERVER}/${DB_NAME}
- ${DB_USER}
- ${DB_PASSWORD}
-
-
-
- org.postgresql
- postgresql
- ${postgres.version}
-
-
-
+
+
+
+ org.postgresql
+ postgresql
+ ${postgres.version}
+
+
+
diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/create/workflow/steps/ValidatePendingImportObjectsStep.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/create/workflow/steps/ValidatePendingImportObjectsStep.java
index b1391c483..ee570c238 100644
--- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/create/workflow/steps/ValidatePendingImportObjectsStep.java
+++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/experiment/create/workflow/steps/ValidatePendingImportObjectsStep.java
@@ -363,7 +363,7 @@ private void validateGeoCoordinates(ValidationErrors validationErrors, int rowNu
}
if (elevationBadValue) {
- ExperimentUtilities.addRowError(ExperimentObservation.Columns.LONG, "Invalid Elevation value (numerals expected)", validationErrors, rowNum);
+ ExperimentUtilities.addRowError(ExperimentObservation.Columns.ELEVATION, "Invalid Elevation value (numerals expected)", validationErrors, rowNum);
}
}
diff --git a/src/main/java/org/breedinginsight/services/UserService.java b/src/main/java/org/breedinginsight/services/UserService.java
index 7502ff8b2..b78fdf8a6 100644
--- a/src/main/java/org/breedinginsight/services/UserService.java
+++ b/src/main/java/org/breedinginsight/services/UserService.java
@@ -390,6 +390,8 @@ private void sendAccountSignUpEmail(BiUserEntity user, SignedJWT jwtToken) {
String filledBody = emailTemplate.render();
String subject = "Activate DeltaBreed Account";
+ log.debug(filledBody);
+
// Send email
emailUtil.sendEmail(user.getEmail(), subject, filledBody);
}
diff --git a/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java b/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java
index a839715a1..7aef12550 100644
--- a/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java
+++ b/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java
@@ -19,6 +19,7 @@
import io.micronaut.context.annotation.Property;
import io.micronaut.http.server.exceptions.HttpServerException;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import javax.inject.Singleton;
@@ -29,6 +30,7 @@
import java.util.Date;
import java.util.Properties;
+@Slf4j
@Singleton
public class EmailUtil {
@@ -66,6 +68,8 @@ protected PasswordAuthentication getPasswordAuthentication() {
public void sendEmail(String toEmail, String subject, String body){
try
{
+ log.debug("Sending email to: " + toEmail + " from: " + fromEmail + " with subject: " + subject);
+
Session session = getSmtpHost();
MimeMessage msg = new MimeMessage(session);
//set message headers
@@ -83,11 +87,16 @@ public void sendEmail(String toEmail, String subject, String body){
msg.setRecipients(Message.RecipientType.TO, InternetAddress.parse(toEmail, false));
Transport.send(msg);
+
+ log.debug("Email sent to: " + toEmail + " from: " + fromEmail + " with subject: " + subject);
}
- catch (UnsupportedEncodingException | MessagingException e) {
+ catch (UnsupportedEncodingException e) {
+ log.debug("UnsupportedEncodingException " + e.getMessage());
+ throw new HttpServerException(e.getMessage());
+ } catch (MessagingException e) {
+ log.debug("MessagingException " + e.getMessage());
throw new HttpServerException(e.getMessage());
}
}
-
}
diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
index 25283e3c6..8267797c6 100644
--- a/src/main/resources/version.properties
+++ b/src/main/resources/version.properties
@@ -14,6 +14,6 @@
# limitations under the License.
#
-version=v1.1.0+946
-versionInfo=https://github.com/Breeding-Insight/bi-api/commit/f4ff8b366966fd4ccdc98f744709b32cb3176d26
+version=v1.1.0+957
+versionInfo=https://github.com/Breeding-Insight/bi-api/commit/6904ba563f374f7791fe93689eb324d1d55e9a5f