Skip to content

Commit 05d35d7

Browse files
hazendazhazendaz
authored
Merge pull request #832 from hazendaz/master
Correct dtd's, some were still using ibatis 3
2 parents 8197ee9 + 463f293 commit 05d35d7

File tree

8 files changed

+17
-28
lines changed

8 files changed

+17
-28
lines changed

‎src/test/resources/mybatis-config.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE configuration
20-
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
21-
"http://mybatis.org/dtd/mybatis-3-config.dtd">
19+
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
20+
2221
<configuration>
2322

2423
<settings>

‎src/test/resources/mybatis-package-config.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE configuration
20-
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
21-
"http://mybatis.org/dtd/mybatis-3-config.dtd">
19+
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
2220

2321
<configuration>
2422

‎src/test/resources/org/mybatis/guice/ContactMapper.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE mapper PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" "http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
19+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
2020

2121
<mapper namespace="org.mybatis.guice.ContactMapper">
2222

‎src/test/resources/org/mybatis/guice/configuration/ErrorMapper.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE mapper PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" "http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
19+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
2020

2121
<mapper namespace="org.mybatis.guice.configuration.ErrorMapper">
2222

‎src/test/resources/org/mybatis/guice/objectfactory/objectfactory.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE configuration
20-
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
21-
"http://mybatis.org/dtd/mybatis-3-config.dtd">
19+
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
2220

2321
<configuration>
2422

‎src/test/resources/org/mybatis/guice/objectfactory/objectwrapperfactory.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE configuration
20-
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
21-
"http://mybatis.org/dtd/mybatis-3-config.dtd">
19+
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
2220

2321
<configuration>
2422

‎src/test/resources/org/mybatis/guice/sample/mapper/UserMapper.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE mapper
20-
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
21-
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
19+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
2220

2321
<mapper namespace="org.mybatis.guice.sample.mapper.UserMapper">
2422

‎src/test/resources/org/mybatis/guice/sample/mybatis-config.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<!DOCTYPE configuration
20-
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
21-
"http://mybatis.org/dtd/mybatis-3-config.dtd">
19+
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
2220

2321
<configuration>
2422

0 commit comments

Comments
 (0)