You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2016/07/05 20:43:01 UTC
[1/2] orc git commit: Preparing for making a 1.1.2 release candidate.
Repository: orc
Updated Branches:
refs/heads/branch-1.1 f9bd59444 -> 1b5544f7e
Preparing for making a 1.1.2 release candidate.
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/98fc5627
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/98fc5627
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/98fc5627
Branch: refs/heads/branch-1.1
Commit: 98fc5627508612f405f0f69dd719787b2f127b56
Parents: f9bd594
Author: Owen O'Malley <om...@apache.org>
Authored: Fri Jul 1 11:12:57 2016 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Fri Jul 1 11:12:57 2016 -0700
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
java/core/pom.xml | 2 +-
java/mapreduce/pom.xml | 4 ++--
java/pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/98fc5627/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f87974..863486a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ project(ORC)
# Version number of package
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "2-SNAPSHOT")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
SET(ORC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
option (BUILD_JAVA
http://git-wip-us.apache.org/repos/asf/orc/blob/98fc5627/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 4a84d90..1dd8476 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.orc</groupId>
<artifactId>orc</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/orc/blob/98fc5627/java/mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/java/mapreduce/pom.xml b/java/mapreduce/pom.xml
index a4a3e9c..c5417d9 100644
--- a/java/mapreduce/pom.xml
+++ b/java/mapreduce/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.orc</groupId>
<artifactId>orc</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.2</version>
</dependency>
<!-- inter-project -->
http://git-wip-us.apache.org/repos/asf/orc/blob/98fc5627/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index e0853f8..6f063da 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.orc</groupId>
<artifactId>orc</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.2</version>
<packaging>pom</packaging>
<name>Apache ORC</name>
[2/2] orc git commit: ORC-78. Add missing license headers. (omalley)
Posted by om...@apache.org.
ORC-78. Add missing license headers. (omalley)
Signed-off-by: Owen O'Malley <om...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/1b5544f7
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/1b5544f7
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/1b5544f7
Branch: refs/heads/branch-1.1
Commit: 1b5544f7eb1d046e3d59449c3de3a608453f41d5
Parents: 98fc562
Author: Owen O'Malley <om...@apache.org>
Authored: Tue Jul 5 13:41:28 2016 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Tue Jul 5 13:41:28 2016 -0700
----------------------------------------------------------------------
c++/Doxyfile | 12 ++++++++++++
java/core/src/test/resources/log4j.properties | 12 ++++++++++++
java/mapreduce/src/test/resources/log4j.properties | 12 ++++++++++++
3 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/1b5544f7/c++/Doxyfile
----------------------------------------------------------------------
diff --git a/c++/Doxyfile b/c++/Doxyfile
index 39fc4f7..3d8ea4d 100644
--- a/c++/Doxyfile
+++ b/c++/Doxyfile
@@ -1,3 +1,15 @@
+# Licensed 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.
+
# Doxyfile 1.8.7
# This file describes the settings to be used by the documentation system
http://git-wip-us.apache.org/repos/asf/orc/blob/1b5544f7/java/core/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/java/core/src/test/resources/log4j.properties b/java/core/src/test/resources/log4j.properties
index d5e89c3..d2c063d 100644
--- a/java/core/src/test/resources/log4j.properties
+++ b/java/core/src/test/resources/log4j.properties
@@ -1,3 +1,15 @@
+# Licensed 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.
+
log4j.rootLogger=WARN,stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
http://git-wip-us.apache.org/repos/asf/orc/blob/1b5544f7/java/mapreduce/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/java/mapreduce/src/test/resources/log4j.properties b/java/mapreduce/src/test/resources/log4j.properties
index d5e89c3..d2c063d 100644
--- a/java/mapreduce/src/test/resources/log4j.properties
+++ b/java/mapreduce/src/test/resources/log4j.properties
@@ -1,3 +1,15 @@
+# Licensed 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.
+
log4j.rootLogger=WARN,stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender