opencadc · pdowler · Apr 30, 2026 · Apr 5, 2026 · Apr 5, 2026 · Apr 5, 2026
diff --git a/cadc-quality/build.gradle b/cadc-quality/build.gradle
@@ -11,19 +11,19 @@ repositories {
 
 apply from: '../opencadc.gradle'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 group = 'org.opencadc'
 
-version = '1.0.1'
+version = '1.1.0'
 
 description = 'OpenCADC Checkstyle Code Quality Rules'
 def git_url = 'https://github.com/opencadc/core'
 
 checkstyle {
     ignoreFailures = false
     configFile = file("${projectDir}/src/main/resources/cadc_checkstyle.xml") 
-    toolVersion = '8.2'
+    toolVersion = '10.12.5'
     sourceSets = [project.sourceSets.test]
 }
 
diff --git a/cadc-quality/src/main/resources/cadc_checkstyle.xml b/cadc-quality/src/main/resources/cadc_checkstyle.xml
@@ -33,7 +33,10 @@
         <module name="FileTabCharacter">
             <property name="eachLine" value="true"/>
         </module>
-
+    <module name="LineLength">
+        <property name="max" value="160"/> <!--cadc changed from 100 -->
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -46,10 +49,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="160"/> <!--cadc changed from 100 -->
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>

diff --git a/cadc-quality/src/main/resources/cadc_quality.gradle b/cadc-quality/src/main/resources/cadc_quality.gradle
@@ -8,14 +8,14 @@ configurations {
 }
 
 dependencies {
-    compile 'com.puppycrawl.tools:checkstyle:8.2'
+    compile 'com.puppycrawl.tools:checkstyle:10.12.5'
 
     checkstyleDep 'org.opencadc:cadc-quality:1.+'
 }
 
 checkstyle {
     ignoreFailures = false
     config = resources.text.fromArchiveEntry(configurations.checkstyleDep, 'cadc_checkstyle.xml')
-    toolVersion = '8.2'
+    toolVersion = '10.12.5'
     sourceSets = []
 }
diff --git a/cadc-rest/src/main/java/ca/nrc/cadc/rest/InitAction.java b/cadc-rest/src/main/java/ca/nrc/cadc/rest/InitAction.java
@@ -216,6 +216,7 @@ protected static Version getLibraryVersion(Class probe) {
     /**
      * Called during shutdown by the RestServlet destroy() method.
      */
-    public void doShutdown() {}
+    public void doShutdown() {
+    }
 
 }
diff --git a/cadc-rest/src/main/java/ca/nrc/cadc/rest/SyncOutput.java b/cadc-rest/src/main/java/ca/nrc/cadc/rest/SyncOutput.java
@@ -74,12 +74,10 @@
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.net.URI;
 import java.text.DateFormat;
 import java.util.Date;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/Asn1Object.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/Asn1Object.java
@@ -32,25 +32,25 @@
  ************************************************************************
  */
 
-/************************************************************************
- *   
+/*
+ *
  *   This class has been extracted from the PrivtKeyReader class at:
  *   http://www.androidadb.com/source/oauth-read-only/java/jmeter/jmeter/
  *   src/main/java/org/apache/jmeter/protocol/oauth/
  *   sampler/PrivateKeyReader.java.html
  *   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 ca.nrc.cadc.auth;
 

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/Authorizer.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/Authorizer.java
@@ -70,7 +70,6 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.net.TransientException;
-
 import java.io.FileNotFoundException;
 import java.net.URI;
 import java.security.AccessControlException;

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/BasicX509KeyManager.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/BasicX509KeyManager.java
@@ -74,7 +74,6 @@
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import javax.net.ssl.X509KeyManager;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/BearerTokenPrincipal.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/BearerTokenPrincipal.java
@@ -70,7 +70,6 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.util.StringUtil;
-
 import java.io.Serializable;
 import java.security.Principal;
 

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/CertCmdArgUtil.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/CertCmdArgUtil.java
@@ -70,11 +70,8 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.util.ArgumentMap;
-
 import java.io.File;
-
 import javax.security.auth.Subject;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/DerParser.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/DerParser.java
@@ -32,24 +32,24 @@
  ************************************************************************
  */
 
-/************************************************************************
- *   
- *   This class has been extracted from the PrivtKeyReader class at:
+/*
+ *
+ *   This class has been extracted from the PrivateKeyReader class at:
  *   http://www.androidadb.com/source/oauth-read-only/java/jmeter/jmeter/
  *   src/main/java/org/apache/jmeter/protocol/oauth/
  *   sampler/PrivateKeyReader.java.html
  *   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 ca.nrc.cadc.auth;
@@ -63,15 +63,15 @@
  * A bare-minimum ASN.1 DER decoder, just having enough functions to decode
  * PKCS#1 private keys. Especially, it doesn't handle explicitly tagged types
  * with an outer tag.
- * 
+ *
  * <p/>
  * This parser can only handle one layer. To parse nested constructs, get a new
  * parser for each layer using <code>Asn1Object.getParser()</code>.
- * 
+ *
  * <p/>
  * There are many DER decoders in JRE but using them will tie this program to a
  * specific JCE/JVM.
- * 
+ *
  * @author zhang
  *
  */

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/HttpPrincipal.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/HttpPrincipal.java
@@ -70,7 +70,6 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.util.StringUtil;
-
 import java.io.Serializable;
 import java.security.Principal;
 

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/NoOpAuthenticator.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/NoOpAuthenticator.java
@@ -68,7 +68,6 @@
 package ca.nrc.cadc.auth;
 
 import javax.security.auth.Subject;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/SSOCookieManager.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/SSOCookieManager.java
@@ -70,7 +70,6 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.date.DateUtil;
-
 import ca.nrc.cadc.util.PropertiesReader;
 import java.io.IOException;
 import java.net.URI;

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/ServletPrincipalExtractor.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/ServletPrincipalExtractor.java
@@ -71,18 +71,15 @@
 
 import ca.nrc.cadc.util.ArrayUtil;
 import ca.nrc.cadc.util.StringUtil;
-
 import java.security.AccessControlException;
 import java.security.Principal;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/SignedToken.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/SignedToken.java
@@ -73,7 +73,6 @@
 import ca.nrc.cadc.util.RsaSignatureGenerator;
 import ca.nrc.cadc.util.RsaSignatureVerifier;
 import ca.nrc.cadc.util.StringUtil;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.Serializable;
@@ -87,9 +86,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-
 import javax.security.auth.x500.X500Principal;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java
@@ -68,13 +68,10 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.auth.NotAuthenticatedException.AuthError;
-
 import java.security.AccessControlException;
 import java.util.List;
 import java.util.Set;
-
 import javax.security.auth.Subject;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/X509CertificateChain.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/X509CertificateChain.java
@@ -70,16 +70,13 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.util.Base64;
-
 import java.security.PrivateKey;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Set;
-
 import javax.security.auth.x500.X500Principal;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/db/DBConfig.java b/cadc-util/src/main/java/ca/nrc/cadc/db/DBConfig.java
@@ -70,7 +70,6 @@
 package ca.nrc.cadc.db;
 
 import ca.nrc.cadc.util.StringUtil;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContext.java b/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContext.java
@@ -72,7 +72,6 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
-
 import javax.naming.Binding;
 import javax.naming.Context;
 import javax.naming.Name;

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContextFactory.java b/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContextFactory.java
@@ -70,7 +70,6 @@
 package ca.nrc.cadc.db;
 
 import java.util.Hashtable;
-
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/exec/BuilderOutputGrabber.java b/cadc-util/src/main/java/ca/nrc/cadc/exec/BuilderOutputGrabber.java
@@ -34,7 +34,6 @@
 package ca.nrc.cadc.exec;
 
 import ca.nrc.cadc.util.ArrayUtil;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,7 +44,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/log/ServletLogInfo.java b/cadc-util/src/main/java/ca/nrc/cadc/log/ServletLogInfo.java
@@ -70,11 +70,9 @@
 package ca.nrc.cadc.log;
 
 import ca.nrc.cadc.net.NetUtil;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
-
 import org.apache.log4j.Logger;
 
 

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/log/WebServiceLogInfo.java b/cadc-util/src/main/java/ca/nrc/cadc/log/WebServiceLogInfo.java
@@ -83,7 +83,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-
 import javax.security.auth.Subject;
 import org.apache.log4j.Logger;
 
@@ -120,7 +119,9 @@ public abstract class WebServiceLogInfo {
 
     public String user;
 
-    protected WebServiceLogInfo() { }
+    protected WebServiceLogInfo() {
+
+    }
 
     /**
      * Generates the log.info message for the start of the request.

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/net/AuthChallenge.java b/cadc-util/src/main/java/ca/nrc/cadc/net/AuthChallenge.java
@@ -69,7 +69,6 @@
 
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.apache.log4j.Logger;
 
 /**

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/net/HttpPost.java b/cadc-util/src/main/java/ca/nrc/cadc/net/HttpPost.java
@@ -71,14 +71,9 @@
 
 import ca.nrc.cadc.auth.NotAuthenticatedException;
 import ca.nrc.cadc.io.ByteLimitExceededException;
-import ca.nrc.cadc.net.event.TransferEvent;
-
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -92,7 +87,6 @@
 import java.util.TreeMap;
 import java.util.UUID;
 import javax.net.ssl.HttpsURLConnection;
-
 import org.apache.log4j.Logger;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,6 @@ @@
     package ca.nrc.cadc.auth;
     import javax.security.auth.Subject;
     import org.apache.log4j.Logger;
     /**
@@ Expand Down @@