Skip to content

Commit 62dcfae

Browse files
authored
Merge pull request #27 from doubleSlashde/feature/updateDependencies
Feature/update dependencies
2 parents e60f819 + 7400a54 commit 62dcfae

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

pom.xml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,23 @@
1111
<name>KeepTime</name>
1212
<description>Time tracker</description>
1313

14+
<licenses>
15+
<license>
16+
<name>GNU General Public License (GPL) version 3.0</name>
17+
<url>http://www.gnu.org/licenses/gpl.txt</url>
18+
<distribution>manual</distribution>
19+
</license>
20+
</licenses>
21+
22+
<organization>
23+
<name>doubleSlash Net-Business GmbH</name>
24+
<url>https://www.doubleslash.de/</url>
25+
</organization>
26+
1427
<parent>
1528
<groupId>org.springframework.boot</groupId>
1629
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.0.2.RELEASE</version>
30+
<version>2.1.5.RELEASE</version>
1831
<relativePath /> <!-- lookup parent from repository -->
1932
</parent>
2033

@@ -35,17 +48,19 @@
3548
<groupId>com.h2database</groupId>
3649
<artifactId>h2</artifactId>
3750
<scope>runtime</scope>
51+
<!-- overwriting managed version as newer version is not supported by flyway: H2 1.4.199 is newer than this version
52+
of Flyway and support has not been tested. -->
53+
<version>1.4.197</version>
3854
</dependency>
3955
<dependency>
4056
<groupId>org.springframework.boot</groupId>
4157
<artifactId>spring-boot-starter-test</artifactId>
4258
<scope>test</scope>
4359
</dependency>
44-
<!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-maven-plugin -->
60+
4561
<dependency>
4662
<groupId>org.flywaydb</groupId>
47-
<artifactId>flyway-maven-plugin</artifactId>
48-
<version>5.1.4</version>
63+
<artifactId>flyway-core</artifactId>
4964
</dependency>
5065

5166
<dependency>
@@ -58,17 +73,11 @@
5873
<artifactId>dom</artifactId>
5974
<version>2.3.0-jaxb-1.0.6</version>
6075
</dependency>
61-
<dependency>
62-
<groupId>org.mockito</groupId>
63-
<artifactId>mockito-core</artifactId>
64-
<version>2.21.0</version>
65-
</dependency>
6676
<dependency>
6777
<groupId>org.apache.commons</groupId>
6878
<artifactId>commons-lang3</artifactId>
69-
<version>3.8</version>
7079
</dependency>
71-
80+
7281
<!-- maven assembly plugin -->
7382
<dependency>
7483
<groupId>org.apache.maven.plugins</groupId>
@@ -84,10 +93,10 @@
8493
<groupId>org.springframework.boot</groupId>
8594
<artifactId>spring-boot-maven-plugin</artifactId>
8695
</plugin>
87-
96+
8897
<plugin>
8998
<artifactId>maven-assembly-plugin</artifactId>
90-
<executions>
99+
<executions>
91100
<execution>
92101
<id>create-keeptime-zip</id>
93102
<phase>package</phase>
@@ -118,7 +127,7 @@
118127
<plugin>
119128
<groupId>org.owasp</groupId>
120129
<artifactId>dependency-check-maven</artifactId>
121-
<version>4.0.1</version>
130+
<version>5.0.0-M2</version>
122131
<reportSets>
123132
<reportSet>
124133
<reports>
@@ -129,7 +138,7 @@
129138
<configuration>
130139
<failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
131140
<failBuildOnCVSS>8</failBuildOnCVSS>
132-
<suppressionFile>dependency-check-report_suppressions.xml</suppressionFile>
141+
<!-- <suppressionFile>dependency-check-report_suppressions.xml</suppressionFile> -->
133142
</configuration>
134143
</plugin>
135144
</plugins>

0 commit comments

Comments
 (0)