[jetty94-dta-ssl] branch master updated: Roll back build to 3.x parent POM and some fixes.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository jetty94-dta-ssl.

View the commit online:
http://git.shibboleth.net/view/?p=jetty94-dta-ssl.git;a=commit;h=b0fffd91b5675ab828009cf660644963b38034fb

The following commit(s) were added to refs/heads/master by this push:
       new  b0fffd9   Roll back build to 3.x parent POM and some fixes.
b0fffd9 is described below

commit b0fffd91b5675ab828009cf660644963b38034fb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 18 13:03:58 2020 -0400

    Roll back build to 3.x parent POM and some fixes.
---
 .classpath                                                   |  2 +-
 .settings/org.eclipse.jdt.core.prefs                         |  6 +++---
 pom.xml                                                      |  4 ++--
 .../jetty94/DelegateToApplicationSslContextFactory.java      | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.classpath b/.classpath
index 0fb79cf..ae19729 100644
--- a/.classpath
+++ b/.classpath
@@ -24,7 +24,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 05237bd..065f373 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -76,7 +76,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
diff --git a/pom.xml b/pom.xml
index 11f8d6d..986dcbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>11.0.0</version>
+        <version>7.11.0</version>
     </parent>
 
     <groupId>net.shibboleth.utilities.jetty9</groupId>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>${jetty.groupId}</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>9.4.18.v20190429</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/src/main/java/net/shibboleth/utilities/jetty94/DelegateToApplicationSslContextFactory.java b/src/main/java/net/shibboleth/utilities/jetty94/DelegateToApplicationSslContextFactory.java
index baa12f0..d798f77 100644
--- a/src/main/java/net/shibboleth/utilities/jetty94/DelegateToApplicationSslContextFactory.java
+++ b/src/main/java/net/shibboleth/utilities/jetty94/DelegateToApplicationSslContextFactory.java
@@ -24,7 +24,7 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
+import java.util.Enumeration;
 import java.util.List;
 
 import javax.net.ssl.TrustManager;
@@ -61,7 +61,7 @@ public class DelegateToApplicationSslContextFactory extends org.eclipse.jetty.ut
 
     /** {@inheritDoc} */
     @Override
-    protected TrustManager[] getTrustManagers(KeyStore trustStore, Collection<? extends CRL> crls) throws Exception {
+    protected TrustManager[] getTrustManagers(final KeyStore trustStore, Collection<? extends CRL> crls) throws Exception {
         X509TrustManager noTrustManager = new X509TrustManager() {
 
             /** {@inheritDoc} */
@@ -82,11 +82,11 @@ public class DelegateToApplicationSslContextFactory extends org.eclipse.jetty.ut
                 final List<X509Certificate> issuers = new ArrayList<>();
                 
                 try {
-                    final Iterator<String> aliases = trustStore.aliases().asIterator();
-                    while (aliases.hasNext()) {
-                        final String alias = aliases.next();
+                    final Enumeration<String> aliases = trustStore.aliases();
+                    while (aliases.hasMoreElements()) {
+                        final String alias = aliases.nextElement();
                         if (trustStore.isCertificateEntry(alias)) {
-                            final Certificate cert = trustStore.getCertificate(aliases.next());
+                            final Certificate cert = trustStore.getCertificate(alias);
                             if (cert instanceof X509Certificate) {
                                 issuers.add((X509Certificate) cert);
                             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.