You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2017/03/31 15:15:04 UTC
svn commit: r1789702 - in /santuario/xml-security-java/trunk: ./
src/main/java/org/apache/jcp/xml/dsig/internal/dom/
src/test/java/javax/xml/crypto/test/
src/test/java/javax/xml/crypto/test/dsig/
src/test/java/org/apache/xml/security/test/dom/signature/
Author: coheigea
Date: Fri Mar 31 15:15:04 2017
New Revision: 1789702
URL: http://svn.apache.org/viewvc?rev=1789702&view=rev
Log:
Getting build + tests to pass with Java 9
Modified:
santuario/xml-security-java/trunk/pom.xml
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1789702&r1=1789701&r2=1789702&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Fri Mar 31 15:15:04 2017
@@ -198,7 +198,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.13.1</version>
+ <version>0.13.2</version>
<executions>
<execution>
<id>bindings</id>
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java?rev=1789702&r1=1789701&r2=1789702&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java Fri Mar 31 15:15:04 2017
@@ -131,8 +131,7 @@ public final class DOMX509Data extends B
{
xwriter.writeStartElement(dsPrefix, "X509Data", XMLSignature.XMLNS);
- @SuppressWarnings("unchecked")
- List<Object> content = x509Data.getContent();
+ List<?> content = x509Data.getContent();
// append children and preserve order
for (int i = 0, size = content.size(); i < size; i++) {
Object object = content.get(i);
@@ -232,7 +231,7 @@ public final class DOMX509Data extends B
}
X509Data oxd = (X509Data)o;
- @SuppressWarnings("unchecked") List<Object> ocontent = oxd.getContent();
+ List<?> ocontent = oxd.getContent();
int size = content.size();
if (size != ocontent.size()) {
return false;
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java?rev=1789702&r1=1789701&r2=1789702&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java Fri Mar 31 15:15:04 2017
@@ -108,8 +108,7 @@ public class KeySelectors {
crl = (X509CRL) entries[i];
}
}
- @SuppressWarnings("unchecked")
- Iterator<Object> xi = xd.getContent().iterator();
+ Iterator<?> xi = xd.getContent().iterator();
while (xi.hasNext()) {
Object o = xi.next();
// skip non-X509Certificate entries
@@ -307,8 +306,7 @@ public class KeySelectors {
("Unsupported RetrievalMethod type");
}
} else if (xmlStructure instanceof X509Data) {
- @SuppressWarnings("unchecked")
- List<Object> content = ((X509Data)xmlStructure).getContent();
+ List<?> content = ((X509Data)xmlStructure).getContent();
int size = content.size();
List<X509Certificate> result = null;
// Lookup the public key using the information
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java?rev=1789702&r1=1789701&r2=1789702&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java Fri Mar 31 15:15:04 2017
@@ -305,8 +305,7 @@ public class X509KeySelector extends Key
}
Collection<X509Certificate> certs = new ArrayList<>();
- @SuppressWarnings("unchecked")
- Iterator<Object> xi = xd.getContent().iterator();
+ Iterator<?> xi = xd.getContent().iterator();
while (xi.hasNext()) {
Object o = xi.next();
// check X509IssuerSerial
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java?rev=1789702&r1=1789701&r2=1789702&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java Fri Mar 31 15:15:04 2017
@@ -49,7 +49,7 @@ public class InvalidKeyTest extends org.
public void test() throws Exception {
FileInputStream input = new FileInputStream(BASEDIR + SEP +
"src/test/resources/org/apache/xml/security/samples/input/truststore.jks");
- KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+ KeyStore trustStore = KeyStore.getInstance("JKS");
trustStore.load(input, "testpw".toCharArray());
try {