diff --git a/.gitignore b/.gitignore
index 202b5a8f1..e786210e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ test-db
commands
src/main/resources/configuration.properties
.idea/
+.vscode
*.iml
opt/
diff --git a/edition-ldod/pom.xml b/edition-ldod/pom.xml
index 7ff72a6fb..ab77ff0df 100755
--- a/edition-ldod/pom.xml
+++ b/edition-ldod/pom.xml
@@ -1,7 +1,6 @@
+ 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">
4.0.0
@@ -41,10 +40,6 @@
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
org.codehaus.gmavenplus
gmavenplus-plugin
@@ -64,28 +59,28 @@
-
+
- org.twitter4j
- twitter4j-core
- 4.0.7
+ org.twitter4j
+ twitter4j-core
+ 4.0.7
- org.json
- json
- 20180813
+ org.json
+ json
+ 20180813
-
+
- com.googlecode.json-simple
- json-simple
- 1.1.1
+ com.googlecode.json-simple
+ json-simple
+ 1.1.1
-
+
-
+
diff --git a/edition-ldod/src/main/java/pt/ist/socialsoftware/edition/ldod/controller/LdoDErrorController.java b/edition-ldod/src/main/java/pt/ist/socialsoftware/edition/ldod/controller/LdoDErrorController.java
index 5783cdadb..9ceb9e46a 100644
--- a/edition-ldod/src/main/java/pt/ist/socialsoftware/edition/ldod/controller/LdoDErrorController.java
+++ b/edition-ldod/src/main/java/pt/ist/socialsoftware/edition/ldod/controller/LdoDErrorController.java
@@ -18,7 +18,6 @@ public ModelAndView error() {
return modelAndView;
}
- @Override
public String getErrorPath() {
return PATH;
}
diff --git a/edition-ldod/src/main/resources/application.properties b/edition-ldod/src/main/resources/application.properties
index f9b644d71..b1acec940 100644
--- a/edition-ldod/src/main/resources/application.properties
+++ b/edition-ldod/src/main/resources/application.properties
@@ -24,4 +24,9 @@ registration.confirmation.mail.smtp.host=smtp.gmail.com
registration.confirmation.mail.smtp.port=587
test.files.dir=src/test/resources/files/
-load.files.dir=src/main/resources/files/
\ No newline at end of file
+load.files.dir=src/main/resources/files/
+
+
+spring.main.allow-bean-definition-overriding=true
+server.servlet.register-default-servlet=true
+spring.main.allow-circular-references=true
diff --git a/edition-ldod/src/main/webapp/WEB-INF/jsp/common/meta-head.jsp b/edition-ldod/src/main/webapp/WEB-INF/jsp/common/meta-head.jsp
index 28e7f669b..475462736 100644
--- a/edition-ldod/src/main/webapp/WEB-INF/jsp/common/meta-head.jsp
+++ b/edition-ldod/src/main/webapp/WEB-INF/jsp/common/meta-head.jsp
@@ -1,85 +1,89 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-
-
LdoD
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-@media ( min-width : 992px) and (max-width: 1199px) { /* md */
- .text-md-left {
- text-align: left;
- }
- .text-md-right {
- text-align: right;
- }
- .text-md-center {
- text-align: center;
- }
- .text-md-justify {
- text-align: justify;
- }
-}
-@media ( min-width : 1200px) { /* lg */
- .text-lg-left {
- text-align: left;
- }
- .text-lg-right {
- text-align: right;
- }
- .text-lg-center {
- text-align: center;
- }
- .text-lg-justify {
- text-align: justify;
- }
-}
-
-
-
-
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 95ac0c1e7..d54a7e61d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,6 @@
+ 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">
4.0.0
pt.ist.socialsoftware
@@ -12,7 +11,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.12.RELEASE
+ 2.7.1
edition
@@ -41,7 +40,7 @@
0.9.0
3.3.7-1
- 1.11.3
+ 3.6.0
1.6.2
2.6
@@ -57,7 +56,7 @@
jvstm-ojb
- 0.8.6
+ 0.8.8
0.15
0.15
0.15
@@ -94,14 +93,7 @@
org.springframework.boot
spring-boot-maven-plugin
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 8
-
-
+
+
2.22.0
test
@@ -387,25 +379,25 @@
${version.spock}
test
-
+
org.codehaus.groovy
groovy-all
${version.groovy}
-
+
net.bytebuddy
byte-buddy
${net.bytebuddy.version}
test
-
org.objenesis
objenesis
${org.objenesis.version}
test
-
+
org.hamcrest
hamcrest-core
1.3