diff --git a/pom.xml b/pom.xml
index ed0b2dac7..f540cb37e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,37 @@
                   <include>**/*.java</include>
                   <include>**/*.jsp</include>  
                </includes>
+               <!-- Classes derivated from SOLR Source code include the Apache License header -->
+               <excludes>
+                  <exclude>**/org/alfresco/solr/component/AsyncBuildSuggestComponent.java</exclude>
+                  <exclude>**/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java</exclude>
+                  <exclude>**/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java</exclude>
+                  <exclude>**/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java</exclude>
+                  <exclude>**/org/apache/solr/client/solrj/io/sql/StatementImpl.java</exclude>
+                  <exclude>**/org/alfresco/solr/handler/AlfrescoIndexFetcher.java</exclude>
+                  <exclude>**/org/alfresco/solr/handler/AlfrescoReplicationHandler.java</exclude>
+                  <exclude>**/org/alfresco/solr/handler/OldBackupDirectory.java</exclude>
+                  <exclude>**/org/alfresco/solr/handler/SnapShooter.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrAggregate.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrEnumerator.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrFilter.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrMethod.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrProject.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrRel.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrRules.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrSort.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrTable.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrTableScan.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrToEnumerableConverter.java</exclude>
+                  <exclude>**/org/alfresco/solr/sql/SolrToEnumerableConverterRule.java</exclude>
+                  <exclude>**/org/alfresco/solr/stream/FacetStream.java</exclude>
+                  <exclude>**/org/alfresco/solr/stream/JDBCStream.java</exclude>
+                  <exclude>**/org/alfresco/solr/stream/JSONTupleStream.java</exclude>
+                  <exclude>**/org/alfresco/solr/stream/LimitStream.java</exclude>
+                  <exclude>**/org/alfresco/solr/stream/StatsStream.java</exclude>
+                  <exclude>**/org/alfresco/solr/stream/StreamHandler.java</exclude>
+                  <exclude>**/org/alfresco/solr/stream/TimeSeriesStream.java</exclude>
+               </excludes>
             </configuration>
             <executions>
                <execution>
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/AsyncBuildSuggestComponent.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/AsyncBuildSuggestComponent.java
index f5fbe15d4..60aa8a2a3 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/AsyncBuildSuggestComponent.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/AsyncBuildSuggestComponent.java
@@ -1,27 +1,20 @@
-/*-
- * #%L
- * Alfresco Solr Search
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
+/*
+ * 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
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
+ * 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.
+ * 
+ * Modifications copyright (C) 2005 - 2020 Alfresco Software Limited
  */
 package org.alfresco.solr.component;
 
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java
index bc57292a6..6d0c78105 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java
@@ -1,28 +1,22 @@
-/*-
- * #%L
- * Alfresco Solr Search
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
+/*
+ * 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.
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
+ * Modifications copyright (C) 2005 - 2020 Alfresco Software Limited
  */
+
 package org.alfresco.solr.handler;
 
 import com.google.common.base.Strings;
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java
index 4a8d025af..95590c08a 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java
@@ -1,28 +1,22 @@
-/*-
- * #%L
- * Alfresco Solr Search
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
+/*
+ * 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.
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
+ * Modifications copyright (C) 2005 - 2020 Alfresco Software Limited
  */
+
 package org.alfresco.solr.handler;
 
 import org.alfresco.solr.AlfrescoCoreAdminHandler;
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/OldBackupDirectory.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/OldBackupDirectory.java
index a9a20a41e..9c461636c 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/OldBackupDirectory.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/OldBackupDirectory.java
@@ -1,28 +1,22 @@
-/*-
- * #%L
- * Alfresco Solr Search
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
+/*
+ * 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.
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
+ * Modifications copyright (C) 2005 - 2020 Alfresco Software Limited
  */
+
 package org.alfresco.solr.handler;
 
 import org.apache.solr.handler.SnapShooter;
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/SnapShooter.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/SnapShooter.java
index 90f565b9f..f0829046d 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/SnapShooter.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/SnapShooter.java
@@ -1,28 +1,22 @@
-/*-
- * #%L
- * Alfresco Solr Search
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
+/*
+ * 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.
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
+ * Modifications copyright (C) 2005 - 2020 Alfresco Software Limited
  */
+
 package org.alfresco.solr.handler;
 
 import org.apache.lucene.index.IndexCommit;