DRILL-221, part 3. More license updates. Automatically run Rat plugin with appropriate excludes. Move Synth-log to sandbox until it is part of main mvn build to avoid weird RAT problems.
diff --git a/LICENSE b/LICENSE
index f3a6a10..5234110 100644
--- a/LICENSE
+++ b/LICENSE
@@ -290,6 +290,23 @@
The Apache License, Version 2.0
+For
+ Netty/BufferL Little Endian fork of Netty buffers implementation
+
+ Copyright 2012 The Netty Project
+
+ The Netty Project 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.
+
For
AntLR Parser Generator
ANTLR StringTemplate
diff --git a/NOTICE b/NOTICE
index 4a98a67..4984ac0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,5 +3,7 @@
Copyright 2013 The Apache Software Foundation
==============================================================
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+Please see LICENSE for additional copyright and licensing information.
diff --git a/common/pom.xml b/common/pom.xml
index d801aa8..99d37e7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
diff --git a/common/src/main/protobuf/Types.proto b/common/src/main/protobuf/Types.proto
index 067072a..3434110 100644
--- a/common/src/main/protobuf/Types.proto
+++ b/common/src/main/protobuf/Types.proto
@@ -1,3 +1,19 @@
+// 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.
+
package common;
option java_package = "org.apache.drill.common.types";
diff --git a/common/src/main/resources/drill-default.conf b/common/src/main/resources/drill-default.conf
index 760a6d2..a7261c0 100644
--- a/common/src/main/resources/drill-default.conf
+++ b/common/src/main/resources/drill-default.conf
@@ -1,3 +1,19 @@
+// 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.
+
drill: {
logical: {
operator.packages: ["org.apache.drill.common.logical.data"],
diff --git a/common/src/main/resources/drill-module.conf b/common/src/main/resources/drill-module.conf
index 2b265ea..b81ec6f 100644
--- a/common/src/main/resources/drill-module.conf
+++ b/common/src/main/resources/drill-module.conf
@@ -1,4 +1,20 @@
+// 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.
+
// This file tells Drill to consider this module when class path scanning.
// This file can also include any supplementary configuration information.
// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
-drill.exec.storage.packages += org.apache.drill.exec.store.mock
\ No newline at end of file
+drill.exec.storage.packages += org.apache.drill.exec.store.mock
diff --git a/common/src/test/resources/drill-module.conf b/common/src/test/resources/drill-module.conf
index 0e2c84e..55e499d 100644
--- a/common/src/test/resources/drill-module.conf
+++ b/common/src/test/resources/drill-module.conf
@@ -1 +1,17 @@
+// 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.
+
drill.logical.storage.packages += "org.apache.drill.storage"
diff --git a/common/src/test/resources/logback.xml b/common/src/test/resources/logback.xml
index b79b811..782f17f 100644
--- a/common/src/test/resources/logback.xml
+++ b/common/src/test/resources/logback.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 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. -->
<configuration>
<appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
@@ -42,4 +52,4 @@
<!-- <appender-ref ref="FILE" /> -->
</root>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 3a9fb20..8eaa664 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.contrib</groupId>
diff --git a/contrib/sqlline/pom.xml b/contrib/sqlline/pom.xml
index 060df14..4555551 100644
--- a/contrib/sqlline/pom.xml
+++ b/contrib/sqlline/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<artifactId>sqlline</artifactId>
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index 9a538ef..3374e9c 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>contrib-parent</artifactId>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<artifactId>storage-hbase</artifactId>
diff --git a/contrib/synth-log/src/main/resources/log4j.properties b/contrib/synth-log/src/main/resources/log4j.properties
deleted file mode 100644
index 972574a..0000000
--- a/contrib/synth-log/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=DEBUG, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-log4j.logger.org.apache=off
diff --git a/distribution/pom.xml b/distribution/pom.xml
index b855e90..972e202 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill</groupId>
@@ -72,6 +72,20 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludes>
+ <exclude>**/conffiles</exclude>
+ <exclude>**/control</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/hadoop-excludes.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index fe76c67..45fd1cc 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -1,3 +1,20 @@
+<?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.
+-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/distribution/src/deb/control/conffiles b/distribution/src/deb/control/conffiles
index a9d1fda..1a297aa 100644
--- a/distribution/src/deb/control/conffiles
+++ b/distribution/src/deb/control/conffiles
@@ -1,3 +1,18 @@
+# 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.
+
/etc/drill/conf/drill-override.conf
/etc/drill/conf/logback.xml
-/etc/drill/conf/drill-env.sh
\ No newline at end of file
+/etc/drill/conf/drill-env.sh
diff --git a/distribution/src/resources/logback.xml b/distribution/src/resources/logback.xml
index feb75b3..3ee676b 100644
--- a/distribution/src/resources/logback.xml
+++ b/distribution/src/resources/logback.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 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. -->
<configuration>
<appender name="SOCKET"
class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
diff --git a/exec/bufferl/pom.xml b/exec/bufferl/pom.xml
index d52cae9..610a723 100644
--- a/exec/bufferl/pom.xml
+++ b/exec/bufferl/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.drill.exec</groupId>
<artifactId>exec-parent</artifactId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.exec</groupId>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 1c5af4b..d912ca9 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<artifactId>java-exec</artifactId>
<name>exec/Java Execution Engine</name>
diff --git a/exec/java-exec/src/main/codegen/config.fmpp b/exec/java-exec/src/main/codegen/config.fmpp
index ea27863..cd2b2cc 100644
--- a/exec/java-exec/src/main/codegen/config.fmpp
+++ b/exec/java-exec/src/main/codegen/config.fmpp
@@ -1,3 +1,19 @@
+# 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.
+
data: {
vv: tdd(../data/ValueVectorTypes.tdd),
compare: tdd(../data/CompareTypes.tdd),
diff --git a/exec/java-exec/src/main/codegen/data/Casts.tdd b/exec/java-exec/src/main/codegen/data/Casts.tdd
index c6ee258..760b0f9 100644
--- a/exec/java-exec/src/main/codegen/data/Casts.tdd
+++ b/exec/java-exec/src/main/codegen/data/Casts.tdd
@@ -1,3 +1,19 @@
+# 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.
+
{
types: [
{from: "Int", to: "BigInt"},
@@ -14,4 +30,4 @@
{to: "BigInt", from: "Float8" , explicit: "long"}
]
-}
\ No newline at end of file
+}
diff --git a/exec/java-exec/src/main/codegen/data/CompareTypes.tdd b/exec/java-exec/src/main/codegen/data/CompareTypes.tdd
index 9c26a3f..f384d52 100644
--- a/exec/java-exec/src/main/codegen/data/CompareTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/CompareTypes.tdd
@@ -1,6 +1,21 @@
+# 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.
{
types: [
{comparables: ["Float4", "Float8", "Int", "BigInt", "NullableFloat4", "NullableFloat8", "NullableInt", "NullableBigInt"], mode: "fixed"},
{comparables: ["VarChar", "VarBinary", "NullableVarChar", "NullableVarBinary"], mode: "var"}
]
-}
\ No newline at end of file
+}
diff --git a/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd b/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd
index d201671..88a5974 100644
--- a/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/ValueVectorTypes.tdd
@@ -1,3 +1,19 @@
+# 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.
+
{
modes: [
{name: "Optional", prefix: "Nullable"},
diff --git a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl
index 2029280..3e5a156 100644
--- a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl
+++ b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl
@@ -1,3 +1,14 @@
+<#-- 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. -->
+
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
diff --git a/exec/java-exec/src/main/resources/logback.xml b/exec/java-exec/src/main/resources/logback.xml
index feb75b3..35f0260 100644
--- a/exec/java-exec/src/main/resources/logback.xml
+++ b/exec/java-exec/src/main/resources/logback.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
<configuration>
<appender name="SOCKET"
class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
diff --git a/exec/java-exec/src/main/sh/runbit b/exec/java-exec/src/main/sh/runbit
index 4e1b599..4c4aa21 100755
--- a/exec/java-exec/src/main/sh/runbit
+++ b/exec/java-exec/src/main/sh/runbit
@@ -1,5 +1,19 @@
#!/bin/bash
+# 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.
if [ -z $JAVA_HOME ]
then
diff --git a/exec/java-exec/src/test/resources/logback.xml b/exec/java-exec/src/test/resources/logback.xml
index 206a469..dd32405 100644
--- a/exec/java-exec/src/test/resources/logback.xml
+++ b/exec/java-exec/src/test/resources/logback.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
<configuration>
<appender name="SOCKET"
class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
@@ -25,4 +41,4 @@
<appender-ref ref="STDOUT" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/exec/java-exec/src/test/sh/logback.xml b/exec/java-exec/src/test/sh/logback.xml
index 6f2928a..ec7ea44 100644
--- a/exec/java-exec/src/test/sh/logback.xml
+++ b/exec/java-exec/src/test/sh/logback.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
<configuration>
<appender name="SOCKET"
class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
diff --git a/exec/java-exec/src/test/sh/runbit b/exec/java-exec/src/test/sh/runbit
index 8a54006..7e4e73b 100755
--- a/exec/java-exec/src/test/sh/runbit
+++ b/exec/java-exec/src/test/sh/runbit
@@ -1,5 +1,20 @@
#!/bin/bash
+# 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.
+
PROJECT_ROOT=../../../
mvn dependency:build-classpath -f=$PROJECT_ROOT/pom.xml -Dmdep.outputFile=target/sh/cp.txt
diff --git a/exec/pom.xml b/exec/pom.xml
index f0601dc..3859fb0 100644
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.drill.exec</groupId>
diff --git a/exec/ref/pom.xml b/exec/ref/pom.xml
index c7f74e0..1a4c809 100644
--- a/exec/ref/pom.xml
+++ b/exec/ref/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<artifactId>ref</artifactId>
diff --git a/exec/ref/src/main/resources/logback-test.xml b/exec/ref/src/main/resources/logback-test.xml
index 9a53c12..3d970a1 100644
--- a/exec/ref/src/main/resources/logback-test.xml
+++ b/exec/ref/src/main/resources/logback-test.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 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. -->
<configuration>
<appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
@@ -30,4 +40,4 @@
</root>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/exec/ref/src/test/resources/logback.xml b/exec/ref/src/test/resources/logback.xml
index 10547b2..39bb0c8 100644
--- a/exec/ref/src/test/resources/logback.xml
+++ b/exec/ref/src/test/resources/logback.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 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. -->
<configuration>
<appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
@@ -43,4 +53,4 @@
<appender-ref ref="FILE" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/pom.xml b/pom.xml
index 30bffd0..e055bbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
+<!-- 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. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +21,7 @@
<groupId>org.apache.drill</groupId>
<artifactId>drill-root</artifactId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Drill Root POM</name>
@@ -96,6 +90,34 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rat-checks</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
+ <excludeSubprojects>false</excludeSubprojects>
+ <excludes>
+ <exclude>**/*.md</exclude>
+ <exclude>sandbox/**</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/drill-*.conf</exclude>
+ <exclude>**/.buildpath</exclude>
+ <exclude>**/*.proto</exclude>
+ <exclude>**/*.fmpp</exclude>
+ <exclude>**/*.tdd</exclude>
+
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -183,6 +205,11 @@
<plugins>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
@@ -215,15 +242,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
- <configuration>
- <property>rat.excludeSubprojects</property>
- </configuration>
- </plugin>
-
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
diff --git a/contrib/synth-log/README.md b/sandbox/synth-log/README.md
similarity index 100%
rename from contrib/synth-log/README.md
rename to sandbox/synth-log/README.md
diff --git a/contrib/synth-log/pom.xml b/sandbox/synth-log/pom.xml
similarity index 100%
rename from contrib/synth-log/pom.xml
rename to sandbox/synth-log/pom.xml
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/ChineseRestaurant.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/ChineseRestaurant.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/ChineseRestaurant.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/ChineseRestaurant.java
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/LogGenerator.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/LogGenerator.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/LogGenerator.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/LogGenerator.java
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/LogLine.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/LogLine.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/LogLine.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/LogLine.java
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/LongTail.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/LongTail.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/LongTail.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/LongTail.java
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/Main.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/Main.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/Main.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/Main.java
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/TermGenerator.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/TermGenerator.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/TermGenerator.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/TermGenerator.java
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/User.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/User.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/User.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/User.java
diff --git a/contrib/synth-log/src/main/java/org/apache/drill/synth/WordGenerator.java b/sandbox/synth-log/src/main/java/org/apache/drill/synth/WordGenerator.java
similarity index 100%
rename from contrib/synth-log/src/main/java/org/apache/drill/synth/WordGenerator.java
rename to sandbox/synth-log/src/main/java/org/apache/drill/synth/WordGenerator.java
diff --git a/contrib/synth-log/src/main/resources/geo-codes b/sandbox/synth-log/src/main/resources/geo-codes
similarity index 100%
rename from contrib/synth-log/src/main/resources/geo-codes
rename to sandbox/synth-log/src/main/resources/geo-codes
diff --git a/sandbox/synth-log/src/main/resources/log4j.properties b/sandbox/synth-log/src/main/resources/log4j.properties
new file mode 100644
index 0000000..b445615
--- /dev/null
+++ b/sandbox/synth-log/src/main/resources/log4j.properties
@@ -0,0 +1,27 @@
+# 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.
+
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=DEBUG, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+
+log4j.logger.org.apache=off
diff --git a/contrib/synth-log/src/main/resources/other-words b/sandbox/synth-log/src/main/resources/other-words
similarity index 100%
rename from contrib/synth-log/src/main/resources/other-words
rename to sandbox/synth-log/src/main/resources/other-words
diff --git a/contrib/synth-log/src/main/resources/word-frequency-seed b/sandbox/synth-log/src/main/resources/word-frequency-seed
similarity index 100%
rename from contrib/synth-log/src/main/resources/word-frequency-seed
rename to sandbox/synth-log/src/main/resources/word-frequency-seed
diff --git a/contrib/synth-log/src/test/java/org/apache/drill/synth/LogGeneratorTest.java b/sandbox/synth-log/src/test/java/org/apache/drill/synth/LogGeneratorTest.java
similarity index 100%
rename from contrib/synth-log/src/test/java/org/apache/drill/synth/LogGeneratorTest.java
rename to sandbox/synth-log/src/test/java/org/apache/drill/synth/LogGeneratorTest.java
diff --git a/contrib/synth-log/src/test/java/org/apache/drill/synth/TermGeneratorTest.java b/sandbox/synth-log/src/test/java/org/apache/drill/synth/TermGeneratorTest.java
similarity index 100%
rename from contrib/synth-log/src/test/java/org/apache/drill/synth/TermGeneratorTest.java
rename to sandbox/synth-log/src/test/java/org/apache/drill/synth/TermGeneratorTest.java
diff --git a/contrib/synth-log/src/test/java/org/apache/drill/synth/WordGeneratorTest.java b/sandbox/synth-log/src/test/java/org/apache/drill/synth/WordGeneratorTest.java
similarity index 100%
rename from contrib/synth-log/src/test/java/org/apache/drill/synth/WordGeneratorTest.java
rename to sandbox/synth-log/src/test/java/org/apache/drill/synth/WordGeneratorTest.java
diff --git a/sandbox/web-frontend/drill.js b/sandbox/web-frontend/drill.js
index 598ac39..bbc1b9d 100644
--- a/sandbox/web-frontend/drill.js
+++ b/sandbox/web-frontend/drill.js
@@ -1,18 +1,20 @@
-//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.
+/**
+ * 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.
+ */
// Drill frontend settings
var MAX_PROJECTS = 100;
diff --git a/sqlparser/pom.xml b/sqlparser/pom.xml
index bdde6f4..db14848 100644
--- a/sqlparser/pom.xml
+++ b/sqlparser/pom.xml
@@ -1,20 +1,14 @@
<?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.
--->
+<!-- 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. -->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -22,7 +16,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1-incubating-SNAPSHOT</version>
</parent>
<artifactId>sqlparser</artifactId>
<name>SQL Parser</name>
@@ -96,6 +90,23 @@
<version>2.7.1</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludes>
+ <exclude>**/.buildpath</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/donuts-output-data.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>default-hadoop</id>
diff --git a/sqlparser/src/test/resources/logback.xml b/sqlparser/src/test/resources/logback.xml
index ff9e2ca..13808a6 100644
--- a/sqlparser/src/test/resources/logback.xml
+++ b/sqlparser/src/test/resources/logback.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
<configuration>
<appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
