Fix test failure caused by expired certificate.
diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml
index 9156d97..105f633 100644
--- a/modules/rampart-tests/pom.xml
+++ b/modules/rampart-tests/pom.xml
@@ -34,10 +34,17 @@
<packaging>jar</packaging>
<name>Rampart - Test Suite</name>
+ <properties>
+ <aspectj.version>1.8.2</aspectj.version>
+ </properties>
+
<build>
<testSourceDirectory>src/test/java</testSourceDirectory>
<testResources>
<testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
<directory>test-resources</directory>
<includes>
<include>**/*.properties</include>
@@ -53,6 +60,35 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <version>0.6.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-properties</goal>
+ </goals>
+ <configuration>
+ <name>aspectjweaver</name>
+ <value>%file%</value>
+ <artifacts>
+ <artifact>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectj.version}</version>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${jacoco.surefireArgLine} -javaagent:${aspectjweaver}</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -85,5 +121,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>${aspectj.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/modules/rampart-tests/src/test/java/org/apache/rampart/FakeValidationDateAspect.java b/modules/rampart-tests/src/test/java/org/apache/rampart/FakeValidationDateAspect.java
new file mode 100644
index 0000000..469e3e8
--- /dev/null
+++ b/modules/rampart-tests/src/test/java/org/apache/rampart/FakeValidationDateAspect.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.rampart;
+
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+
+/**
+ * Aspect that redirects {@link X509Certificate#checkValidity()} to
+ * {@link X509Certificate#checkValidity(Date)} with a fixed date. This allows
+ * executing unit tests relying on certificates that have expired.
+ */
+@Aspect
+public class FakeValidationDateAspect {
+ private final static Date VALIDATION_DATE;
+
+ static {
+ Calendar cal = Calendar.getInstance();
+ cal.setTimeInMillis(0);
+ cal.set(2018, 0, 1);
+ VALIDATION_DATE = cal.getTime();
+ }
+
+ @Around("call(void java.security.cert.X509Certificate.checkValidity()) && target(cert)")
+ public void aroundCheckValidity(X509Certificate cert) throws CertificateExpiredException, CertificateNotYetValidException {
+ cert.checkValidity(VALIDATION_DATE);
+ }
+}
diff --git a/modules/rampart-tests/src/test/resources/META-INF/aop.xml b/modules/rampart-tests/src/test/resources/META-INF/aop.xml
new file mode 100644
index 0000000..6ef0d9a
--- /dev/null
+++ b/modules/rampart-tests/src/test/resources/META-INF/aop.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ -->
+<aspectj>
+ <aspects>
+ <aspect name="org.apache.rampart.FakeValidationDateAspect"/>
+ </aspects>
+ <weaver options="-showWeaveInfo">
+ <include within="org.apache.rampart..*"/>
+ <include within="org.apache.ws.security..*"/>
+ </weaver>
+</aspectj>
