Project

General

Profile

« Previous | Next » 

Revision 075cdc06

Added by Andreas Müller over 3 years ago

ref #9204 upgrade spring and spring-security and its libraries in taxeditor

View differences:

.gitattributes
142 142
eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.1.jar -text
143 143
eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.7.jar -text
144 144
eu.etaxonomy.taxeditor.cdmlib/lib/aopalliance-1.0.jar -text
145
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar -text
146
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar -text
147 145
eu.etaxonomy.taxeditor.cdmlib/lib/avro-1.6.3.jar -text
148 146
eu.etaxonomy.taxeditor.cdmlib/lib/batik-anim-1.7.jar -text
149 147
eu.etaxonomy.taxeditor.cdmlib/lib/batik-awt-util-1.7.jar -text
.gitignore
58 58
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.30.jar
59 59
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-6.1.5.Final.jar
60 60
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-6.1.5.Final.jar
61
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.9.6.jar
62
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.9.6.jar
63
eu.etaxonomy.taxeditor.cdmlib/lib/aopalliance-1.0.jar
64
eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.3.28.RELEASE.jar
65
eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.3.28.RELEASE.jar
66
eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.3.28.RELEASE.jar
67
eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.3.28.RELEASE.jar
68
eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.3.28.RELEASE.jar
69
eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.3.28.RELEASE.jar
70
eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.3.28.RELEASE.jar
71
eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.3.28.RELEASE.jar
72
eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.3.28.RELEASE.jar
73
eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.3.28.RELEASE.jar
74
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.2.18.RELEASE.jar
75
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.2.18.RELEASE.jar
76
eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.3.28.RELEASE.jar
77
eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.3.28.RELEASE.jar
78
eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.3.28.RELEASE.jar
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
604 604
Bundle-ClassPath: .,
605 605
 lib/activation-1.1.1.jar,
606 606
 lib/apache-log4j-extras-1.2.17.jar,
607
 lib/aspectjrt-1.8.8.jar,
608
 lib/aspectjweaver-1.8.8.jar,
607
 lib/aspectjrt-1.9.6.jar,
608
 lib/aspectjweaver-1.9.6.jar,
609 609
 lib/batik-xml-1.7.jar,
610 610
 lib/cdmlib-commons-5.18.0-SNAPSHOT.jar,
611 611
 lib/cdmlib-ext-5.18.0-SNAPSHOT.jar,
......
661 661
 lib/joda-time-2.9.1.jar,
662 662
 lib/log4j-1.2.17.jar,
663 663
 lib/lsid-client-1.1.2.jar,
664
 lib/spring-aop-4.2.4.RELEASE.jar,
665
 lib/spring-aspects-4.2.4.RELEASE.jar,
666
 lib/spring-beans-4.2.4.RELEASE.jar,
667
 lib/spring-context-4.2.4.RELEASE.jar,
668
 lib/spring-context-support-4.2.4.RELEASE.jar,
669
 lib/spring-core-4.2.4.RELEASE.jar,
670
 lib/spring-expression-4.2.4.RELEASE.jar,
671
 lib/spring-jdbc-4.2.4.RELEASE.jar,
672
 lib/spring-orm-4.2.4.RELEASE.jar,
673
 lib/spring-oxm-4.2.4.RELEASE.jar,
664
 lib/spring-aop-4.3.28.RELEASE.jar,
665
 lib/spring-aspects-4.3.28.RELEASE.jar,
666
 lib/spring-beans-4.3.28.RELEASE.jar,
667
 lib/spring-context-4.3.28.RELEASE.jar,
668
 lib/spring-context-support-4.3.28.RELEASE.jar,
669
 lib/spring-core-4.3.28.RELEASE.jar,
670
 lib/spring-expression-4.3.28.RELEASE.jar,
671
 lib/spring-jdbc-4.3.28.RELEASE.jar,
672
 lib/spring-orm-4.3.28.RELEASE.jar,
673
 lib/spring-oxm-4.3.28.RELEASE.jar,
674 674
 lib/spring-plugin-core-1.2.0.RELEASE.jar,
675 675
 lib/spring-plugin-metadata-1.2.0.RELEASE.jar,
676
 lib/spring-security-config-4.0.3.RELEASE.jar,
677
 lib/spring-security-core-4.0.3.RELEASE.jar,
678
 lib/spring-test-4.2.4.RELEASE.jar,
679
 lib/spring-tx-4.2.4.RELEASE.jar,
680
 lib/spring-web-4.2.4.RELEASE.jar,
676
 lib/spring-security-config-4.2.18.RELEASE.jar,
677
 lib/spring-security-core-4.2.18.RELEASE.jar,
678
 lib/spring-test-4.3.28.RELEASE.jar,
679
 lib/spring-tx-4.3.28.RELEASE.jar,
680
 lib/spring-web-4.3.28.RELEASE.jar,
681 681
 lib/springfox-core-2.3.1.jar,
682 682
 lib/springfox-schema-2.3.1.jar,
683 683
 lib/springfox-spi-2.3.1.jar,
