parent: ce99fae9 | patch | commit
Joaquín Reñé
2024-11-02 e082d1f4e2a5225bd0772f56ebf5ad73455f1e31 
#4385 - Fixing the build
3 files modified
changed files
securis/pom.xml patch | view | blame | history
securis/src/main/java/net/curisit/securis/services/LicenseResource.java patch | view | blame | history
securis/src/main/java/net/curisit/securis/utils/EmailManager.java patch | view | blame | history 
 securis/pom.xml
....@@ -1,7 +1,7 @@
11 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33 	
4
-	<name>SeCuris</name>
4
+	<name>SeCuris-Server</name>
55 	<groupId>net.curisit</groupId>
66 	<artifactId>securis-server</artifactId>
77 	<version>2.0.1</version>
....@@ -9,46 +9,46 @@
99 	
1010 	<description>CurisTEC Server Licenses</description>
1111 	
12
+	<organization>
13
+	    <name>CurisTec</name>
14
+	</organization>
15
+
1216 	<properties>
17
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18
+   	    <curisit.theme>default</curisit.theme>
1319 		<maven.version>3.10.0</maven.version>
20
+	    <maven.resources.overwrite>true</maven.resources.overwrite>
21
+	    <maven.compiler.debug>true</maven.compiler.debug>
22
+		<maven.compiler.source>11</maven.compiler.source>
23
+		<maven.compiler.target>11</maven.compiler.target>
24
+		
25
+		<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
26
+
27
+		<curistec.internal.version>3.3.0</curistec.internal.version>
28
+		<securis.version>1.3.1</securis.version>
29
+
30
+		<log4j.version>2.18.0</log4j.version>
31
+		<hibernate.version>4.3.6.Final</hibernate.version>
32
+
33
+		<javax.servlet.version>3.1.0</javax.servlet.version>
34
+		<jboss.version>3.0.13.Final</jboss.version>
35
+		<jboss-weld.version>2.2.9.Final</jboss-weld.version>
36
+		<jboss-jandex.version>1.2.2.Final</jboss-jandex.version>	
37
+		
38
+		<lang.version>2.6</lang.version>
39
+		<lang3.version>3.17.0</lang3.version>
40
+		<io.version>2.17.0</io.version>
41
+		<commons-cli.version>1.2</commons-cli.version>
42
+		<httpclient.version>4.5.6</httpclient.version>
43
+		<httpmime.version>4.4.1</httpmime.version>
44
+		<jackson.version>2.14.1</jackson.version>
1445 	</properties>
1546 	
1647 	<dependencies>
1748 		<dependency>
18
-			<groupId>commons-lang</groupId>
19
-			<artifactId>commons-lang</artifactId>
20
-			<version>2.6</version>
21
-		</dependency>
22
-		<dependency>
23
-			<groupId>javax.servlet</groupId>
24
-			<artifactId>javax.servlet-api</artifactId>
25
-			<version>3.1.0</version>
26
-			<scope>provided</scope>
27
-		</dependency>
28
-		<dependency>
29
-			<groupId>org.jboss.resteasy</groupId>
30
-			<artifactId>resteasy-multipart-provider</artifactId>
31
-			<version>3.0.13.Final</version>
32
-		</dependency>
33
-		<dependency>
34
-			<groupId>org.jboss.resteasy</groupId>
35
-			<artifactId>resteasy-jaxrs</artifactId>
36
-			<version>3.0.13.Final</version>
37
-		</dependency>
38
-		<dependency>
39
-			<groupId>org.jboss.weld.servlet</groupId>
40
-			<artifactId>weld-servlet</artifactId>
41
-			<version>2.2.9.Final</version>
42
-		</dependency>
43
-		<dependency>
44
-			<groupId>org.jboss</groupId>
45
-			<artifactId>jandex</artifactId>
46
-			<version>1.2.2.Final</version>
47
-		</dependency>
48
-		<dependency>
4949 			<groupId>net.curisit.integrity</groupId>
5050 			<artifactId>commons-curis</artifactId>
51
-			<version>3.3.0</version>
51
+			<version>${curistec.internal.version}</version>
5252 			<exclusions>
5353 				<exclusion>
5454 					<groupId>org.apache.logging.log4j</groupId>
....@@ -65,14 +65,9 @@
6565 			</exclusions>
6666 		</dependency>
6767 		<dependency>
68
-			<groupId>org.hibernate</groupId>
69
-			<artifactId>hibernate-entitymanager</artifactId>
70
-			<version>4.3.6.Final</version>
71
-		</dependency>
72
-		<dependency>
7368 			<groupId>net.curisit</groupId>
7469 			<artifactId>securis-client</artifactId>
75
-			<version>1.2.0</version>
70
+			<version>${securis.version}</version>
7671 			<exclusions>
7772 				<exclusion>
7873 					<artifactId>jackson-databind</artifactId>
....@@ -80,20 +75,68 @@
8075 				</exclusion>
8176 			</exclusions>
8277 		</dependency>
78
+
79
+		<dependency>
80
+			<groupId>org.apache.logging.log4j</groupId>
81
+			<artifactId>log4j-web</artifactId>
82
+			<version>${log4j.version}</version>
83
+		</dependency>
84
+		<dependency>
85
+			<groupId>org.hibernate</groupId>
86
+			<artifactId>hibernate-entitymanager</artifactId>
87
+			<version>${hibernate.version}</version>
88
+		</dependency>
8389 		<dependency>
8490 			<groupId>org.apache.httpcomponents</groupId>
8591 			<artifactId>httpclient</artifactId>
86
-			<version>4.4-beta1</version>
92
+			<version>${httpclient.version}</version>
8793 		</dependency>
8894 		<dependency>
8995 			<groupId>org.apache.httpcomponents</groupId>
9096 			<artifactId>httpmime</artifactId>
91
-			<version>4.4-beta1</version>
97
+			<version>${httpmime.version}</version>
98
+		</dependency>
99
+		<dependency>
100
+			<groupId>commons-lang</groupId>
101
+			<artifactId>commons-lang</artifactId>
102
+			<version>${lang.version}</version>
103
+		</dependency>
104
+		<dependency>
105
+			<groupId>javax.enterprise</groupId>
106
+			<artifactId>cdi-api</artifactId>
107
+			<version>1.2</version>
108
+			<scope>provided</scope>
109
+		</dependency>
110
+		<dependency>
111
+			<groupId>javax.servlet</groupId>
112
+			<artifactId>javax.servlet-api</artifactId>
113
+			<version>${javax.servlet.version}</version>
114
+			<scope>provided</scope>
115
+		</dependency>
116
+		<dependency>
117
+			<groupId>org.jboss.resteasy</groupId>
118
+			<artifactId>resteasy-multipart-provider</artifactId>
119
+			<version>${jboss.version}</version>
120
+		</dependency>
121
+		<dependency>
122
+			<groupId>org.jboss.resteasy</groupId>
123
+			<artifactId>resteasy-jaxrs</artifactId>
124
+			<version>${jboss.version}</version>
125
+		</dependency>
126
+		<dependency>
127
+			<groupId>org.jboss.weld.servlet</groupId>
128
+			<artifactId>weld-servlet</artifactId>
129
+			<version>${jboss-weld.version}</version>
130
+		</dependency>
131
+		<dependency>
132
+			<groupId>org.jboss</groupId>
133
+			<artifactId>jandex</artifactId>
134
+			<version>${jboss-jandex.version}</version>
92135 		</dependency>
93136 		<dependency>
94137 			<groupId>org.jboss.resteasy</groupId>
95138 			<artifactId>resteasy-jackson2-provider</artifactId>
96
-			<version>3.0.13.Final</version>
139
+			<version>${jboss.version}</version>
97140 			<exclusions>
98141 				<exclusion>
99142 					<artifactId>jackson-core</artifactId>
....@@ -106,46 +149,40 @@
106149 			</exclusions>
107150 		</dependency>
108151 		<dependency>
109
-			<groupId>org.apache.logging.log4j</groupId>
110
-			<artifactId>log4j-web</artifactId>
111
-			<version>2.17.2</version>
112
-		</dependency>
113
-		<dependency>
114
-			<groupId>javax.enterprise</groupId>
115
-			<artifactId>cdi-api</artifactId>
116
-			<version>1.2</version>
117
-			<scope>provided</scope>
118
-		</dependency>
119
-		<dependency>
120152 			<groupId>org.jboss.resteasy</groupId>
121153 			<artifactId>resteasy-cdi</artifactId>
122
-			<version>3.0.13.Final</version>
154
+			<version>${jboss.version}</version>
123155 		</dependency>
124156 		<dependency>
125157 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
126158 			<artifactId>jackson-jaxrs-json-provider</artifactId>
127
-			<version>2.4.1</version>
159
+			<version>${jackson.version}</version>
128160 		</dependency>
129161 		<dependency>
130162 			<groupId>com.fasterxml.jackson.core</groupId>
131163 			<artifactId>jackson-annotations</artifactId>
132
-			<version>2.4.1</version>
164
+			<version>${jackson.version}</version>
133165 		</dependency>
134166 	</dependencies>
167
+	
135168 	<build>
136169 		<plugins>
137
-			<plugin>
170
+ 			<plugin>
138171 				<groupId>org.apache.maven.plugins</groupId>
139172 				<artifactId>maven-compiler-plugin</artifactId>
140
-				<version>${maven.version}</version>
141
-				<configuration>
142
-					<source>1.8</source>
143
-					<target>1.8</target>
173
+       			<version>${maven.version}</version>
174
+ 				<configuration>
175
+                <source>${maven.compiler.source}</source>
176
+                <target>${maven.compiler.target}</target>
177
+                <encoding>${project.build.sourceEncoding}</encoding>
178
+				<debug>true</debug>
179
+				<showDeprecation>true</showDeprecation>
180
+				<showWarnings>true</showWarnings>
144181 				</configuration>
145182 			</plugin>
146183 			<plugin>
147184 				<artifactId>maven-assembly-plugin</artifactId>
148
-				<version>2.4</version>
185
+				<version>${maven-assembly-plugin.version}</version>
149186 				<configuration>
150187 					<formats>
151188 						<format>zip</format>
....@@ -159,6 +196,7 @@
159196 			</plugin>
160197 		</plugins>
161198 	</build>
199
+	
162200 	<repositories>
163201 		<repository>
164202 			<id>internal</id>


 securis/src/main/java/net/curisit/securis/services/LicenseResource.java
....@@ -218,6 +218,7 @@
218218 	 * @return
219219 	 * @throws SeCurisServiceException
220220 	 */
221
+	@SuppressWarnings("deprecation")
221222 	@PUT
222223 	@POST
223224 	@Path("/{licId}/send")


 securis/src/main/java/net/curisit/securis/utils/EmailManager.java
....@@ -100,7 +100,8 @@
100100      * @throws SeCurisException
101101      * @throws UnsupportedEncodingException
102102      */
103
-    public void sendEmail(String subject, String body, String to, String cc, File file) throws SeCurisServiceException, UnsupportedEncodingException {
103
+    @SuppressWarnings("deprecation")
104
+	public void sendEmail(String subject, String body, String to, String cc, File file) throws SeCurisServiceException, UnsupportedEncodingException {
104105         HttpPost postRequest = new HttpPost(serverUrl);
105106 
106107         MultipartEntityBuilder builder = MultipartEntityBuilder.create();