Skip to content

Commit c541838

Browse files
php-coderphp-coder
committed
pom.xml: apply changes after running mvn sortpom:sort.
No functional changes.
1 parent 72db7b2 commit c541838

File tree

1 file changed

+117
-128
lines changed

1 file changed

+117
-128
lines changed

‎pom.xml

Lines changed: 117 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
43

54
<modelVersion>4.0.0</modelVersion>
65

@@ -9,84 +8,6 @@
98
<version>0.3-SNAPSHOT</version>
109
<packaging>war</packaging>
1110

12-
<parent>
13-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.6.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
14-
<groupId>org.springframework.boot</groupId>
15-
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>1.3.6.RELEASE</version>
17-
</parent>
18-
19-
<properties>
20-
<lombok.version>1.16.8</lombok.version>
21-
<selenium.version>2.53.1</selenium.version>
22-
<selenium.htmlunit.version>2.20</selenium.htmlunit.version>
23-
<subethasmtp.version>3.1.7</subethasmtp.version>
24-
<aspectj.version>1.8.5</aspectj.version>
25-
<javax.validation.version>1.1.0.Final</javax.validation.version>
26-
<commons.lang.version>3.4</commons.lang.version>
27-
<commons.io.version>2.4</commons.io.version>
28-
<thymeleaf.togglz.version>1.0.1.RELEASE</thymeleaf.togglz.version>
29-
<togglz.version>2.2.0.Final</togglz.version>
30-
31-
<!--
32-
Also don't forget to change version in:
33-
src/main/java/ru/mystamps/web/config/MvcConfig.java
34-
src/main/java/ru/mystamps/web/Url.java
35-
-->
36-
<bootstrap.version>3.3.6</bootstrap.version>
37-
<jquery.version>1.9.1</jquery.version>
38-
<selectizejs.version>0.12.1</selectizejs.version>
39-
40-
<testng.version>6.8.8</testng.version>
41-
<cglib.version>2.2.2</cglib.version>
42-
<fest.assert.version>2.0M8</fest.assert.version>
43-
44-
<compiler.plugin.version>3.5.1</compiler.plugin.version>
45-
<resources.plugin.version>2.7</resources.plugin.version>
46-
<clean.plugin.version>3.0.0</clean.plugin.version>
47-
<war.plugin.version>2.6</war.plugin.version>
48-
<native2ascii.plugin.version>1.0-beta-1</native2ascii.plugin.version>
49-
<surefire.plugin.version>2.19.1</surefire.plugin.version>
50-
<gmaven.plugin.version>1.4</gmaven.plugin.version>
51-
<gmaven.runtime.plugin.version>1.5</gmaven.runtime.plugin.version>
52-
<jasmine.plugin.version>2.1</jasmine.plugin.version>
53-
<minify.plugin.version>1.7.4</minify.plugin.version>
54-
<failsafe.plugin.version>2.19.1</failsafe.plugin.version>
55-
<license.plugin.version>1.9.0</license.plugin.version>
56-
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
57-
<pmd.plugin.version>3.6</pmd.plugin.version>
58-
<jacoco.plugin.version>0.7.7.201606060606</jacoco.plugin.version>
59-
<coveralls.plugin.version>2.2.0</coveralls.plugin.version>
60-
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
61-
<enforcer.plugin.version>1.4.1</enforcer.plugin.version>
62-
<sortpom.plugin.version>2.4.0</sortpom.plugin.version>
63-
64-
<!--
65-
Definitions and redefinitions of default values from spring-boot-dependencies:
66-
https://github.com/spring-projects/spring-boot/blob/v1.3.6.RELEASE/spring-boot-dependencies/pom.xml
67-
-->
68-
<commons-beanutils.version>1.9.2</commons-beanutils.version>
69-
<commons-dbcp.version>1.4</commons-dbcp.version>
70-
<commons-pool.version>1.5.4</commons-pool.version>
71-
<groovy.version>2.0.8</groovy.version>
72-
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
73-
<javax-mail.version>1.5.4</javax-mail.version>
74-
<jetty.version>9.2.17.v20160517</jetty.version>
75-
<h2.version>1.4.192</h2.version>
76-
<mysql.version>5.1.39</mysql.version>
77-
<servlet-api.version>3.1.0</servlet-api.version>
78-
<slf4j.version>1.7.21</slf4j.version>
79-
<spock.version>1.0-groovy-2.0</spock.version>
80-
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
81-
<thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version>
82-
83-
<!-- Definitions and redefinitions of default values from spring-boot-starter-parent -->
84-
<java.version>1.8</java.version>
85-
<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
86-
87-
<skipUnitTests>false</skipUnitTests>
88-
</properties>
89-
9011
<dependencies>
9112

9213
<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.6.RELEASE/spring-boot-starters/spring-boot-starter/pom.xml -->
@@ -346,14 +267,14 @@
346267
<version>${togglz.version}</version>
347268
<scope>test</scope>
348269
</dependency>
349-
270+
350271
<dependency>
351272
<groupId>org.subethamail</groupId>
352273
<artifactId>subethasmtp</artifactId>
353274
<version>${subethasmtp.version}</version>
354275
<scope>test</scope>
355276
</dependency>
356-
277+
357278
<dependency>
358279
<groupId>org.seleniumhq.selenium</groupId>
359280
<artifactId>selenium-api</artifactId>
@@ -424,13 +345,95 @@
424345

