Project

General

Profile

« Previous | Next » 

Revision 54842

Meerge dev-api to trunk ( -r50861:54841 )

View differences:

pom.xml
15 15
    <packaging>jar</packaging>
16 16

  
17 17

  
18
    <build>
19
        <plugins>
20
            <plugin>
21
                <groupId>org.apache.maven.plugins</groupId>
22
                <artifactId>maven-compiler-plugin</artifactId>
23
                <version>3.1</version>
24
                <configuration>
25
                    <source>1.8</source>
26
                    <target>1.8</target>
27
                    <encoding>UTF-8</encoding>
28
                </configuration>
29
            </plugin>
30

  
31
            <plugin>
32
                <artifactId>maven-war-plugin</artifactId>
33
                <version>2.6</version>
34
                <configuration>
35
                    <failOnMissingWebXml>false</failOnMissingWebXml>
36
                </configuration>
37
            </plugin>
38
            <!--<plugin>
39
                <groupId>cz.habarta.typescript-generator</groupId>
40
                <artifactId>typescript-generator-maven-plugin</artifactId>
41
                <version>1.29.366</version>
42
                <executions>
43
                    <execution>
44
                        <id>generate1</id>
45
                        <goals>
46
                            <goal>generate</goal>
47
                        </goals>
48
                        <configuration>
49
                            <jsonLibrary>jackson2</jsonLibrary>
50
                            <outputFileType>implementationFile</outputFileType>
51
                            <mapClasses>asClasses</mapClasses>
52
                            <classPatterns>
53
                                <pattern>eu.dnetlib.domain.data.*</pattern>
54
                            </classPatterns>
55
                            <outputFile>target/typeScriptClasses.ts</outputFile>
56
                            <outputKind>module</outputKind>
57
                        </configuration>
58
                    </execution>
59
                </executions>
60
            </plugin>-->
61
        </plugins>
62
    </build>
63

  
64 18
    <dependencies>
65 19

  
66 20
        <dependency>
......
112 66
            </exclusions>
113 67
        </dependency>
114 68

  
69
        <dependency>
70
            <groupId>eu.dnetlib</groupId>
71
            <artifactId>dnet-openaire-usage-stats-sushilite</artifactId>
72
            <version>1.0.0-SNAPSHOT</version>
73
        </dependency>
115 74

  
75

  
116 76
        <dependency>
117 77
            <groupId>cglib</groupId>
118 78
            <artifactId>cglib-nodep</artifactId>
......
207 167
        </dependency>
208 168

  
209 169
        <dependency>
170
            <groupId>com.sun.mail</groupId>
171
            <artifactId>javax.mail</artifactId>
172
            <version>1.6.0</version>
173
        </dependency>
174

  
175
        <dependency>
210 176
            <groupId>io.springfox</groupId>
211 177
            <artifactId>springfox-swagger2</artifactId>
212 178
            <version>2.7.0</version>
......
230 196
            <version>9.1-901.jdbc3</version>
231 197
        </dependency>
232 198

  
233
        <!--<dependency>
199
        <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-catalina -->
200
        <dependency>
201
            <groupId>org.apache.tomcat</groupId>
202
            <artifactId>tomcat-catalina</artifactId>
203
            <version>LATEST</version>
204
        </dependency>
205

  
206
        <dependency>
207
            <groupId>commons-fileupload</groupId>
208
            <artifactId>commons-fileupload</artifactId>
209
            <version>LATEST</version>
210
        </dependency>
211

  
212
        <dependency>
234 213
            <groupId>org.mitre</groupId>
235 214
            <artifactId>openid-connect-client</artifactId>
236 215
            <version>1.3.0</version>
......
240 219
                    <artifactId>jcl-over-slf4j</artifactId>
241 220
                </exclusion>
242 221
            </exclusions>
243
        </dependency>-->
222
        </dependency>
244 223

  
245
        <!--<dependency>
224

  
225
        <dependency>
246 226
            <groupId>org.springframework.session</groupId>
247 227
            <artifactId>spring-session-data-redis</artifactId>
248 228
            <version>1.3.1.RELEASE</version>
249 229
            <type>pom</type>
250 230
        </dependency>
231
        <!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
251 232
        <dependency>
252
            <groupId>biz.paluch.redis</groupId>
253
            <artifactId>lettuce</artifactId>
254
            <version>3.5.0.Final</version>
255
        </dependency>-->
233
            <groupId>redis.clients</groupId>
234
            <artifactId>jedis</artifactId>
235
            <version>2.9.0</version>
236
        </dependency>
237
        <dependency>
238
            <groupId>com.google.code.gson</groupId>
