updated copyrights and fixed minor issue with hadoop classpath (#1896)

rfecher · web-flow · commit f0ae2ed53d66 · 2022-05-26T19:51:37.000-04:00
diff --git a/deploy/packaging/docker/build-args-matrix.sh.example b/deploy/packaging/docker/build-args-matrix.sh.example
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/docker/build-rpm/deploy-geowave-to-hdfs.sh.template b/deploy/packaging/docker/build-rpm/deploy-geowave-to-hdfs.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/bootstrap-geowave.sh.template b/deploy/packaging/emr/template/bootstrap-geowave.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/bootstrap-zeppelin.sh.template b/deploy/packaging/emr/template/bootstrap-zeppelin.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/configure-zeppelin.sh.template b/deploy/packaging/emr/template/configure-zeppelin.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/geowave-install-lib.sh.template b/deploy/packaging/emr/template/geowave-install-lib.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/jupyter/bootstrap-jupyter.sh.template b/deploy/packaging/emr/template/jupyter/bootstrap-jupyter.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/jupyter/bootstrap-jupyterhub.sh.template b/deploy/packaging/emr/template/jupyter/bootstrap-jupyterhub.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/jupyter/create-configure-kernel.sh.template b/deploy/packaging/emr/template/jupyter/create-configure-kernel.sh.template
@@ -1,6 +1,6 @@
 
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/quickstart/geowave-env.sh.template b/deploy/packaging/emr/template/quickstart/geowave-env.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/emr/template/quickstart/ingest-and-kde-gdelt.sh.template b/deploy/packaging/emr/template/quickstart/ingest-and-kde-gdelt.sh.template
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
 # 
 # See the NOTICE file distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/deploy/packaging/rpm/centos/7/SOURCES/geowave-tools.sh b/deploy/packaging/rpm/centos/7/SOURCES/geowave-tools.sh
@@ -40,7 +40,7 @@ if [ -n "${HADOOP_HOME}" ] && [ -d "${HADOOP_HOME}" ]; then
      HADOOP_CLASSPATH=""
      for i in $(echo $CLASSPATH | sed "s/:/ /g")
      do
-       if [[ "$i" != *log4j-slf4j-impl*.jar && "$i" != *slf4j-log4j*.jar ]]; then
+       if [[ "$i" != *log4j-slf4j-impl*.jar && "$i" != *slf4j-log4j*.jar && "$i" != *protobuf-java*.jar ]]; then
          HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$i
        fi
      done
@@ -69,7 +69,7 @@ if [ -n "${SPARK_HOME}" ] && [ -d "${SPARK_HOME}" ]; then
   SPARK_CLASSPATH=""
   for i in ${SPARK_HOME}/jars/*.jar
   do
-     if [[ "$i" != *log4j-slf4j-impl*.jar && "$i" != *guava*.jar && "$i" != *slf4j-log4j*.jar ]]; then
+     if [[ "$i" != *log4j-slf4j-impl*.jar && "$i" != *guava*.jar && "$i" != *slf4j-log4j*.jar && "$i" != *protobuf-java*.jar ]]; then
        SPARK_CLASSPATH=${SPARK_CLASSPATH}:$i
      fi
   done  
diff --git a/services/grpc/protobuf/src/main/protobuf/GeoWaveVector.proto b/services/grpc/protobuf/src/main/protobuf/GeoWaveVector.proto
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2013-2022 Contributors to the Eclipse Foundation
  * 
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#-------------------------------------------------------------------------------`
`2`		`-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation`
	`2`	`+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation`
`3`	`3`	`#`
`4`	`4`	`# See the NOTICE file distributed with this work for additional`
`5`	`5`	`# information regarding copyright ownership.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`#-------------------------------------------------------------------------------`
`3`		`-# Copyright (c) 2013-2018 Contributors to the Eclipse Foundation`
	`3`	`+# Copyright (c) 2013-2022 Contributors to the Eclipse Foundation`
`4`	`4`	`#`
`5`	`5`	`# See the NOTICE file distributed with this work for additional`
`6`	`6`	`# information regarding copyright ownership.`