425346
</dependencies>
426347

348+
<parent>
349+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.3.6.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
350+
<groupId>org.springframework.boot</groupId>
351+
<artifactId>spring-boot-starter-parent</artifactId>
352+
<version>1.3.6.RELEASE</version>
353+
</parent>
354+
355+
<properties>
356+
<lombok.version>1.16.8</lombok.version>
357+
<selenium.version>2.53.1</selenium.version>
358+
<selenium.htmlunit.version>2.20</selenium.htmlunit.version>
359+
<subethasmtp.version>3.1.7</subethasmtp.version>
360+
<aspectj.version>1.8.5</aspectj.version>
361+
<javax.validation.version>1.1.0.Final</javax.validation.version>
362+
<commons.lang.version>3.4</commons.lang.version>
363+
<commons.io.version>2.4</commons.io.version>
364+
<thymeleaf.togglz.version>1.0.1.RELEASE</thymeleaf.togglz.version>
365+
<togglz.version>2.2.0.Final</togglz.version>
366+
367+
<!--
368+
Also don't forget to change version in:
369+
src/main/java/ru/mystamps/web/config/MvcConfig.java
370+
src/main/java/ru/mystamps/web/Url.java
371+
-->
372+
<bootstrap.version>3.3.6</bootstrap.version>
373+
<jquery.version>1.9.1</jquery.version>
374+
<selectizejs.version>0.12.1</selectizejs.version>
375+
376+
<testng.version>6.8.8</testng.version>
377+
<cglib.version>2.2.2</cglib.version>
378+
<fest.assert.version>2.0M8</fest.assert.version>
379+
380+
<compiler.plugin.version>3.5.1</compiler.plugin.version>
381+
<resources.plugin.version>2.7</resources.plugin.version>
382+
<clean.plugin.version>3.0.0</clean.plugin.version>
383+
<war.plugin.version>2.6</war.plugin.version>
384+
<native2ascii.plugin.version>1.0-beta-1</native2ascii.plugin.version>
385+
<surefire.plugin.version>2.19.1</surefire.plugin.version>
386+
<gmaven.plugin.version>1.4</gmaven.plugin.version>
387+
<gmaven.runtime.plugin.version>1.5</gmaven.runtime.plugin.version>
388+
<jasmine.plugin.version>2.1</jasmine.plugin.version>
389+
<minify.plugin.version>1.7.4</minify.plugin.version>
390+
<failsafe.plugin.version>2.19.1</failsafe.plugin.version>
391+
<license.plugin.version>1.9.0</license.plugin.version>
392+
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
393+
<pmd.plugin.version>3.6</pmd.plugin.version>
394+
<jacoco.plugin.version>0.7.7.201606060606</jacoco.plugin.version>
395+
<coveralls.plugin.version>2.2.0</coveralls.plugin.version>
396+
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
397+
<enforcer.plugin.version>1.4.1</enforcer.plugin.version>
398+
<sortpom.plugin.version>2.4.0</sortpom.plugin.version>
399+
400+
<!--
401+
Definitions and redefinitions of default values from spring-boot-dependencies:
402+
https://github.com/spring-projects/spring-boot/blob/v1.3.6.RELEASE/spring-boot-dependencies/pom.xml
403+
-->
404+
<commons-beanutils.version>1.9.2</commons-beanutils.version>
405+
<commons-dbcp.version>1.4</commons-dbcp.version>
406+
<commons-pool.version>1.5.4</commons-pool.version>
407+
<groovy.version>2.0.8</groovy.version>
408+
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
409+
<javax-mail.version>1.5.4</javax-mail.version>
410+
<jetty.version>9.2.17.v20160517</jetty.version>
411+
<h2.version>1.4.192</h2.version>
412+
<mysql.version>5.1.39</mysql.version>
413+
<servlet-api.version>3.1.0</servlet-api.version>
414+
<slf4j.version>1.7.21</slf4j.version>
415+
<spock.version>1.0-groovy-2.0</spock.version>
416+
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
417+
<thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version>
418+
419+
<!-- Definitions and redefinitions of default values from spring-boot-starter-parent -->
420+
<java.version>1.8</java.version>
421+
<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
422+
423+
<skipUnitTests>false</skipUnitTests>
424+
</properties>
425+
427426
<build>
428427
<finalName>${project.artifactId}</finalName>
429428

