Initial maven set up of HIRS_Utils

HIRS_AttestationCA/build.gradle

@@ -43,7 +43,7 @@ war.dependsOn copyVersion
 ext.configDir = new File(projectDir, 'config')
 ext.checkstyleConfigDir = "$configDir/checkstyle"
 checkstyle {
- toolVersion = '8.10.1'
+ toolVersion = '8.45.1'
  configFile = checkstyleConfigFile
  configProperties.put('basedir', checkstyleConfigDir)
  ignoreFailures = false

HIRS_AttestationCA/src/test/java/hirs/attestationca/IssuedCertificateAttributeHelperTest.java

@@ -1,8 +1,8 @@
 package hirs.attestationca;
 
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
+import org.bouncycastle.asn1.ASN1Sequence;
+import org.bouncycastle.asn1.ASN1Set;
+import org.bouncycastle.asn1.ASN1TaggedObject;
 import org.bouncycastle.asn1.DLSequence;
 import org.bouncycastle.asn1.x509.Extension;
 import org.testng.annotations.Test;
@@ -188,16 +188,16 @@ private Map<String, String> getSubjectAlternativeNameAttributes(
  Map<String, String> subjectAlternativeNameAttrMap = new HashMap<>();
 
  DLSequence dlSequence = (DLSequence) subjectAlternativeName.getParsedValue();
- DERTaggedObject derTaggedObject = (DERTaggedObject) dlSequence.getObjectAt(0);
- DERSequence derSequence = (DERSequence) derTaggedObject.getObject();
+ ASN1TaggedObject asn1TaggedObject = (ASN1TaggedObject) dlSequence.getObjectAt(0);
+ ASN1Sequence asn1Sequence = (ASN1Sequence) asn1TaggedObject.getObject();
 
- Enumeration enumeration = derSequence.getObjects();
+ Enumeration enumeration = asn1Sequence.getObjects();
  while (enumeration.hasMoreElements()) {
- DERSet set = (DERSet) enumeration.nextElement();
- DERSequence innerDerSequence = (DERSequence) set.getObjectAt(0);
+ ASN1Set set = (ASN1Set) enumeration.nextElement();
+ ASN1Sequence innerAsn1Sequence = (ASN1Sequence) set.getObjectAt(0);
 
- subjectAlternativeNameAttrMap.put(innerDerSequence.getObjectAt(0).toString(),
- innerDerSequence.getObjectAt(1).toString());
+ subjectAlternativeNameAttrMap.put(innerAsn1Sequence.getObjectAt(0).toString(),
+ innerAsn1Sequence.getObjectAt(1).toString());
  }
  return subjectAlternativeNameAttrMap;
  }

HIRS_AttestationCAPortal/build.gradle

@@ -77,7 +77,7 @@ ext.configDir = new File(projectDir, 'config')
 ext.checkstyleConfigDir = "$configDir/checkstyle"
 
 checkstyle {
- toolVersion = '8.10.1'
+ toolVersion = '8.45.1'
  configFile = checkstyleConfigFile
  configProperties.put('basedir', checkstyleConfigDir)
  ignoreFailures = false

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/datatables/package-info.java

@@ -1,9 +1,9 @@
-/**
- * This packages provides classes to serve jQuery dataTable requests.
- *
- * DataTableInput, Column, Order, and Search from:
- * https://github.com/darrachequesne/spring-data-jpa-datatables
- *
- * The rest of the package was unnecessary and introduced dependency conflicts.
- */
-package hirs.attestationca.portal.datatables;
+/**
+ * This packages provides classes to serve jQuery dataTable requests.
+ *
+ * DataTableInput, Column, Order, and Search from:
+ * https://github.com/darrachequesne/spring-data-jpa-datatables
+ *
+ * The rest of the package was unnecessary and introduced dependency conflicts.
+ */
+package hirs.attestationca.portal.datatables;

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/model/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This packages provides data model classes for the HIRS Attestation CA portal.
- */
-package hirs.attestationca.portal.model;
+/**
+ * This packages provides data model classes for the HIRS Attestation CA portal.
+ */
+package hirs.attestationca.portal.model;

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/package-info.java

@@ -1,4 +1,4 @@
-/**
- * Root Package for HIRS Attestation CA Portal.
- */
-package hirs.attestationca.portal;
+/**
+ * Root Package for HIRS Attestation CA Portal.
+ */
+package hirs.attestationca.portal;

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This package contains PageController implementations.
- */
-package hirs.attestationca.portal.page.controllers;
+/**
+ * This package contains PageController implementations.
+ */
+package hirs.attestationca.portal.page.controllers;

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This package provides interfaces and superclasses for PageController and associated objects.
- */
-package hirs.attestationca.portal.page;
+/**
+ * This package provides interfaces and superclasses for PageController and associated objects.
+ */
+package hirs.attestationca.portal.page;

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/params/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This package contains url parameter classes for portal pages.
- */
-package hirs.attestationca.portal.page.params;
+/**
+ * This package contains url parameter classes for portal pages.
+ */
+package hirs.attestationca.portal.page.params;

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/persistence/package-info.java

@@ -1,4 +1,4 @@
-/**
- * Persistence related classes for Attestation CA Portal.
- */
-package hirs.attestationca.portal.persistence;
+/**
+ * Persistence related classes for Attestation CA Portal.
+ */
+package hirs.attestationca.portal.persistence;

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/package-info.java

@@ -1,4 +1,4 @@
-/**
- * Utilities classes for the Attestation CA Portal.
- */
-package hirs.attestationca.portal.util;
+/**
+ * Utilities classes for the Attestation CA Portal.
+ */
+package hirs.attestationca.portal.util;

HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This package contains unit tests for PageController implementations.
- */
-package hirs.attestationca.portal.page.controllers;
+/**
+ * This package contains unit tests for PageController implementations.
+ */
+package hirs.attestationca.portal.page.controllers;

HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/datatables/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This package contains unit tests for the datatables adapter java classes.
- */
-package hirs.attestationca.portal.page.datatables;
+/**
+ * This package contains unit tests for the datatables adapter java classes.
+ */
+package hirs.attestationca.portal.page.datatables;

HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This package contains unit tests for base page classes.
- */
-package hirs.attestationca.portal.page;
+/**
+ * This package contains unit tests for base page classes.
+ */
+package hirs.attestationca.portal.page;

HIRS_Provisioner/build.gradle

@@ -32,7 +32,7 @@ jar.dependsOn copyVersion
 ext.configDir = new File(projectDir, 'config')
 ext.checkstyleConfigDir = "$configDir/checkstyle"
 checkstyle {
- toolVersion = '5.7'
+ toolVersion = '8.45.1'
  configFile = checkstyleConfigFile
  configProperties.put('basedir', checkstyleConfigDir)
  ignoreFailures = false

HIRS_Provisioner/src/main/java/hirs/provisioner/package-info.java

@@ -1,4 +1,4 @@
-/**
- * This package defines the application entry points.
- */
-package hirs.provisioner;
+/**
+ * This package defines the application entry points.
+ */
+package hirs.provisioner;

HIRS_Structs/build.gradle

@@ -14,7 +14,6 @@ dependencies {
 
 ext.configDir = new File(projectDir, 'config')
 ext.checkstyleConfigDir = "$configDir/checkstyle"
-//ext.checkstyleConfigDir = "$rootProject.projectDir/config/checkstyle"
 
 checkstyle {
  toolVersion = '8.45.1'

HIRS_Utils/build.gradle

@@ -99,7 +99,7 @@ task integrationTest(type: Test) {
 ext.checkstyleConfigDir = "$configDir/checkstyle"
 
 checkstyle {
- toolVersion = '8.10.1'
+ toolVersion = '8.45.1'
  configFile = checkstyleConfigFile
  configProperties.put('basedir', checkstyleConfigDir)
  ignoreFailures = false