Cosmetic changes to produce new version.

GRAFO-URJC · Oct 3, 2023 · 9714e2f · 9714e2f
1 parent 9c97366
commit 9714e2f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/src/main/java/com/gramevapp/web/service/rabbitmq/MQConfig.java b/src/main/java/com/gramevapp/web/service/rabbitmq/MQConfig.java
@@ -13,15 +13,12 @@
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.Queue;
 
-import java.util.logging.Logger;
-
-
 @Configuration
 public class MQConfig {
-    public static final String RUNS_QUEUE = "message_queue";
+    public static final String RUNS_QUEUE = "runs_queue";
     public static final String REPORTS_QUEUE = "reports_queue";
     public static final String EXCHANGE = "EXCHANGE";
-    public static final String RUNS_ROUTING_KEY = "message_routingKey";
+    public static final String RUNS_ROUTING_KEY = "runs_routingKey";
     public static final String REPORT_ROUTING_KEY = "report_routingKey";
 
     @Bean

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,22 +1,22 @@
-# Following  are defined via environment variables
-#spring.flyway.user=usuario
-#spring.flyway.password=01234
-#spring.flyway.url=jdbc:postgresql://db:5432/webge
-#spring.datasource.url=jdbc:postgresql://db:5432/webge
-#spring.datasource.username=usuario
-#spring.datasource.password=01234
-spring.rabbitmq.host=rabbitmq
-
+# Global properties
 server.port=8182
 server.error.whitelabel.enabled = false
+webge.version=1.0.5 (October 2023)
+
+
+# Rabbit MQ
+spring.rabbitmq.host=rabbitmq
+# Dont requeue runs that ended with exception
+spring.rabbitmq.listener.simple.default-requeue-rejected=false
+
 
 # ===============================
 # = Workbench PostgreSQL data source
 # ===============================
 spring.jpa.database=POSTGRESQL
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.platform=postgres
+spring.sql.init.platform=postgres
 spring.flyway.schemas=webge
 spring.flyway.baseline-on-migrate=true
 #spring.jpa.show-sql=true
@@ -40,5 +40,4 @@ spring.servlet.multipart.max-request-size=10MB
 # logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 # https://stackoverflow.com/questions/20735205/launching-spring-application-address-already-in-use
 
-#Dont requeue runs that ended with exception
-spring.rabbitmq.listener.simple.default-requeue-rejected=false
+
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
@@ -1,5 +1,5 @@
 <div th:fragment="footer" id="footer">
     <footer class="footer" >
-        <p class="text-center" style="margin-top:15px;">Universidad Rey Juan Carlos: GRAFO Research Group.</p>
+        <p class="text-center" style="margin-top:15px;">WebGE v<th:block th:text="${@environment.getProperty('webge.version')}"></th:block> - Universidad Rey Juan Carlos: GRAFO Research Group.</p>
     </footer>
 </div>