Skip to content

Commit 275baae

Browse files
committed
Merge remote-tracking branch 'origin/master' into java11
# Conflicts: # PgBulkInsert/pom.xml
2 parents 848e571 + 35b8266 commit 275baae

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

PgBulkInsert/pgbulkinsert-jpa/pom.xml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
<version>5.1.0</version>
1212
<relativePath>..</relativePath>
1313
</parent>
14-
14+
1515
<artifactId>pgbulkinsert-jpa</artifactId>
1616
<name>pgbulkinsert-jpa</name>
17-
17+
1818
<packaging>jar</packaging>
1919

2020
<properties>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22-
<spring.version>2.2.6.RELEASE</spring.version>
2322
</properties>
2423

2524
<dependencies>
@@ -60,13 +59,6 @@
6059
<threadCount>10</threadCount>
6160
</configuration>
6261
</plugin>
63-
64-
<plugin>
65-
<groupId>org.springframework.boot</groupId>
66-
<artifactId>spring-boot-maven-plugin</artifactId>
67-
<version>${spring.version}</version>
68-
</plugin>
69-
7062
</plugins>
7163
</build>
7264

PgBulkInsert/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<plugin>
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-compiler-plugin</artifactId>
61-
<version>3.1</version>
61+
<version>3.8.1</version>
6262
<executions>
6363
<execution>
6464
<id>compile-jdk8</id>
@@ -150,7 +150,7 @@
150150
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
151151

152152
<postgresql.version>42.2.9</postgresql.version>
153-
<junit.version>4.12</junit.version>
153+
<junit.version>4.13</junit.version>
154154
</properties>
155155

156156

@@ -211,7 +211,7 @@
211211
<plugin>
212212
<groupId>org.apache.maven.plugins</groupId>
213213
<artifactId>maven-javadoc-plugin</artifactId>
214-
<version>2.9.1</version>
214+
<version>3.2.0</version>
215215
<executions>
216216
<execution>
217217
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)