Skip to content
This repository was archived by the owner on Jan 10, 2020. It is now read-only.

Commit 2490b0d

Browse files
BCaxelbeckerBCaxelbecker
authored
Merge pull request #6 from arangodb-helper/feature/updateJDK8
update to java 8
2 parents 0142de4 + cd3d920 commit 2490b0d

File tree

9 files changed

+476
-441
lines changed

9 files changed

+476
-441
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ before_script:
55
- ./tests/travis/setup_arangodb.sh
66

77
jdk:
8-
- oraclejdk7
9-
- openjdk7
10-
- openjdk6
8+
- oraclejdk11
9+
- openjdk10
10+
- openjdk11
1111

‎pom.xml

Lines changed: 159 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,171 @@
1-
<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/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.arangodb.objectmapper</groupId>
4-
<artifactId>arangodb-objectmapper</artifactId>
5-
<version>1.0.6-SNAPSHOT</version>
6-
<name>ArangoDB object mapper for Java</name>
7-
<description>Java ODM for ArangoDB</description>
8-
9-
<properties>
10-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
</properties>
12-
13-
<dependencies>
14-
<dependency>
15-
<groupId>org.apache.httpcomponents</groupId>
16-
<artifactId>httpclient</artifactId>
17-
<version>4.2.3</version>
18-
</dependency>
19-
<dependency>
20-
<groupId>log4j</groupId>
21-
<artifactId>log4j</artifactId>
22-
<version>1.2.16</version>
23-
</dependency>
24-
<dependency>
25-
<groupId>junit</groupId>
26-
<artifactId>junit</artifactId>
27-
<version>4.11</version>
28-
</dependency>
29-
<dependency>
30-
<groupId>com.fasterxml.jackson.datatype</groupId>
31-
<artifactId>jackson-datatype-joda</artifactId>
32-
<version>2.2.0</version>
33-
</dependency>
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/xsd/maven-4.0.0.xsd">
4+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>org.arangodb.objectmapper</groupId>
8+
<artifactId>arangodb-objectmapper</artifactId>
9+
<version>2.0.0-SNAPSHOT</version>
10+
11+
<name>ArangoDB object mapper for Java</name>
12+
<description>Java ODM for ArangoDB</description>
13+
14+
<properties>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
</properties>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.apache.httpcomponents</groupId>
21+
<artifactId>httpclient</artifactId>
22+
<version>4.5.6</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>log4j</groupId>
26+
<artifactId>log4j</artifactId>
27+
<version>1.2.17</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>junit</groupId>
31+
<artifactId>junit</artifactId>
32+
<version>4.12</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.fasterxml.jackson.datatype</groupId>
36+
<artifactId>jackson-datatype-joda</artifactId>
37+
<version>2.9.8</version>
38+
</dependency>
3439
<dependency>
3540
<groupId>com.fasterxml.jackson.core</groupId>
3641
<artifactId>jackson-annotations</artifactId>
37-
<version>2.2.0</version>
42+
<version>2.9.8</version>
3843
</dependency>
3944
<dependency>
4045
<groupId>com.fasterxml.jackson.core</groupId>
4146
<artifactId>jackson-core</artifactId>
42-
<version>2.2.0</version>
47+
<version>2.9.8</version>
4348
</dependency>
4449
<dependency>
4550
<groupId>com.fasterxml.jackson.core</groupId>
4651
<artifactId>jackson-databind</artifactId>
47-
<version>2.2.0</version>
48-
</dependency>
49-
</dependencies>
50-
<build>
51-
<directory>${basedir}/target</directory>
52-
<pluginManagement>
53-
<plugins>
54-
<plugin>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>2.5.1</version>
57-
<configuration>
58-
<source>1.5</source>
59-
<target>1.5</target>
60-
</configuration>
61-
</plugin>
62-
<plugin>
63-
<artifactId>maven-surefire-plugin</artifactId>
64-
<version>2.11</version>
65-
<configuration>
66-
<runOrder>random</runOrder>
67-
</configuration>
68-
</plugin>
69-
</plugins>
70-
</pluginManagement>
71-
<plugins>
72-
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-source-plugin</artifactId>
75-
<version>2.1.2</version>
76-
<executions>
77-
<execution>
78-
<id>attach-sources</id>
79-
<goals>
80-
<goal>jar</goal>
81-
</goals>
82-
</execution>
83-
</executions>
84-
</plugin>
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-javadoc-plugin</artifactId>
88-
<version>2.8</version>
89-
<executions>
90-
<execution>
91-
<id>attach-javadocs</id>
92-
<goals>
93-
<goal>jar</goal>
94-
</goals>
95-
</execution>
96-
</executions>
97-
</plugin>
98-
<!--<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-gpg-plugin</artifactId>
101-
<version>1.4</version>
102-
<executions>
103-
<execution>
104-
<id>sign-artifacts</id>
105-
<phase>verify</phase>
106-
<goals>
107-
<goal>sign</goal>
108-
</goals>
109-
</execution>
110-
</executions>
111-
</plugin>-->
112-
<plugin>
113-
<artifactId>maven-assembly-plugin</artifactId>
114-
<executions>
115-
<execution>
116-
<phase>package</phase>
117-
<goals>
118-
<goal>assembly</goal>
119-
</goals>
120-
</execution>
121-
</executions>
122-
<configuration>
123-
<attach>false</attach>
124-
<descriptors>
125-
<descriptor>src/assembly/standalone.xml</descriptor>
126-
<descriptor>src/assembly/distribution.xml</descriptor>
127-
</descriptors>
128-
<finalName>${project.artifactId}-${project.version}</finalName>
129-
<outputDirectory>target</outputDirectory>
130-
<workDirectory>target/assembly/work</workDirectory>
131-
<tarLongFileMode>warn</tarLongFileMode>
132-
<descriptorRefs>
133-
<descriptorRef>jar-with-dependencies</descriptorRef>
134-
</descriptorRefs>
135-
</configuration>
136-
</plugin>
137-
</plugins>
138-
</build>
139-
<reporting>
140-
<plugins>
141-
<plugin>
142-
<groupId>org.apache.maven.plugins</groupId>
143-
<artifactId>maven-javadoc-plugin</artifactId>
144-
<version>2.8</version>
145-
<configuration>
146-
<aggregate>true</aggregate>
147-
</configuration>
148-
</plugin>
149-
</plugins>
150-
</reporting>
52+
<version>2.9.8</version>
53+
</dependency>
54+
</dependencies>
55+
<build>
56+
<directory>${basedir}/target</directory>
57+
<pluginManagement>
58+
<plugins>
59+
<plugin>
60+
<artifactId>maven-compiler-plugin</artifactId>
61+
<version>3.8.0</version>
62+
<configuration>
63+
<source>1.8</source>
64+
<target>1.8</target>
65+
</configuration>
66+
</plugin>
67+
<plugin>
68+
<artifactId>maven-surefire-plugin</artifactId>
69+
<version>3.0.0-M3</version>
70+
<configuration>
71+
<runOrder>random</runOrder>
72+
</configuration>
73+
</plugin>
74+
</plugins>
75+
</pluginManagement>
76+
<plugins>
77+
<plugin>
78+
<inherited>true</inherited>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-enforcer-plugin</artifactId>
81+
<version>3.0.0-M2</version>
82+
<executions>
83+
<execution>
84+
<id>enforce-maven-3</id>
85+
<goals>
86+
<goal>enforce</goal>
87+
</goals>
88+
<configuration>
89+
<rules>
90+
<requireMavenVersion>
91+
<version>3.0.5</version>
92+
</requireMavenVersion>
93+
</rules>
94+
<fail>true</fail>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-source-plugin</artifactId>
102+
<version>3.0.1</version>
103+
<executions>
104+
<execution>
105+
<id>attach-sources</id>
106+
<goals>
107+
<goal>jar</goal>
108+
</goals>
109+
</execution>
110+
</executions>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-javadoc-plugin</artifactId>
115+
<configuration>
116+
<doclint>none</doclint>
117+
</configuration>
118+
<version>3.0.1</version>
119+
<executions>
120+
<execution>
121+
<id>attach-javadocs</id>
122+
<goals>
123+
<goal>jar</goal>
124+
</goals>
125+
</execution>
126+
</executions>
127+
</plugin>
128+
<!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId>
129+
<version>1.4</version> <executions> <execution> <id>sign-artifacts</id> <phase>verify</phase>
130+
<goals> <goal>sign</goal> </goals> </execution> </executions> </plugin> -->
131+
<plugin>
132+
<artifactId>maven-assembly-plugin</artifactId>
133+
<version>3.1.1</version>
134+
<executions>
135+
<execution>
136+
<phase>package</phase>
137+
<goals>
138+
<goal>single</goal>
139+
</goals>
140+
</execution>
141+
</executions>
142+
<configuration>
143+
<attach>false</attach>
144+
<descriptors>
145+
<descriptor>src/assembly/standalone.xml</descriptor>
146+
<descriptor>src/assembly/distribution.xml</descriptor>
147+
</descriptors>
148+
<finalName>${project.artifactId}-${project.version}</finalName>
149+
<outputDirectory>target</outputDirectory>
150+
<workDirectory>target/assembly/work</workDirectory>
151+
<tarLongFileMode>warn</tarLongFileMode>
152+
<descriptorRefs>
153+
<descriptorRef>jar-with-dependencies</descriptorRef>
154+
</descriptorRefs>
155+
</configuration>
156+
</plugin>
157+
</plugins>
158+
</build>
159+
<reporting>
160+
<plugins>
161+
<plugin>
162+
<groupId>org.apache.maven.plugins</groupId>
163+
<artifactId>maven-javadoc-plugin</artifactId>
164+
<version>3.0.1</version>
165+
<configuration>
166+
<aggregate>true</aggregate>
167+
</configuration>
168+
</plugin>
169+
</plugins>
170+
</reporting>
151171
</project>

0 commit comments

Comments
 (0)