eu.etaxonomy.taxeditor.cdmlib/build.properties
2 2
               .,\
3 3
               lib/activation-1.1.1.jar,\
4 4
               lib/apache-log4j-extras-1.2.17.jar,\
5
               lib/aspectjrt-1.8.8.jar,\
6
               lib/aspectjweaver-1.8.8.jar,\
5
               lib/aspectjrt-1.9.6.jar,\
6
               lib/aspectjweaver-1.9.6.jar,\
7 7
               lib/batik-xml-1.7.jar,\
8 8
               lib/cdmlib-commons-5.18.0-SNAPSHOT.jar,\
9 9
               lib/cdmlib-ext-5.18.0-SNAPSHOT.jar,\
......
62 62
               lib/joda-time-2.9.1.jar,\
63 63
               lib/log4j-1.2.17.jar,\
64 64
               lib/lsid-client-1.1.2.jar,\
65
               lib/spring-aop-4.2.4.RELEASE.jar,\
66
               lib/spring-aspects-4.2.4.RELEASE.jar,\
67
               lib/spring-beans-4.2.4.RELEASE.jar,\
68
               lib/spring-context-4.2.4.RELEASE.jar,\
69
               lib/spring-context-support-4.2.4.RELEASE.jar,\
70
               lib/spring-core-4.2.4.RELEASE.jar,\
71
               lib/spring-expression-4.2.4.RELEASE.jar,\
72
               lib/spring-jdbc-4.2.4.RELEASE.jar,\
73
               lib/spring-orm-4.2.4.RELEASE.jar,\
74
               lib/spring-oxm-4.2.4.RELEASE.jar,\
65
               lib/spring-aop-4.3.28.RELEASE.jar,\
66
               lib/spring-aspects-4.3.28.RELEASE.jar,\
67
               lib/spring-beans-4.3.28.RELEASE.jar,\
68
               lib/spring-context-4.3.28.RELEASE.jar,\
69
               lib/spring-context-support-4.3.28.RELEASE.jar,\
70
               lib/spring-core-4.3.28.RELEASE.jar,\
71
               lib/spring-expression-4.3.28.RELEASE.jar,\
72
               lib/spring-jdbc-4.3.28.RELEASE.jar,\
73
               lib/spring-orm-4.3.28.RELEASE.jar,\
74
               lib/spring-oxm-4.3.28.RELEASE.jar,\
75 75
               lib/spring-plugin-core-1.2.0.RELEASE.jar,\
76 76
               lib/spring-plugin-metadata-1.2.0.RELEASE.jar,\
77
               lib/spring-security-config-4.0.3.RELEASE.jar,\
78
               lib/spring-security-core-4.0.3.RELEASE.jar,\
79
               lib/spring-test-4.2.4.RELEASE.jar,\
80
               lib/spring-tx-4.2.4.RELEASE.jar,\
81
               lib/spring-web-4.2.4.RELEASE.jar,\
77
               lib/spring-security-config-4.2.18.RELEASE.jar,\
78
               lib/spring-security-core-4.2.18.RELEASE.jar,\
79
               lib/spring-test-4.3.28.RELEASE.jar,\
80
               lib/spring-tx-4.3.28.RELEASE.jar,\
81
               lib/spring-web-4.3.28.RELEASE.jar,\
82 82
               lib/springfox-core-2.3.1.jar,\
83 83
               lib/springfox-schema-2.3.1.jar,\
84 84
               lib/springfox-spi-2.3.1.jar,\
eu.etaxonomy.taxeditor.cdmlib/pom.xml
60 60
                httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-codec,
61 61
                commons-imaging,h2,jackson-databind,jackson-annotations,jackson-core,jboss-logging,
62 62
                validation-api,classmate,javax.el-api,slf4j-api,slf4j-log4j12,
63
                hibernate-validator,hibernate-validator-cdi
63
                hibernate-validator,hibernate-validator-cdi,
64
                spring-context,spring-context-support,spring-aspects,spring-test,spring-beans,
65
                spring-tx,spring-web,spring-core,spring-aop,spring-expression,spring-orm,
66
                spring-oxm,spring-jdbc,spring-security-config,spring-security-core,
67
                aopalliance,aspectjweaver,aspectjrt
64 68
              </includeArtifactIds>
65 69
              <outputDirectory>
66 70
                ${basedir}/lib
......
265 269
    <dependency>
266 270
      <groupId>org.springframework</groupId>
267 271
      <artifactId>spring-context</artifactId>
268
      <version>4.2.4.RELEASE</version>
272
      <version>4.3.28.RELEASE</version>
269 273
    </dependency>
270 274
    <dependency>
271 275
      <groupId>org.springframework</groupId>
272 276
      <artifactId>spring-context-support</artifactId>
273
      <version>4.2.4.RELEASE</version>
277
      <version>4.3.28.RELEASE</version>
274 278
    </dependency>
275 279
    <dependency>
276 280
      <groupId>org.springframework</groupId>
277 281
      <artifactId>spring-aspects</artifactId>
278
      <version>4.2.4.RELEASE</version>
