Skip to content

Commit b59df15

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent e057cdb commit b59df15

File tree

1 file changed

+95
-74
lines changed

1 file changed

+95
-74
lines changed

‎pom.xml

Lines changed: 95 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,59 @@
266266
<artifactId>hibernate-validator</artifactId>
267267
<version>5.0.3.Final</version>
268268
</dependency>
269+
<dependency>
270+
<groupId>org.hamcrest</groupId>
271+
<artifactId>hamcrest-all</artifactId>
272+
<version>1.3</version>
273+
</dependency>
274+
<dependency>
275+
<groupId>org.glassfish.web</groupId>
276+
<artifactId>el-impl</artifactId>
277+
<version>2.2</version>
278+
<scope>test</scope>
279+
</dependency>
280+
<dependency>
281+
<groupId>joda-time</groupId>
282+
<artifactId>joda-time</artifactId>
283+
<version>2.2</version>
284+
</dependency>
285+
<dependency>
286+
<groupId>javax.servlet</groupId>
287+
<artifactId>javax.servlet-api</artifactId>
288+
<version>3.0.1</version>
289+
<scope>provided</scope>
290+
</dependency>
291+
<dependency>
292+
<groupId>javax.servlet.jsp</groupId>
293+
<artifactId>javax.servlet.jsp-api</artifactId>
294+
<version>2.2.1</version>
295+
<scope>provided</scope>
296+
</dependency>
297+
<dependency>
298+
<groupId>javax.servlet.jsp.jstl</groupId>
299+
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
300+
<version>1.2.1</version>
301+
</dependency>
302+
<dependency>
303+
<groupId>org.apache.tiles</groupId>
304+
<artifactId>tiles-jsp</artifactId>
305+
<version>2.2.2</version>
306+
</dependency>
307+
<dependency>
308+
<groupId>org.apache.tiles</groupId>
309+
<artifactId>tiles-el</artifactId>
310+
<version>2.2.2</version>
311+
</dependency>
312+
<dependency>
313+
<groupId>org.glassfish.web</groupId>
314+
<artifactId>javax.servlet.jsp.jstl</artifactId>
315+
<version>1.2.1</version>
316+
</dependency>
317+
<dependency>
318+
<groupId>org.jsoup</groupId>
319+
<artifactId>jsoup</artifactId>
320+
<version>1.7.1</version>
321+
</dependency>
269322
</dependencies>
270323
</dependencyManagement>
271324

@@ -339,13 +392,10 @@
339392
<scope>test</scope>
340393
</dependency>
341394

342-
343-
<!-- Spring -->
344395
<dependency>
345396
<groupId>org.springframework</groupId>
346397
<artifactId>spring-context</artifactId>
347398
<exclusions>
348-
<!-- Exclude Commons Logging in favor of SLF4j -->
349399
<exclusion>
350400
<groupId>commons-logging</groupId>
351401
<artifactId>commons-logging</artifactId>
@@ -404,16 +454,12 @@
404454
<dependency>
405455
<groupId>com.mysql</groupId>
406456
<artifactId>mysql-connector-j</artifactId>
407-
<version>8.0.31</version>
408457
</dependency>
409458

410459
<!-- JSR 303 with Hibernate Validator -->
411460
<dependency>
412461
<groupId>javax.validation</groupId>
413462
<artifactId>validation-api</artifactId>
414-
<!--
415-
<version>1.1.0.Final</version>
416-
-->
417463
</dependency>
418464
<dependency>
419465
<groupId>org.hibernate</groupId>
@@ -429,12 +475,6 @@
429475
<groupId>org.springframework</groupId>
430476
<artifactId>spring-jdbc</artifactId>
431477
</dependency>
432-
<!--
433-
<dependency>
434-
<groupId>commons-dbcp</groupId>
435-
<artifactId>commons-dbcp</artifactId>
436-
</dependency>
437-
-->
438478
<dependency>
439479
<groupId>org.springframework</groupId>
440480
<artifactId>spring-orm</artifactId>
@@ -462,20 +502,47 @@
462502
<artifactId>spring-security-config</artifactId>
463503
</dependency>
464504

465-
<!-- Mail -->
505+
<dependency>
506+
<groupId>org.springframework.integration</groupId>
507+
<artifactId>spring-integration-core</artifactId>
508+
</dependency>
509+
<dependency>
510+
<groupId>org.springframework.integration</groupId>
511+
<artifactId>spring-integration-mongodb</artifactId>
512+
</dependency>
513+
<dependency>
514+
<groupId>org.springframework.integration</groupId>
515+
<artifactId>spring-integration-jpa</artifactId>
516+
</dependency>
517+
<dependency>
518+
<groupId>org.springframework.integration</groupId>
519+
<artifactId>spring-integration-test</artifactId>
520+
</dependency>
521+
466522
<dependency>
467523
<groupId>javax.mail</groupId>
468524
<artifactId>mail</artifactId>
469525
<version>1.4</version>
470526
</dependency>
471527

472-
<!-- Test -->
528+
<dependency>
529+
<groupId>javax.servlet</groupId>
530+
<artifactId>javax.servlet-api</artifactId>
531+
<scope>provided</scope>
532+
</dependency>
533+
<dependency>
534+
<groupId>javax.servlet.jsp</groupId>
535+
<artifactId>javax.servlet.jsp-api</artifactId>
536+
<scope>provided</scope>
537+
</dependency>
538+
<dependency>
539+
<groupId>javax.servlet.jsp.jstl</groupId>
540+
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
541+
</dependency>
542+
473543
<dependency>
474544
<groupId>junit</groupId>
475545
<artifactId>junit</artifactId>
476-
<!--
477-
<version>4.11</version>
478-
-->
479546
<scope>test</scope>
480547
</dependency>
481548

