Activate checkstyle and add missing license headers

Delete also all "All rights reserved" statements, as they are
unnecessary and conflict with checkstyle's header check. Delete unused
imports.

build.gradle

@@ -94,7 +94,6 @@ subprojects {
 
 	checkstyle {
 		configFile = new File(rootConfigDir, 'checkstyle.xml')
-		ignoreFailures = true
 	}
 	pmd {
 		ignoreFailures = true

compression-jzlib/src/main/java/org/jivesoftware/smack/compression/JzlibInputOutputStream.java

@@ -1,7 +1,8 @@
 /**
+ *
  * Copyright 2013 Florian Schmaus
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

config/checkstyle.xml

@@ -1,9 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.3//EN" 
-     "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> 
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+     "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
+	<module name="SuppressionFilter">
+		<property name="file" value="config/suppressions.xml"/>
+	</module>
+	<module name="Header">
+		<property name="headerFile" value="config/header.txt"/>
+		<property name="ignoreLines" value="3"/>
+		<property name="fileExtensions" value="java"/>
+	</module>
 	<module name="TreeWalker">
-		<module name="UnusedImports"/> 
+		<module name="UnusedImports">
+			<property name="processJavadoc" value="true"/>
+		</module>
+		<!-- TODO: enable later on
+		<module name="AvoidStarImport"/>
+		<module name="IllegalImport"/>
+		<module name="RedundantImport"/>
+		<module name="UpperEll"/>
+		<module name="ArrayTypeStyle"/>
+		<module name="GenericWhitespace"/>
+		<module name="EmptyStatement"/>
+		<module name="PackageDeclaration"/>
+		-->
 	</module>
 </module>

config/header.txt

@@ -0,0 +1,16 @@
+/**
+ *
+ * Copyright 20XX the original author or authors
+ *
+ * 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.
+ */

config/suppressions.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<!-- currently none -->
+</suppressions>

core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java

@@ -1,5 +1,8 @@
 /**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright 2009 the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/AccountManager.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/Chat.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/ChatManager.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/ChatManagerListener.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/Connection.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2009 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/ConnectionListener.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/DefaultRosterStore.java

@@ -1,5 +1,8 @@
 /**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright 2013 the original author or authors
+ *
+ * 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
  *
@@ -11,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack;
 
 import java.io.File;

core/src/main/java/org/jivesoftware/smack/MessageListener.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/NonSASLAuthentication.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/OpenTrustManager.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/PacketCollector.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2005 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/PacketListener.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/PacketReader.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/PacketWriter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/Roster.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/RosterEntry.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/RosterGroup.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/RosterListener.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/RosterStore.java

@@ -1,5 +1,8 @@
 /**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * 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
  *
@@ -11,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack;
 
 import java.util.Collection;

core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/SmackError.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack;
 
 public enum SmackError {

core/src/main/java/org/jivesoftware/smack/UserAuthentication.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/XMPPConnection.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/XMPPException.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java

@@ -1,7 +1,8 @@
 /**
+ *
  * Copyright 2013 Florian Schmaus
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/compression/XMPPInputOutputStream.java

@@ -1,7 +1,8 @@
 /**
+ *
  * Copyright 2013 Florian Schmaus
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/FromContainsFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2006 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/MessageTypeFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/ThreadFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/filter/ToContainsFilter.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/initializer/LoggingInitializer.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.initializer;
 
 import java.util.Collections;

core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.initializer;
 
 import java.util.List;

core/src/main/java/org/jivesoftware/smack/initializer/UrlProviderFileInitializer.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.initializer;
 
 import java.io.IOException;

core/src/main/java/org/jivesoftware/smack/initializer/VmArgInitializer.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.initializer;
 
 import org.jivesoftware.smack.provider.ProviderManager;

core/src/main/java/org/jivesoftware/smack/packet/Authentication.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/Bind.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/IQ.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/Message.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/Packet.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/PacketExtension.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/Presence.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/Registration.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/Session.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/StreamError.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2005 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/parsing/ExceptionLoggingCallback.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2013 Florian Schmaus.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/parsing/ExceptionThrowingCallback.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2013 Florian Schmaus.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2013 Florian Schmaus.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/parsing/UnparsablePacket.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2013 Florian Schmaus.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/provider/AbstractProviderInfo.java

@@ -1,6 +1,21 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.provider;
 
-
 abstract class AbstractProviderInfo {
     private String element;
     private String ns;

core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java

@@ -1,5 +1,8 @@
 /**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * 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
  *
@@ -11,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.provider;
 
 import java.util.ArrayList;

core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.provider;
 
 /**

core/src/main/java/org/jivesoftware/smack/provider/IQProvider.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/provider/IQProviderInfo.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.provider;
 
 import org.jivesoftware.smack.packet.IQ;

core/src/main/java/org/jivesoftware/smack/provider/PacketExtensionProvider.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.provider;
 
 import java.io.InputStream;

core/src/main/java/org/jivesoftware/smack/provider/ProviderLoader.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * 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.
+ */
 package org.jivesoftware.smack.provider;
 
 import java.util.Collection;

core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/proxy/DirectSocketFactory.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketFactory.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/sasl/SASLAnonymous.java

@@ -1,7 +1,8 @@
 /**
  *
+ * Copyright the original author or authors
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
@@ -13,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.sasl;
 
 import org.jivesoftware.smack.SASLAuthentication;

core/src/main/java/org/jivesoftware/smack/sasl/SASLCramMD5Mechanism.java

@@ -1,7 +1,8 @@
 /**
  *
+ * Copyright the original author or authors
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
@@ -13,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.sasl;
 
 import org.jivesoftware.smack.SASLAuthentication;

core/src/main/java/org/jivesoftware/smack/sasl/SASLDigestMD5Mechanism.java

@@ -1,7 +1,8 @@
 /**
  *
+ * Copyright the original author or authors
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
@@ -13,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.sasl;
 
 import org.jivesoftware.smack.SASLAuthentication;

core/src/main/java/org/jivesoftware/smack/sasl/SASLExternalMechanism.java

@@ -1,7 +1,8 @@
 /**
  *
+ * Copyright the original author or authors
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
@@ -13,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.sasl;
 
 import org.jivesoftware.smack.SASLAuthentication;

core/src/main/java/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java

@@ -1,7 +1,8 @@
 /**
  *
+ * Copyright the original author or authors
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
@@ -13,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.sasl;
 
 import org.jivesoftware.smack.SASLAuthentication;

core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java

@@ -2,7 +2,7 @@
  *
  * Copyright 2003-2007 Jive Software.
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.sasl;
 
 import org.jivesoftware.smack.XMPPException;

core/src/main/java/org/jivesoftware/smack/sasl/SASLPlainMechanism.java

@@ -1,6 +1,8 @@
 /**
  *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * 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
  *
@@ -12,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.sasl;
 
 import org.jivesoftware.smack.SASLAuthentication;

core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java

@@ -1,5 +1,8 @@
 /**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * 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
  *

core/src/main/java/org/jivesoftware/smack/util/Base64.java

@@ -1,5 +1,18 @@
 /**
  *
+ * Copyright the original author or authors
+ *
+ * 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.
  */
 package org.jivesoftware.smack.util;
 

core/src/main/java/org/jivesoftware/smack/util/Base64Encoder.java

@@ -1,5 +1,8 @@
 /**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * 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
  *
@@ -11,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.util;
 
 

core/src/main/java/org/jivesoftware/smack/util/Base64FileUrlEncoder.java

@@ -1,5 +1,8 @@
 /**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * 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
  *
@@ -11,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack.util;