282
      <version>4.3.28.RELEASE</version>
279 283
    </dependency>
280 284
    <dependency>
281 285
      <groupId>org.springframework</groupId>
282 286
      <artifactId>spring-test</artifactId>
283
      <version>4.2.4.RELEASE</version>
287
      <version>4.3.28.RELEASE</version>
284 288
    </dependency>
285 289
    <dependency>
286 290
      <groupId>org.springframework</groupId>
287 291
      <artifactId>spring-beans</artifactId>
288
      <version>4.2.4.RELEASE</version>
292
      <version>4.3.28.RELEASE</version>
289 293
    </dependency>
290 294
    <dependency>
291 295
      <groupId>org.springframework</groupId>
292 296
      <artifactId>spring-tx</artifactId>
293
      <version>4.2.4.RELEASE</version>
297
      <version>4.3.28.RELEASE</version>
294 298
    </dependency>
295 299
    <dependency>
296 300
		<groupId>org.springframework</groupId>
297 301
		<artifactId>spring-web</artifactId>
298
		<version>4.2.4.RELEASE</version>
302
		<version>4.3.28.RELEASE</version>
299 303
	</dependency>
300 304
    <dependency>
301 305
      <groupId>org.springframework</groupId>
302 306
      <artifactId>spring-core</artifactId>
303
      <version>4.2.4.RELEASE</version>
307
      <version>4.3.28.RELEASE</version>
304 308
    </dependency>
305 309
    <dependency>
306 310
      <groupId>org.springframework</groupId>
307 311
      <artifactId>spring-aop</artifactId>
308
      <version>4.2.4.RELEASE</version>
312
      <version>4.3.28.RELEASE</version>
309 313
    </dependency>
310 314
    <dependency>
311 315
		<groupId>org.springframework</groupId>
312 316
		<artifactId>spring-expression</artifactId>
313
		<version>4.2.4.RELEASE</version>
317
		<version>4.3.28.RELEASE</version>
314 318
	</dependency>
315 319
   <dependency>
316 320
		<groupId>org.springframework</groupId>
317 321
		<artifactId>spring-orm</artifactId>
318
		<version>4.2.4.RELEASE</version>
322
		<version>4.3.28.RELEASE</version>
323
	</dependency>
324
	<dependency>
325
		<groupId>org.springframework</groupId>
326
		<artifactId>spring-oxm</artifactId>
327
		<version>4.3.28.RELEASE</version>
319 328
	</dependency>
320 329
    <dependency>
321 330
		<groupId>org.springframework</groupId>
322 331
		<artifactId>spring-jdbc</artifactId>
323
		<version>4.2.4.RELEASE</version>
332
		<version>4.3.28.RELEASE</version>
324 333
	</dependency>
325 334
    <dependency>
326 335
      <groupId>org.springframework.security</groupId>
327 336
      <artifactId>spring-security-core</artifactId>
328
      <version>4.0.3.RELEASE</version>
337
      <version>4.2.18.RELEASE</version>
329 338
    </dependency>
330 339
    <dependency>
331 340
      <groupId>org.springframework.security</groupId>
332 341
      <artifactId>spring-security-config</artifactId>
333
      <version>4.0.3.RELEASE</version>
342
      <version>4.2.18.RELEASE</version>
334 343
    </dependency>
335 344
    <dependency>
336 345
      <groupId>org.springframework.security</groupId>
337 346
      <artifactId>spring-security-remoting</artifactId>
338
      <version>4.0.3.RELEASE</version>
347
      <version>4.2.18.RELEASE</version>
339 348
    </dependency>
349
    <dependency>
350
    	<!-- dependency of spring security core, can be removed after
351
    	upgrading to spring security 5.x -->
352
	    <groupId>aopalliance</groupId>
353
	    <artifactId>aopalliance</artifactId>
354
	    <version>1.0</version>
355
	</dependency>
356
    
340 357
    <dependency>
341 358
      <groupId>commons-lang</groupId>
342 359
      <artifactId>commons-lang</artifactId>
......
393 410
        <version>2.12.0</version>
394 411
    </dependency>
395 412
    
413
    <dependency>
414
       <groupId>org.aspectj</groupId>
415
       <artifactId>aspectjweaver</artifactId>
416
       <version>1.9.6</version>
417
    </dependency>
418
    <dependency>
419
       <groupId>org.aspectj</groupId>
420
       <artifactId>aspectjrt</artifactId>
421
       <version>1.9.6</version>
422
    </dependency>
423
    
396 424
	<!-- logging -->
397 425
    <dependency>
398 426
        <!-- needed? -->
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
10 10
Bundle-ClassPath: .,
11 11
 lib/log4j-1.2.17.jar,
12 12
 lib/jetty-server-9.4.26.v20200117.jar,
13
 lib/javax.servlet-api-3.1.0.jar,
13
 lib/javax.servlet-api-4.0.1.jar,
14 14
 lib/c3p0-0.9.5.2.jar,
15 15
 lib/h2-1.4.190.jar,
16 16
 lib/mchange-commons-java-0.2.11.jar,

Also available in: Unified diff