@@ -487,76 +554,30 @@
487554
<dependency>
488555
<groupId>org.hamcrest</groupId>
489556
<artifactId>hamcrest-all</artifactId>
490-
<version>1.3</version>
491557
</dependency>
492558

493559
<dependency>
494560
<groupId>org.glassfish.web</groupId>
495561
<artifactId>el-impl</artifactId>
496-
<version>2.2</version>
497562
<scope>test</scope>
498563
</dependency>
499564

500-
<!-- Joda Time Library -->
501565
<dependency>
502566
<groupId>joda-time</groupId>
503567
<artifactId>joda-time</artifactId>
504-
<version>2.2</version>
505-
</dependency>
506-
507-
<!-- Spring Integration -->
508-
509-
<dependency>
510-
<groupId>org.springframework.integration</groupId>
511-
<artifactId>spring-integration-core</artifactId>
512-
</dependency>
513-
<dependency>
514-
<groupId>org.springframework.integration</groupId>
515-
<artifactId>spring-integration-mongodb</artifactId>
516-
</dependency>
517-
<dependency>
518-
<groupId>org.springframework.integration</groupId>
519-
<artifactId>spring-integration-jpa</artifactId>
520-
</dependency>
521-
<dependency>
522-
<groupId>org.springframework.integration</groupId>
523-
<artifactId>spring-integration-test</artifactId>
524568
</dependency>
525569

526-
<!-- Apache Tiles -->
527570
<dependency>
528571
<groupId>org.apache.tiles</groupId>
529572
<artifactId>tiles-jsp</artifactId>
530-
<version>2.2.2</version>
531573
</dependency>
532574
<dependency>
533575
<groupId>org.apache.tiles</groupId>
534576
<artifactId>tiles-el</artifactId>
535-
<version>2.2.2</version>
536-
</dependency>
537-
538-
<!-- Servlet -->
539-
<dependency>
540-
<groupId>javax.servlet</groupId>
541-
<artifactId>javax.servlet-api</artifactId>
542-
<version>3.0.1</version>
543-
<scope>provided</scope>
544-
</dependency>
545-
<dependency>
546-
<groupId>javax.servlet.jsp</groupId>
547-
<artifactId>javax.servlet.jsp-api</artifactId>
548-
<version>2.2.1</version>
549-
<scope>provided</scope>
550-
</dependency>
551-
<dependency>
552-
<groupId>javax.servlet.jsp.jstl</groupId>
553-
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
554-
<version>1.2.1</version>
555577
</dependency>
556578
<dependency>
557579
<groupId>org.glassfish.web</groupId>
558580
<artifactId>javax.servlet.jsp.jstl</artifactId>
559-
<version>1.2.1</version>
560581
<exclusions>
561582
<exclusion>
562583
<groupId>javax.servlet</groupId>
@@ -573,13 +594,10 @@
573594
</exclusions>
574595
</dependency>
575596
<dependency>
576-
<!-- jsoup HTML parser library @ http://jsoup.org/ -->
577597
<groupId>org.jsoup</groupId>
578598
<artifactId>jsoup</artifactId>
579-
<version>1.7.1</version>
580599
</dependency>
581600

582-
<!-- SCM -->
583601
<dependency>
584602
<groupId>org.apache.maven.scm</groupId>
585603
<artifactId>maven-scm-providers-standard</artifactId>
@@ -805,12 +823,18 @@
805823
<groupId>org.apache.maven.plugins</groupId>
806824
<artifactId>maven-javadoc-plugin</artifactId>
807825
<configuration>
808-
<!-- <links> <link>http://java.sun.com/javase/6/docs/api/</link> <link>http://static.springframework.org/spring/docs/3.0.x/api/</link>
826+
<!--
827+
<links>
828+
<link>http://java.sun.com/javase/6/docs/api/</link>
829+
<link>http://static.springframework.org/spring/docs/3.0.x/api/</link>
809830
<link>http://static.springframework.org/spring-webflow/docs/2.1.x/javadoc-api/</link>
810831
<link>http://static.springframework.org/spring-security/site/apidocs/</link>
811-
<link>http://tiles.apache.org/2.1/framework/apidocs/index.html</link> <link>http://www.hibernate.org/hib_docs/v3/api/</link>
812-
<link>http://docs.jboss.org/hibernate/stable/annotations/api/</link> <link>http://docs.jboss.org/hibernate/stable/entitymanager/api/</link>
813-
</links> -->
832+
<link>http://tiles.apache.org/2.1/framework/apidocs/index.html</link>
833+
<link>http://www.hibernate.org/hib_docs/v3/api/</link>
834+
<link>http://docs.jboss.org/hibernate/stable/annotations/api/</link>
835+
<link>http://docs.jboss.org/hibernate/stable/entitymanager/api/</link>
836+
</links>
837+
-->
814838
<linksource>true</linksource>
815839
<maxmemory>1024m</maxmemory>
816840
<source>${version.java}</source>
@@ -831,9 +855,6 @@
831855
<plugin>
832856
<groupId>org.codehaus.mojo</groupId>
833857
<artifactId>taglist-maven-plugin</artifactId>
834-
<configuration>
835-
<encoding>${encoding}</encoding>
836-
</configuration>
837858
</plugin>
838859
<plugin>
839860
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)