Skip to content

Commit 27a2a16

Browse files
BCaxelbeckerBCaxelbecker
committed
Merge branch 'feature/jdk8' into develop
2 parents 17035b2 + b69ddd4 commit 27a2a16

File tree

1 file changed

+61
-16
lines changed

1 file changed

+61
-16
lines changed

‎pom.xml

Lines changed: 61 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

@@ -26,7 +27,7 @@
2627
<arangodb.velocypack.version>1.4.1</arangodb.velocypack.version>
2728

2829
<!-- provided -->
29-
<httpclient.version>4.5.1</httpclient.version>
30+
<httpclient.version>4.5.7</httpclient.version>
3031

3132
<!-- test -->
3233
<logback-classic.version>1.1.3</logback-classic.version>
@@ -67,17 +68,41 @@
6768
<jdk>[1.8,)</jdk>
6869
</activation>
6970
<properties>
70-
<javadoc.opts>-Xdoclint:none</javadoc.opts>
71+
<doclint>none</doclint>
7172
</properties>
7273
</profile>
7374
</profiles>
7475

7576
<build>
7677
<plugins>
78+
79+
<plugin>
80+
<inherited>true</inherited>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-enforcer-plugin</artifactId>
83+
<version>3.0.0-M2</version>
84+
<executions>
85+
<execution>
86+
<id>enforce-maven-3</id>
87+
<goals>
88+
<goal>enforce</goal>
89+
</goals>
90+
<configuration>
91+
<rules>
92+
<requireMavenVersion>
93+
<version>3.0.5</version>
94+
</requireMavenVersion>
95+
</rules>
96+
<fail>true</fail>
97+
</configuration>
98+
</execution>
99+
</executions>
100+
</plugin>
101+
77102
<plugin>
78103
<groupId>org.sonatype.plugins</groupId>
79104
<artifactId>nexus-staging-maven-plugin</artifactId>
80-
<version>1.6.5</version>
105+
<version>1.6.8</version>
81106
<extensions>true</extensions>
82107
<configuration>
83108
<serverId>ossrh</serverId>
@@ -90,7 +115,6 @@
90115
<plugin>
91116
<groupId>org.apache.maven.plugins</groupId>
92117
<artifactId>maven-assembly-plugin</artifactId>
93-
<version>2.4.1</version>
94118
<executions>
95119
<execution>
96120
<id>assembly</id>
@@ -115,18 +139,16 @@
115139
<plugin>
116140
<groupId>org.apache.maven.plugins</groupId>
117141
<artifactId>maven-compiler-plugin</artifactId>
118-
<version>3.2</version>
119142
<configuration>
120-
<source>1.6</source>
121-
<target>1.6</target>
143+
<source>1.8</source>
144+
<target>1.8</target>
122145
<compilerArgument></compilerArgument>
123146
</configuration>
124147
</plugin>
125148

126149
<plugin>
127150
<groupId>org.apache.maven.plugins</groupId>
128151
<artifactId>maven-resources-plugin</artifactId>
129-
<version>2.7</version>
130152
<configuration>
131153
<encoding>UTF-8</encoding>
132154
</configuration>
@@ -135,7 +157,6 @@
135157
<plugin>
136158
<groupId>org.apache.maven.plugins</groupId>
137159
<artifactId>maven-source-plugin</artifactId>
138-
<version>2.4</version>
139160
<executions>
140161
<execution>
141162
<goals>
@@ -148,7 +169,6 @@
148169
<plugin>
149170
<groupId>org.apache.maven.plugins</groupId>
150171
<artifactId>maven-javadoc-plugin</artifactId>
151-
<version>2.9.1</version>
152172
<executions>
153173
<execution>
154174
<id>attach-javadocs</id>
@@ -165,7 +185,6 @@
165185

166186
<plugin>
167187
<artifactId>maven-surefire-plugin</artifactId>
168-
<version>2.19.1</version>
169188
<configuration>
170189
<includes>
171190
<include>**/*Test.java</include>
@@ -176,7 +195,6 @@
176195

177196
<plugin>
178197
<artifactId>maven-deploy-plugin</artifactId>
179-
<version>2.8.2</version>
180198
<configuration>
181199
<uniqueVersion>false</uniqueVersion>
182200
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
@@ -186,7 +204,6 @@
186204
<plugin>
187205
<groupId>org.apache.maven.plugins</groupId>
188206
<artifactId>maven-gpg-plugin</artifactId>
189-
<version>1.5</version>
190207
<executions>
191208
<execution>
192209
<id>sign-artifacts</id>
@@ -208,6 +225,19 @@
208225
<artifactId>httpclient</artifactId>
209226
<scope>provided</scope>
210227
</dependency>
228+
<dependency>
229+
<groupId>org.apache.httpcomponents</groupId>
230+
<artifactId>httpcore</artifactId>
231+
<scope>provided</scope>
232+
</dependency>
233+
<dependency>
234+
<groupId>commons-logging</groupId>
235+
<artifactId>commons-logging</artifactId>
236+
</dependency>
237+
<dependency>
238+
<groupId>commons-codec</groupId>
239+
<artifactId>commons-codec</artifactId>
240+
</dependency>
211241
<dependency>
212242
<groupId>com.arangodb</groupId>
213243
<artifactId>velocypack</artifactId>
@@ -221,7 +251,7 @@
221251
<artifactId>logback-classic</artifactId>
222252
<scope>test</scope>
223253
</dependency>
224-
<dependency>
254+
<dependency>
225255
<groupId>junit</groupId>
226256
<artifactId>junit</artifactId>
227257
<scope>test</scope>
@@ -240,6 +270,21 @@
240270
<artifactId>httpclient</artifactId>
241271
<version>${httpclient.version}</version>
242272
</dependency>
273+
<dependency>
274+
<groupId>org.apache.httpcomponents</groupId>
275+
<artifactId>httpcore</artifactId>
276+
<version>4.4.11</version>
277+
</dependency>
278+
<dependency>
279+
<groupId>commons-codec</groupId>
280+
<artifactId>commons-codec</artifactId>
281+
<version>1.11</version>
282+
</dependency>
283+
<dependency>
284+
<groupId>commons-logging</groupId>
285+
<artifactId>commons-logging</artifactId>
286+
<version>1.2</version>
287+
</dependency>
243288
<dependency>
244289
<groupId>com.arangodb</groupId>
245290
<artifactId>velocypack</artifactId>
@@ -255,7 +300,7 @@
255300
<artifactId>logback-classic</artifactId>
256301
<version>${logback-classic.version}</version>
257302
</dependency>
258-
<dependency>
303+
<dependency>
259304
<groupId>junit</groupId>
260305
<artifactId>junit</artifactId>
261306
<version>${junit.version}</version>

0 commit comments

Comments
 (0)