Skip to content

Commit b3cf85f

Browse files
rachelshurachelshu
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: jackson/src/test/java/org/baeldung/jackson/test/JacksonFieldUnitTest.java
2 parents 09b4633 + 52a134d commit b3cf85f

File tree

50 files changed

+2304
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2304
-297
lines changed

‎core-java/pom.xml

Lines changed: 181 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -1,176 +1,183 @@
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.baeldung</groupId>
4-
<artifactId>core-java</artifactId>
5-
<version>0.1-SNAPSHOT</version>
6-
7-
<name>core-java</name>
8-
9-
<dependencies>
10-
11-
<!-- utils -->
12-
13-
<dependency>
14-
<groupId>com.google.guava</groupId>
15-
<artifactId>guava</artifactId>
16-
<version>${guava.version}</version>
17-
</dependency>
18-
19-
<dependency>
20-
<groupId>org.apache.commons</groupId>
21-
<artifactId>commons-collections4</artifactId>
22-
<version>4.0</version>
23-
</dependency>
24-
25-
<dependency>
26-
<groupId>commons-io</groupId>
27-
<artifactId>commons-io</artifactId>
28-
<version>2.4</version>
29-
</dependency>
30-
31-
<dependency>
32-
<groupId>org.apache.commons</groupId>
33-
<artifactId>commons-lang3</artifactId>
34-
<version>${commons-lang3.version}</version>
35-
</dependency>
36-
37-
<!-- web -->
38-
39-
<!-- marshalling -->
40-
41-
<dependency>
42-
<groupId>com.fasterxml.jackson.core</groupId>
43-
<artifactId>jackson-databind</artifactId>
44-
<version>${jackson.version}</version>
45-
</dependency>
46-
47-
<!-- logging -->
48-
49-
<dependency>
50-
<groupId>org.slf4j</groupId>
51-
<artifactId>slf4j-api</artifactId>
52-
<version>${org.slf4j.version}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>ch.qos.logback</groupId>
56-
<artifactId>logback-classic</artifactId>
57-
<version>${logback.version}</version>
58-
<!-- <scope>runtime</scope> -->
59-
</dependency>
60-
<dependency>
61-
<groupId>org.slf4j</groupId>
62-
<artifactId>jcl-over-slf4j</artifactId>
63-
<version>${org.slf4j.version}</version>
64-
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
65-
</dependency>
66-
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
67-
<groupId>org.slf4j</groupId>
68-
<artifactId>log4j-over-slf4j</artifactId>
69-
<version>${org.slf4j.version}</version>
70-
</dependency>
71-
72-
<!-- test scoped -->
73-
74-
<dependency>
75-
<groupId>junit</groupId>
76-
<artifactId>junit-dep</artifactId>
77-
<version>${junit.version}</version>
78-
<scope>test</scope>
79-
</dependency>
80-
81-
<dependency>
82-
<groupId>org.hamcrest</groupId>
83-
<artifactId>hamcrest-core</artifactId>
84-
<version>${org.hamcrest.version}</version>
85-
<scope>test</scope>
86-
</dependency>
87-
<dependency>
88-
<groupId>org.hamcrest</groupId>
89-
<artifactId>hamcrest-library</artifactId>
90-
<version>${org.hamcrest.version}</version>
91-
<scope>test</scope>
92-
</dependency>
93-
94-
<dependency>
95-
<groupId>org.mockito</groupId>
96-
<artifactId>mockito-core</artifactId>
97-
<version>${mockito.version}</version>
98-
<scope>test</scope>
99-
</dependency>
100-
101-
</dependencies>
102-
103-
<build>
104-
<finalName>core-java</finalName>
105-
<resources>
106-
<resource>
107-
<directory>src/main/resources</directory>
108-
<filtering>true</filtering>
109-
</resource>
110-
</resources>
111-
112-
<plugins>
113-
114-
<plugin>
115-
<groupId>org.apache.maven.plugins</groupId>
116-
<artifactId>maven-compiler-plugin</artifactId>
117-
<version>${maven-compiler-plugin.version}</version>
118-
<configuration>
119-
<source>1.7</source>
120-
<target>1.7</target>
121-
</configuration>
122-
</plugin>
123-
124-
<plugin>
125-
<groupId>org.apache.maven.plugins</groupId>
126-
<artifactId>maven-surefire-plugin</artifactId>
127-
<version>${maven-surefire-plugin.version}</version>
128-
</plugin>
129-
130-
</plugins>
131-
132-
</build>
133-
134-
<properties>
135-
<!-- Spring -->
136-
<org.springframework.version>4.0.5.RELEASE</org.springframework.version>
137-
<org.springframework.security.version>3.2.4.RELEASE</org.springframework.security.version>
138-
139-
<!-- persistence -->
140-
<hibernate.version>4.3.5.Final</hibernate.version>
141-
<mysql-connector-java.version>5.1.30</mysql-connector-java.version>
142-
143-
<!-- marshalling -->
144-
<jackson.version>2.3.3</jackson.version>
145-
146-
<!-- logging -->
147-
<org.slf4j.version>1.7.6</org.slf4j.version>
148-
<logback.version>1.1.1</logback.version>
149-
150-
<!-- various -->
151-
<hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
152-
153-
<!-- util -->
154-
<guava.version>17.0</guava.version>
155-
<commons-lang3.version>3.3.2</commons-lang3.version>
156-
157-
<!-- testing -->
158-
<org.hamcrest.version>1.3</org.hamcrest.version>
159-
<junit.version>4.11</junit.version>
160-
<mockito.version>1.9.5</mockito.version>
161-
162-
<httpcore.version>4.3.2</httpcore.version>
163-
<httpclient.version>4.3.3</httpclient.version>
164-
165-
<rest-assured.version>2.3.1</rest-assured.version>
166-
167-
<!-- maven plugins -->
168-
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
169-
<maven-war-plugin.version>2.4</maven-war-plugin.version>
170-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
171-
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
172-
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
173-
174-
</properties>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.baeldung</groupId>
5+
<artifactId>core-java</artifactId>
6+
<version>0.1-SNAPSHOT</version>
7+
8+
<name>core-java</name>
9+
10+
<dependencies>
11+
12+
<!-- utils -->
13+
14+
<dependency>
15+
<groupId>com.google.guava</groupId>
16+
<artifactId>guava</artifactId>
17+
<version>${guava.version}</version>
18+
</dependency>
19+
20+
<dependency>
21+
<groupId>org.apache.commons</groupId>
22+
<artifactId>commons-collections4</artifactId>
23+
<version>4.0</version>
24+
</dependency>
25+
26+
<dependency>
27+
<groupId>commons-io</groupId>
28+
<artifactId>commons-io</artifactId>
29+
<version>2.4</version>
30+
</dependency>
31+
32+
<dependency>
33+
<groupId>org.apache.commons</groupId>
34+
<artifactId>commons-lang3</artifactId>
35+
<version>${commons-lang3.version}</version>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.apache.commons</groupId>
40+
<artifactId>commons-math3</artifactId>
41+
<version>3.3</version>
42+
</dependency>
43+
44+
<!-- web -->
45+
46+
<!-- marshalling -->
47+
48+
<dependency>
49+
<groupId>com.fasterxml.jackson.core</groupId>
50+
<artifactId>jackson-databind</artifactId>
51+
<version>${jackson.version}</version>
52+
</dependency>
53+
54+
<!-- logging -->
55+
56+
<dependency>
57+
<groupId>org.slf4j</groupId>
58+
<artifactId>slf4j-api</artifactId>
59+
<version>${org.slf4j.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>ch.qos.logback</groupId>
63+
<artifactId>logback-classic</artifactId>
64+
<version>${logback.version}</version>
65+
<!-- <scope>runtime</scope> -->
66+
</dependency>
67+
<dependency>
68+
<groupId>org.slf4j</groupId>
69+
<artifactId>jcl-over-slf4j</artifactId>
70+
<version>${org.slf4j.version}</version>
71+
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
72+
</dependency>
73+
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
74+
<groupId>org.slf4j</groupId>
75+
<artifactId>log4j-over-slf4j</artifactId>
76+
<version>${org.slf4j.version}</version>
77+
</dependency>
78+
79+
<!-- test scoped -->
80+
81+
<dependency>
82+
<groupId>junit</groupId>
83+
<artifactId>junit-dep</artifactId>
84+
<version>${junit.version}</version>
85+
<scope>test</scope>
86+
</dependency>
87+
88+
<dependency>
89+
<groupId>org.hamcrest</groupId>
90+
<artifactId>hamcrest-core</artifactId>
91+
<version>${org.hamcrest.version}</version>
92+
<scope>test</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.hamcrest</groupId>
96+
<artifactId>hamcrest-library</artifactId>
97+
<version>${org.hamcrest.version}</version>
98+
<scope>test</scope>
99+
</dependency>
100+
101+
<dependency>
102+
<groupId>org.mockito</groupId>
103+
<artifactId>mockito-core</artifactId>
104+
<version>${mockito.version}</version>
105+
<scope>test</scope>
106+
</dependency>
107+
108+
</dependencies>
109+
110+
<build>
111+
<finalName>core-java</finalName>
112+
<resources>
113+
<resource>
114+
<directory>src/main/resources</directory>
115+
<filtering>true</filtering>
116+
</resource>
117+
</resources>
118+
119+
<plugins>
120+
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-compiler-plugin</artifactId>
124+
<version>${maven-compiler-plugin.version}</version>
125+
<configuration>
126+
<source>1.7</source>
127+
<target>1.7</target>
128+
</configuration>
129+
</plugin>
130+
131+
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133+
<artifactId>maven-surefire-plugin</artifactId>
134+
<version>${maven-surefire-plugin.version}</version>
135+
</plugin>
136+
137+
</plugins>
138+
139+
</build>
140+
141+
<properties>
142+
<!-- Spring -->
143+
<org.springframework.version>4.0.5.RELEASE</org.springframework.version>
144+
<org.springframework.security.version>3.2.4.RELEASE</org.springframework.security.version>
145+
146+
<!-- persistence -->
147+
<hibernate.version>4.3.5.Final</hibernate.version>
148+
<mysql-connector-java.version>5.1.30</mysql-connector-java.version>
149+
150+
<!-- marshalling -->
151+
<jackson.version>2.3.3</jackson.version>
152+
153+
<!-- logging -->
154+
<org.slf4j.version>1.7.6</org.slf4j.version>
155+
<logback.version>1.1.1</logback.version>
156+
157+
<!-- various -->
158+
<hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
159+
160+
<!-- util -->
161+
<guava.version>17.0</guava.version>
162+
<commons-lang3.version>3.3.2</commons-lang3.version>
163+
164+
<!-- testing -->
165+
<org.hamcrest.version>1.3</org.hamcrest.version>
166+
<junit.version>4.11</junit.version>
167+
<mockito.version>1.9.5</mockito.version>
168+
169+
<httpcore.version>4.3.2</httpcore.version>
170+
<httpclient.version>4.3.3</httpclient.version>
171+
172+
<rest-assured.version>2.3.1</rest-assured.version>
173+
174+
<!-- maven plugins -->
175+
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
176+
<maven-war-plugin.version>2.4</maven-war-plugin.version>
177+
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
178+
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
179+
<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
180+
181+
</properties>
175182

176183
</project>

0 commit comments

Comments
 (0)