Merge branch 'master' of https://github.com/apache/struts into WW-4972

.travis.yml

@@ -8,8 +8,12 @@ jdk:
   - oraclejdk11
 
 install: true
-script: ./mvnw test -DskipAssembly -Dupdate-impact
-
+script:
+   - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      ./mvnw test -DskipAssembly;
+    else
+      ./mvnw test -DskipAssembly -Dupdate-impact;
+    fi;
 after_success:
   # TODO delete following if statement after fix of https://github.com/cobertura/cobertura/issues/271
   - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ] || [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
@@ -20,9 +24,8 @@ after_success:
 
 env:
   global:
-    secure: DusDFL9cuX+mj64tXQfrYVbUVYnxlXmad4nuIMj0/lgDbwJ6kxYasJmR99bdvwu08gS9D5b7a+m7WJTN0FNATzEiiGDXcM+TiDPlYDh7dcalU4QGiLmMuCCEw1r7hp2XE4BWVgDfFhCsHhStgjE4RXzHIyPowoPXr4ugPf8at6w=
+    - secure: iI7IpfDtS+LUyS2yNuRCR3KelNyvBHuoMQ3gb1UNmR5SSL7jO/p3olQWrQROs28FJ+dpE3lHyIjoHrebKQGJHHAgTG2XWxn+G3fDsf+wSSFSLoDGj0o2SgGXooBbR2dccnNZHCyQaOyE2cIPWaOxrQZFE4No70LQB4mrP/gdkoc=
 
 cache:
   directories:
-  - $HOME/.m2
-  
+    - $HOME/.m2

pom.xml

@@ -214,7 +214,7 @@
         <profile>
             <id>update-impact</id>
             <activation>
-                <jdk>1.7</jdk>
+                <jdk>1.8</jdk>
                 <property>
                     <name>update-impact</name>
                 </property>