fixes in format in pom and licence in hadoop conf files
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d9e6f5dd Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d9e6f5dd Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d9e6f5dd Branch: refs/heads/steven/hdfs Commit: d9e6f5ddbce36d15e7bbc77fc1419c797522c4e9 Parents: 5d7d737 Author: efikalti <[email protected]> Authored: Thu Aug 20 18:52:51 2015 +0300 Committer: efikalti <[email protected]> Committed: Thu Aug 20 18:52:51 2015 +0300 ---------------------------------------------------------------------- vxquery-cli/pom.xml | 16 +++++------ vxquery-core/pom.xml | 1 - .../test/resources/hadoop/conf/core-site.xml | 28 +++++++++++--------- .../test/resources/hadoop/conf/hdfs-site.xml | 28 +++++++++++--------- .../test/resources/hadoop/conf/mapred-site.xml | 28 +++++++++++--------- 5 files changed, 53 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/d9e6f5dd/vxquery-cli/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml index 9cc3380..82b9b72 100644 --- a/vxquery-cli/pom.xml +++ b/vxquery-cli/pom.xml @@ -127,14 +127,14 @@ <artifactId>hyracks-dataflow-std</artifactId> </dependency> - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>hyracks-hdfs-core</artifactId> - </dependency> - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>hyracks-hdfs-2.x</artifactId> - </dependency> + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-hdfs-core</artifactId> + </dependency> + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/vxquery/blob/d9e6f5dd/vxquery-core/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml index 3e08a45..3c409c8 100644 --- a/vxquery-core/pom.xml +++ b/vxquery-core/pom.xml @@ -284,7 +284,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>2.7.0</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/vxquery/blob/d9e6f5dd/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml b/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml index 7684250..b1f576c 100644 --- a/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml +++ b/vxquery-xtest/src/test/resources/hadoop/conf/core-site.xml @@ -1,18 +1,20 @@ <?xml version="1.0"?> <!-- - ! Copyright 2009-2013 by The Regents of the University of California - ! 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 from - ! - ! 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. - !--> + 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. +--> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- Put site-specific property overrides in this file. --> http://git-wip-us.apache.org/repos/asf/vxquery/blob/d9e6f5dd/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml b/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml index 4f3f777..6b6604d 100644 --- a/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml +++ b/vxquery-xtest/src/test/resources/hadoop/conf/hdfs-site.xml @@ -1,18 +1,20 @@ <?xml version="1.0"?> <!-- - ! Copyright 2009-2013 by The Regents of the University of California - ! 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 from - ! - ! 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. - !--> + 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. +--> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- Put site-specific property overrides in this file. --> http://git-wip-us.apache.org/repos/asf/vxquery/blob/d9e6f5dd/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml b/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml index ab3b7c3..e15ec74 100644 --- a/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml +++ b/vxquery-xtest/src/test/resources/hadoop/conf/mapred-site.xml @@ -1,18 +1,20 @@ <?xml version="1.0"?> <!-- - ! Copyright 2009-2013 by The Regents of the University of California - ! 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 from - ! - ! 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. - !--> + 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. +--> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- Put site-specific property overrides in this file. -->