239
            <artifactId>gson</artifactId>
240
            <version>2.6.2</version>
241
        </dependency>
256 242

  
243
        <dependency>
244
            <groupId>com.thetransactioncompany</groupId>
245
            <artifactId>cors-filter</artifactId>
246
            <version>2.5</version>
247
        </dependency>
257 248

  
249
        <dependency>
250
            <groupId>org.springframework.cloud</groupId>
251
            <artifactId>spring-cloud-starter-hystrix</artifactId>
252
            <version>1.1.5.RELEASE</version>
253
        </dependency>
254

  
258 255
    </dependencies>
259 256

  
257
    <build>
258
        <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
259
        <plugins>
260
           <plugin>
261
                <groupId>org.apache.maven.plugins</groupId>
262
                <artifactId>maven-compiler-plugin</artifactId>
263
                <version>3.7.0</version>
264
                <configuration>
265
                    <source>1.8</source>
266
                    <target>1.8</target>
267
                    <encoding>UTF-8</encoding>
268
                </configuration>
269
            </plugin>
270

  
271
            <plugin>
272
                <artifactId>maven-war-plugin</artifactId>
273
                <version>2.6</version>
274
                <configuration>
275
                    <failOnMissingWebXml>false</failOnMissingWebXml>
276
                </configuration>
277
            </plugin>
278

  
279

  
280
            <!--<plugin>-->
281
                <!--<groupId>com.googlecode.maven-download-plugin</groupId>-->
282
                <!--<artifactId>download-maven-plugin</artifactId>-->
283
                <!--<version>1.3.0</version>-->
284
                <!--<executions>-->
285
                    <!--<execution>-->
286
                        <!--<phase>process-resources</phase>-->
287
                        <!--<goals>-->
288
                            <!--<goal>wget</goal>-->
289
                        <!--</goals>-->
290
                        <!--<configuration>-->
291
                            <!--<url>-->
292
                                <!--https://github.com/ostranme/swagger-ui-themes/archive/v3.0.0.zip-->
293
                            <!--</url>-->
294
                            <!--<unpack>true</unpack>-->
295
                            <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
296
                        <!--</configuration>-->
297
                    <!--</execution>-->
298
                <!--</executions>-->
299
            <!--</plugin>-->
300

  
301

  
302

  
303
<!--
304
            <plugin>
305
                <groupId>org.apache.maven.plugins</groupId>
306
                <artifactId>maven-antrun-plugin</artifactId>
307
                <version>1.8</version>
308
                <executions>
309
                    <execution>
310
                        <phase>prepare-package</phase>
311
                        <goals>
312
                            <goal>run</goal>
313
                        </goals>
314
                        <configuration>
315
                            <tasks>
316
                                <sequential>
317
                                    <echo>Add theme</echo>
318
                                    <replace token="&lt;/head&gt;"
319
                                             value="&lt;link href='webjars/springfox-swagger-ui/themes/2.x/theme-feeling-blue.css' rel=&quot;stylesheet&quot;/&gt;&lt;/head&gt;"
320
                                             dir="${settings.localRepository}/io/springfox/springfox-swagger-ui/2.7.0/META-INF/resources">
321
                                        <include name="swagger-ui.html"/>
322
                                    </replace>
323
                                </sequential>
324
                            </tasks>
325
                        </configuration>
326
                    </execution>
327
                </executions>
328
            </plugin>
329
-->
330

  
331
            <!--<plugin>
332
                <groupId>cz.habarta.typescript-generator</groupId>
333
                <artifactId>typescript-generator-maven-plugin</artifactId>
334
                <version>1.29.366</version>
335
                <executions>
336
                    <execution>
337
                        <id>generate1</id>
338
                        <goals>
339
                            <goal>generate</goal>
340
                        </goals>
341
                        <configuration>
342
                            <jsonLibrary>jackson2</jsonLibrary>
343
                            <outputFileType>implementationFile</outputFileType>
344
                            <mapClasses>asClasses</mapClasses>
345
                            <classPatterns>
346
                                <pattern>eu.dnetlib.domain.data.*</pattern>
347
                            </classPatterns>
348
                            <outputFile>target/typeScriptClasses.ts</outputFile>
349
                            <outputKind>module</outputKind>
350
                        </configuration>
351
                    </execution>
352
                </executions>
353
            </plugin>-->
354
        </plugins>
355
        <finalName>uoa-repository-manager-service</finalName>
356
        <resources>
357
            <resource>
358
                <directory>src/main/resources</directory>
359
                <filtering>true</filtering>
360
            </resource>
361
        </resources>
362
    </build>
363

  
364

  
260 365
</project>

Also available in: Unified diff