Skip to content

Commit 634b921

Browse files
emacarronemacarron
committed
Merge pull request #317 from hazendaz/master
Update logging and unit test dependencies.
2 parents 299e263 + 4788925 commit 634b921

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/*.ipr
33
/*.iws
44
/.classpath
5+
/.factorypath
56
/.idea
67
/.project
78
/.settings

‎pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@
157157
<dependency>
158158
<groupId>org.slf4j</groupId>
159159
<artifactId>slf4j-api</artifactId>
160-
<version>1.7.7</version>
160+
<version>1.7.9</version>
161161
<optional>true</optional>
162162
</dependency>
163163
<dependency>
164164
<groupId>org.slf4j</groupId>
165165
<artifactId>slf4j-log4j12</artifactId>
166-
<version>1.7.7</version>
166+
<version>1.7.9</version>
167167
<optional>true</optional>
168168
</dependency>
169169
<dependency>
@@ -195,7 +195,7 @@
195195
<dependency>
196196
<groupId>junit</groupId>
197197
<artifactId>junit</artifactId>
198-
<version>4.11</version>
198+
<version>4.12</version>
199199
<scope>test</scope>
200200
</dependency>
201201
<dependency>
@@ -213,7 +213,7 @@
213213
<dependency>
214214
<groupId>org.mockito</groupId>
215215
<artifactId>mockito-core</artifactId>
216-
<version>1.10.8</version>
216+
<version>1.10.17</version>
217217
<scope>test</scope>
218218
</dependency>
219219
<dependency>
@@ -395,5 +395,4 @@
395395
</plugins>
396396
</pluginManagement>
397397
</build>
398-
399398
</project>

‎src/site/pdf.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
limitations under the License.
1616
-->
1717
<!-- version: $Id$ -->
18-
<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
18+
<document xmlns="http://maven.apache.org/DOCUMENT/1.6.0"
1919
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 http://maven.apache.org/xsd/document-1.0.1.xsd"
20+
xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.6.0 http://maven.apache.org/xsd/document-1.6.0.xsd"
2121
outputName="${project.artifactId}-${project.version}">
2222

2323
<meta>

‎src/site/site.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
limitations under the License.
1616
-->
1717
<!-- version: $Id$ -->
18-
<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
18+
<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
2020

2121
<body>
2222
<menu name="Reference Documentation">

‎src/site/site_es.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<!-- version: $Id$ -->
1919

20-
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
20+
<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
2222
name="MyBatis">
2323

2424
<body>

‎src/site/site_fr.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
17+
<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
1919
name="MyBatis">
2020

2121
<body>

‎src/site/site_ja.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<!-- version: $Id$ -->
1919

20-
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
20+
<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
2222
name="MyBatis">
2323

2424
<body>

‎src/site/site_ko.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<!-- version: $Id$ -->
1919

20-
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
20+
<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
2222
name="MyBatis">
2323

2424
<body>

‎src/site/site_zh.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
limitations under the License.
1616
-->
1717
<!-- version: $Id$ -->
18-
<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
18+
<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
2020

2121
<body>
2222
<menu name="参考文档">

0 commit comments

Comments
 (0)