Skip to content

Commit 46696f4

Browse files
PascalSchumacherPascalSchumacher
committed
[IO-516] fixed line endings for source files and ignored line endings for test resources (closes #24)
1 parent 96b43a3 commit 46696f4

3 files changed

Lines changed: 86 additions & 85 deletions

File tree

‎src/main/java/org/apache/commons/io/serialization/package.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
18-
<html>
19-
<body>
20-
<p>
21-
This package provides a framework for controlling the deserialization of classes.
22-
</p>
23-
</body>
24-
</html>
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<html>
19+
<body>
20+
<p>
21+
This package provides a framework for controlling the deserialization of classes.
22+
</p>
23+
</body>
24+
</html>

‎src/site/xdoc/upgradeto2_3.xml‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
<?xml version="1.0"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
18-
<document>
19-
<properties>
20-
<title>Upgrade from 2.2 to 2.3</title>
21-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
22-
</properties>
23-
<body>
24-
25-
<section name="Upgrade">
26-
<p>
27-
These are the release notes and advice for upgrading Commons-IO from
28-
version 2.2 to version 2.3
29-
<source>
30-
Commons IO is a package of Java utility classes like java.io.
31-
Classes in this package are considered to be so standard and of such high
32-
reuse as to justify existence in java.io.
33-
34-
The Commons IO library contains utility classes, stream implementations, file filters,
35-
file comparators, endian transformation classes, and much more.
36-
37-
==============================================================================
38-
Apache Commons IO Version 2.3-SNAPSHOT
39-
==============================================================================
40-
41-
Changes in this version include:
42-
43-
New features:
44-
o IO-322: Add and use class Charsets. Thanks to ggregory.
45-
o IO-321: ByteOrderMark UTF_32LE is incorrect. Thanks to ggregory.
46-
o IO-318: Add Charset sister APIs to method that take a String charset name. Thanks to ggregory.
47-
48-
Compatibility with 2.2 and 1.4:
49-
Binary compatible: Yes.
50-
Source compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
51-
Semantic compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
52-
53-
Commons IO 2.3 requires JDK 1.6 or later.
54-
Commons IO 2.2 requires JDK 1.5 or later.
55-
Commons IO 1.4 requires JDK 1.3 or later.
56-
</source>
57-
</p>
58-
</section>
59-
60-
</body>
61-
</document>
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<document>
19+
<properties>
20+
<title>Upgrade from 2.2 to 2.3</title>
21+
<author email="dev@commons.apache.org">Commons Documentation Team</author>
22+
</properties>
23+
<body>
24+
25+
<section name="Upgrade">
26+
<p>
27+
These are the release notes and advice for upgrading Commons-IO from
28+
version 2.2 to version 2.3
29+
<source>
30+
Commons IO is a package of Java utility classes like java.io.
31+
Classes in this package are considered to be so standard and of such high
32+
reuse as to justify existence in java.io.
33+
34+
The Commons IO library contains utility classes, stream implementations, file filters,
35+
file comparators, endian transformation classes, and much more.
36+
37+
==============================================================================
38+
Apache Commons IO Version 2.3-SNAPSHOT
39+
==============================================================================
40+
41+
Changes in this version include:
42+
43+
New features:
44+
o IO-322: Add and use class Charsets. Thanks to ggregory.
45+
o IO-321: ByteOrderMark UTF_32LE is incorrect. Thanks to ggregory.
46+
o IO-318: Add Charset sister APIs to method that take a String charset name. Thanks to ggregory.
47+
48+
Compatibility with 2.2 and 1.4:
49+
Binary compatible: Yes.
50+
Source compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
51+
Semantic compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
52+
53+
Commons IO 2.3 requires JDK 1.6 or later.
54+
Commons IO 2.2 requires JDK 1.5 or later.
55+
Commons IO 1.4 requires JDK 1.3 or later.
56+
</source>
57+
</p>
58+
</section>
59+
60+
</body>
61+
</document>

‎src/test/resources/.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* -text

0 commit comments

Comments
 (0)