You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2016/11/08 19:10:48 UTC

commons-io git commit: [IO-516] fixed line endings for source files and ignored line endings for test resources (closes #24)

Repository: commons-io
Updated Branches:
  refs/heads/master 96b43a3d6 -> 46696f44e


[IO-516] fixed line endings for source files and ignored line endings for test resources (closes #24)


Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/46696f44
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/46696f44
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/46696f44

Branch: refs/heads/master
Commit: 46696f44ed3628ff660ef7c12aaed256a4450d87
Parents: 96b43a3
Author: pascalschumacher <pa...@gmx.net>
Authored: Tue Nov 8 20:06:07 2016 +0100
Committer: pascalschumacher <pa...@gmx.net>
Committed: Tue Nov 8 20:09:56 2016 +0100

----------------------------------------------------------------------
 .../commons/io/serialization/package.html       |  48 ++++----
 src/site/xdoc/upgradeto2_3.xml                  | 122 +++++++++----------
 src/test/resources/.gitattributes               |   1 +
 3 files changed, 86 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-io/blob/46696f44/src/main/java/org/apache/commons/io/serialization/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/serialization/package.html b/src/main/java/org/apache/commons/io/serialization/package.html
index 271802e..89f3b40 100644
--- a/src/main/java/org/apache/commons/io/serialization/package.html
+++ b/src/main/java/org/apache/commons/io/serialization/package.html
@@ -1,24 +1,24 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<html>
-<body>
-<p>
-This package provides a framework for controlling the deserialization of classes.
-</p>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html>
+<body>
+<p>
+This package provides a framework for controlling the deserialization of classes.
+</p>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/commons-io/blob/46696f44/src/site/xdoc/upgradeto2_3.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/upgradeto2_3.xml b/src/site/xdoc/upgradeto2_3.xml
index 56a4948..667ae44 100644
--- a/src/site/xdoc/upgradeto2_3.xml
+++ b/src/site/xdoc/upgradeto2_3.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<document>
- <properties>
-  <title>Upgrade from 2.2 to 2.3</title>
-  <author email="dev@commons.apache.org">Commons Documentation Team</author>
- </properties>
-<body>
-
-<section name="Upgrade">
-<p>
-These are the release notes and advice for upgrading Commons-IO from
-version 2.2 to version 2.3
-<source>
-Commons IO is a package of Java utility classes like java.io.  
-Classes in this package are considered to be so standard and of such high 
-reuse as to justify existence in java.io.
-
-The Commons IO library contains utility classes, stream implementations, file filters, 
-file comparators, endian transformation classes, and much more.
-
-==============================================================================
-Apache Commons IO Version 2.3-SNAPSHOT
-==============================================================================
-
-Changes in this version include:
-
-New features:
-o IO-322:  Add and use class Charsets. Thanks to ggregory. 
-o IO-321:  ByteOrderMark UTF_32LE is incorrect. Thanks to ggregory. 
-o IO-318:  Add Charset sister APIs to method that take a String charset name. Thanks to ggregory. 
-
-Compatibility with 2.2 and 1.4:
-Binary compatible: Yes.
-Source compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
-Semantic compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
-
-Commons IO 2.3 requires JDK 1.6 or later.
-Commons IO 2.2 requires JDK 1.5 or later.
-Commons IO 1.4 requires JDK 1.3 or later.
-</source>
-</p>
-</section>
-
-</body>
-</document>
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<document>
+ <properties>
+  <title>Upgrade from 2.2 to 2.3</title>
+  <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+
+<section name="Upgrade">
+<p>
+These are the release notes and advice for upgrading Commons-IO from
+version 2.2 to version 2.3
+<source>
+Commons IO is a package of Java utility classes like java.io.  
+Classes in this package are considered to be so standard and of such high 
+reuse as to justify existence in java.io.
+
+The Commons IO library contains utility classes, stream implementations, file filters, 
+file comparators, endian transformation classes, and much more.
+
+==============================================================================
+Apache Commons IO Version 2.3-SNAPSHOT
+==============================================================================
+
+Changes in this version include:
+
+New features:
+o IO-322:  Add and use class Charsets. Thanks to ggregory. 
+o IO-321:  ByteOrderMark UTF_32LE is incorrect. Thanks to ggregory. 
+o IO-318:  Add Charset sister APIs to method that take a String charset name. Thanks to ggregory. 
+
+Compatibility with 2.2 and 1.4:
+Binary compatible: Yes.
+Source compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
+Semantic compatible: No, see the rare case in https://issues.apache.org/jira/browse/IO-318.
+
+Commons IO 2.3 requires JDK 1.6 or later.
+Commons IO 2.2 requires JDK 1.5 or later.
+Commons IO 1.4 requires JDK 1.3 or later.
+</source>
+</p>
+</section>
+
+</body>
+</document>

http://git-wip-us.apache.org/repos/asf/commons-io/blob/46696f44/src/test/resources/.gitattributes
----------------------------------------------------------------------
diff --git a/src/test/resources/.gitattributes b/src/test/resources/.gitattributes
new file mode 100644
index 0000000..e455e8c
--- /dev/null
+++ b/src/test/resources/.gitattributes
@@ -0,0 +1 @@
+*        -text