From ce99fae93251fadaaa7ab77b277e4f2698683f16 Mon Sep 17 00:00:00 2001
From: Joaquín Reñé <jrene@curisit.net>
Date: Mon, 14 Oct 2024 16:01:14 +0000
Subject: [PATCH] #4385 - Fixing build
---
securis/pom.xml | 10 ++++++++--
securis/src/main/java/net/curisit/securis/AuthFilter.java | 2 +-
securis/src/main/java/net/curisit/securis/ioc/RequestsModule.java | 2 +-
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 1 +
securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java | 2 +-
securis/src/main/java/net/curisit/securis/services/BasicServices.java | 6 ++++--
6 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index 995cda6..5fafccb 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -8,6 +8,11 @@
<modelVersion>4.0.0</modelVersion>
<description>CurisTEC Server Licenses</description>
+
+ <properties>
+ <maven.version>3.10.0</maven.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -41,9 +46,9 @@
<version>1.2.2.Final</version>
</dependency>
<dependency>
- <groupId>net.curisit</groupId>
+ <groupId>net.curisit.integrity</groupId>
<artifactId>commons-curis</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>3.3.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -132,6 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/securis/src/main/java/net/curisit/securis/AuthFilter.java b/securis/src/main/java/net/curisit/securis/AuthFilter.java
index c5c3122..4d5e1e8 100644
--- a/securis/src/main/java/net/curisit/securis/AuthFilter.java
+++ b/securis/src/main/java/net/curisit/securis/AuthFilter.java
@@ -36,7 +36,7 @@
if (username == null) {
username = (String) req.getSession().getAttribute("user");
}
- // TODO: role management is temporal
+ // Role management is temporal
String role = "advance".equals(username) ? "advance" : "normal";
LOG.info("Role for user: {} = {}", username, role);
fc.doFilter(new UserRoleRequestWrapper(role, sr.getParameter("user"), req), sr1);
diff --git a/securis/src/main/java/net/curisit/securis/ioc/RequestsModule.java b/securis/src/main/java/net/curisit/securis/ioc/RequestsModule.java
index 611e5f2..af144d4 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/RequestsModule.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/RequestsModule.java
@@ -15,7 +15,7 @@
@Override
protected void configure() {
- // TODO: Make the bind using reflection dynamically
+ // TODO Securis: Make the bind using reflection dynamically
bind(BasicServices.class);
bind(UserResource.class);
diff --git a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
index 52a50f6..8b0b6c8 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
@@ -46,7 +46,7 @@
@Provides
@ApplicationScoped
public URI getBaseURI() {
- // TODO Read from configuration, where?
+ // Read from configuration, where?
try {
String url = MessageFormat.format("http://{0}/", "0.0.0.0");
LOG.debug("Server url{}", url);
diff --git a/securis/src/main/java/net/curisit/securis/services/BasicServices.java b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
index 86c5e94..11fa986 100644
--- a/securis/src/main/java/net/curisit/securis/services/BasicServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
@@ -25,6 +25,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import net.curisit.integrity.AppVersion;
import net.curisit.integrity.commons.Utils;
import net.curisit.securis.ioc.EnsureTransaction;
import net.curisit.securis.security.Securable;
@@ -63,8 +64,9 @@
@Produces({ MediaType.APPLICATION_JSON })
public Map<String, String> version(@Context HttpServletRequest request) {
Map<String, String> resp = new HashMap<>();
- // TODO: Get the real version
- String version = "2.0.0";
+
+ // Get the real version
+ String version = AppVersion.getInstance().getCompleteVersion();
resp.put("version", version);
return resp;
}
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index f7eb23a..b3b3051 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -455,6 +455,7 @@
return rb;
}
+ @SuppressWarnings("deprecation")
@PUT
@POST
@Path("/{licId}")
--
Gitblit v1.3.2