429+
<filters>
430+
<filter>${basedir}/src/main/resources/test/spring/test-data.properties</filter>
431+
</filters>
432+
430433
<resources>
431434
<resource>
432-
<directory>${basedir}/src/main/resources</directory>
433435
<filtering>true</filtering>
436+
<directory>${basedir}/src/main/resources</directory>
434437
<includes>
435438
<include>liquibase/sql/test-*.sql</include>
436439
</includes>
@@ -442,20 +445,14 @@
442445
</excludes>
443446
</resource>
444447
<resource>
445-
<directory>${basedir}/src/main/javascript</directory>
446448
<targetPath>js</targetPath>
449+
<directory>${basedir}/src/main/javascript</directory>
447450
<includes>
448451
<include>**/*.min.js</include>
449452
</includes>
450453
</resource>
451454
</resources>
452455

453-
<filters>
454-
<filter>
455-
${basedir}/src/main/resources/test/spring/test-data.properties
456-
</filter>
457-
</filters>
458-
459456
<plugins>
460457

461458
<plugin>
@@ -582,6 +579,13 @@
582579
<configuration>
583580
<providerSelection>2.0</providerSelection>
584581
</configuration>
582+
<dependencies>
583+
<dependency>
584+
<groupId>org.codehaus.gmaven.runtime</groupId>
585+
<artifactId>gmaven-runtime-2.0</artifactId>
586+
<version>${gmaven.runtime.plugin.version}</version>
587+
</dependency>
588+
</dependencies>
585589
<executions>
586590
<execution>
587591
<goals>
@@ -590,13 +594,6 @@
590594
</goals>
591595
</execution>
592596
</executions>
593-
<dependencies>
594-
<dependency>
595-
<groupId>org.codehaus.gmaven.runtime</groupId>
596-
<artifactId>gmaven-runtime-2.0</artifactId>
597-
<version>${gmaven.runtime.plugin.version}</version>
598-
</dependency>
599-
</dependencies>
600597
</plugin>
601598

602599
<plugin>
@@ -638,10 +635,10 @@
638635
<executions>
639636
<execution>
640637
<id>minify-resources</id>
641-
<phase>generate-resources</phase>
642638
<goals>
643639
<goal>minify</goal>
644640
</goals>
641+
<phase>generate-resources</phase>
645642
</execution>
646643
</executions>
647644
</plugin>
@@ -673,12 +670,8 @@
673670
<artifactId>liquibase-maven-plugin</artifactId>
674671
<version>${liquibase.version}</version>
675672
<configuration>
676-
<changeLogFile>
677-
/liquibase/changelog.xml
678-
</changeLogFile>
679-
<propertyFile>
680-
${basedir}/src/main/resources/liquibase/liquibase.properties
681-
</propertyFile>
673+
<changeLogFile>/liquibase/changelog.xml</changeLogFile>
674+
<propertyFile>${basedir}/src/main/resources/liquibase/liquibase.properties</propertyFile>
682675
<migrationSqlOutputFile>/dev/stdout</migrationSqlOutputFile>
683676
<!-- See also application-prod.properties -->
684677
<contexts>scheme,init-data,prod-data</contexts>
@@ -717,12 +710,8 @@
717710
<consoleOutput>true</consoleOutput>
718711
<includeTestSourceDirectory>true</includeTestSourceDirectory>
719712
<linkXRef>false</linkXRef>
720-
<configLocation>
721-
${basedir}/src/main/config/checkstyle.xml
722-
</configLocation>
723-
<suppressionsLocation>
724-
${basedir}/src/main/config/checkstyle-suppressions.xml
725-
</suppressionsLocation>
713+
<configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
714+
<suppressionsLocation>${basedir}/src/main/config/checkstyle-suppressions.xml</suppressionsLocation>
726715
</configuration>
727716
</plugin>
728717

@@ -819,6 +808,14 @@
819808
<url>https://my-stamps.ru</url>
820809
<inceptionYear>2009</inceptionYear>
821810

811+
<licenses>
812+
<license>
813+
<name>GNU GPL v2</name>
814+
<url>http://www.gnu.org/licenses/gpl-2.0.html</url>
815+
<distribution>repo</distribution>
816+
</license>
817+
</licenses>
818+
822819
<developers>
823820
<developer>
824821
<name>Slava Semushin</name>
@@ -841,23 +838,6 @@
841838
</developer>
842839
</developers>
843840

844-
<licenses>
845-
<license>
846-
<name>GNU GPL v2</name>
847-
<url>http://www.gnu.org/licenses/gpl-2.0.html</url>
848-
<distribution>repo</distribution>
849-
</license>
850-
</licenses>
851-
852-
<prerequisites>
853-
<maven>3.2.1</maven>
854-
</prerequisites>
855-
856-
<scm>
857-
<connection>scm:git:git://github.com/php-coder/mystamps.git</connection>
858-
<url>https://github.com/php-coder/mystamps</url>
859-
</scm>
860-
861841
<issueManagement>
862842
<system>GitHub</system>
863843
<url>https://github.com/php-coder/mystamps/issues</url>
@@ -868,4 +848,13 @@
868848
<url>https://travis-ci.org/php-coder/mystamps</url>
869849
</ciManagement>
870850

851+
<scm>
852+
<connection>scm:git:git://github.com/php-coder/mystamps.git</connection>
853+
<url>https://github.com/php-coder/mystamps</url>
854+
</scm>
855+
856+
<prerequisites>
857+
<maven>3.2.1</maven>
858+
</prerequisites>
859+
871860
</project>

0 commit comments

Comments
 (0)