pom dependency updates and attribution plugin reorg

pom.xml

@@ -188,7 +188,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.13</version>
+                        <version>8.14</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -283,7 +283,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

server/pom.xml

@@ -48,95 +48,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <!-- creates the classes directory early in the build so the attribution plugin doesn't fail -->
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.directory}/classes"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <!-- builds xml file of dependencies and licenses for use in about page -->
-                <groupId>com.github.jinnovations</groupId>
-                <artifactId>attribution-maven-plugin</artifactId>
-                <version>0.9.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-attribution-file</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <outputFile>${project.build.directory}/classes/server-attribution.xml</outputFile>
-                    <dependencyOverrides>
-                        <dependencyOverride>
-                            <forDependency>jaxen:jaxen</forDependency>
-                            <license>
-                                <name>Custom</name>
-                                <url>http://jaxen.codehaus.org/license.html</url>
-                            </license>
-                        </dependencyOverride>
-                        <dependencyOverride>
-                            <forDependency>com.novell.security.nmas:ChallengeResponseLCM</forDependency>
-                            <projectUrl>https://www.novell.com/developer/ndk/novell_modular_authentication_service.html</projectUrl>
-                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nmas/builds/cross_platform/novell-nmas-devel-2009.11.11-cross_platform.zip</downloadUrl>
-                            <license>
-                                <name>Novell Developer License Agreement</name>
-                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
-                            </license>
-                        </dependencyOverride>
-                        <dependencyOverride>
-                            <forDependency>com.novell.security.nmas:nmasclient</forDependency>
-                            <projectUrl>https://www.novell.com/developer/ndk/novell_modular_authentication_service.html</projectUrl>
-                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nmas/builds/cross_platform/novell-nmas-devel-2009.11.11-cross_platform.zip</downloadUrl>
-                            <license>
-                                <name>Novell Developer License Agreement</name>
-                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
-                            </license>
-                        </dependencyOverride>
-                        <dependencyOverride>
-                            <forDependency>com.novell.security.nmas:NMASToolkit</forDependency>
-                            <projectUrl>https://www.novell.com/developer/ndk/novell_modular_authentication_service.html</projectUrl>
-                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nmas/builds/cross_platform/novell-nmas-devel-2009.11.11-cross_platform.zip</downloadUrl>
-                            <license>
-                                <name>Novell Developer License Agreement</name>
-                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
-                            </license>
-                        </dependencyOverride>
-                        <dependencyOverride>
-                            <forDependency>com.novell.security.nmas:jsso</forDependency>
-                            <projectUrl>https://www.novell.com/developer/ndk/novell_secretstore_developer_kit_for_java.html</projectUrl>
-                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nssoj/builds/cross_platform/novell-nssoj-devel-2006.02.17-1cross_platform.zip</downloadUrl>
-                            <license>
-                                <name>Novell Developer License Agreement</name>
-                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
-                            </license>
-                        </dependencyOverride>
-                        <dependencyOverride>
-                            <forDependency>com.novell.security.nmas:ldap</forDependency>
-                            <projectUrl>https://www.novell.com/developer/ndk/ldap_classes_for_java.html</projectUrl>
-                            <downloadUrl>https://www.novell.com/developer/ndk/ldap_classes_for_java/novell-jldap-devel-2013.08.30.1433-xplat.zip</downloadUrl>
-                            <license>
-                                <name>Novell Developer License Agreement</name>
-                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
-                            </license>
-                        </dependencyOverride>
-                    </dependencyOverrides>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -374,7 +285,7 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>webjars-locator-core</artifactId>
-            <version>0.35</version>
+            <version>0.36</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>

server/src/main/java/password/pwm/util/java/XmlUtil.java

@@ -120,7 +120,7 @@ public class XmlUtil
 
     public static List<DependencyInfo> getLicenseInfos( ) throws PwmUnrecoverableException
     {
-        final List<String> attributionFiles = Arrays.asList( "/server-attribution.xml", "/webapp-attribution.xml" );
+        final List<String> attributionFiles = Arrays.asList( "/attribution.xml" );
         final List<DependencyInfo> returnList = new ArrayList<>();
 
         for ( final String attributionFile : attributionFiles )

webapp/pom.xml

@@ -188,7 +188,61 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <outputFile>${project.build.directory}/classes/webapp-attribution.xml</outputFile>
+                    <outputFile>${project.build.directory}/classes/attribution.xml</outputFile>
+                    <dependencyOverrides>
+                        <dependencyOverride>
+                            <forDependency>jaxen:jaxen</forDependency>
+                            <license>
+                                <name>Custom</name>
+                                <url>http://jaxen.codehaus.org/license.html</url>
+                            </license>
+                        </dependencyOverride>
+                        <dependencyOverride>
+                            <forDependency>com.novell.security.nmas:ChallengeResponseLCM</forDependency>
+                            <projectUrl>https://www.novell.com/developer/ndk/novell_modular_authentication_service.html</projectUrl>
+                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nmas/builds/cross_platform/novell-nmas-devel-2009.11.11-cross_platform.zip</downloadUrl>
+                            <license>
+                                <name>Novell Developer License Agreement</name>
+                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
+                            </license>
+                        </dependencyOverride>
+                        <dependencyOverride>
+                            <forDependency>com.novell.security.nmas:nmasclient</forDependency>
+                            <projectUrl>https://www.novell.com/developer/ndk/novell_modular_authentication_service.html</projectUrl>
+                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nmas/builds/cross_platform/novell-nmas-devel-2009.11.11-cross_platform.zip</downloadUrl>
+                            <license>
+                                <name>Novell Developer License Agreement</name>
+                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
+                            </license>
+                        </dependencyOverride>
+                        <dependencyOverride>
+                            <forDependency>com.novell.security.nmas:NMASToolkit</forDependency>
+                            <projectUrl>https://www.novell.com/developer/ndk/novell_modular_authentication_service.html</projectUrl>
+                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nmas/builds/cross_platform/novell-nmas-devel-2009.11.11-cross_platform.zip</downloadUrl>
+                            <license>
+                                <name>Novell Developer License Agreement</name>
+                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
+                            </license>
+                        </dependencyOverride>
+                        <dependencyOverride>
+                            <forDependency>com.novell.security.nmas:jsso</forDependency>
+                            <projectUrl>https://www.novell.com/developer/ndk/novell_secretstore_developer_kit_for_java.html</projectUrl>
+                            <downloadUrl>ftp://sdk.provo.novell.com/ndk/nssoj/builds/cross_platform/novell-nssoj-devel-2006.02.17-1cross_platform.zip</downloadUrl>
+                            <license>
+                                <name>Novell Developer License Agreement</name>
+                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
+                            </license>
+                        </dependencyOverride>
+                        <dependencyOverride>
+                            <forDependency>com.novell.security.nmas:ldap</forDependency>
+                            <projectUrl>https://www.novell.com/developer/ndk/ldap_classes_for_java.html</projectUrl>
+                            <downloadUrl>https://www.novell.com/developer/ndk/ldap_classes_for_java/novell-jldap-devel-2013.08.30.1433-xplat.zip</downloadUrl>
+                            <license>
+                                <name>Novell Developer License Agreement</name>
+                                <url>https://www.novell.com/developer/novell_developer_license_agreement.html</url>
+                            </license>
+                        </dependencyOverride>
+                    </dependencyOverrides>
                 </configuration>
             </plugin>
         </plugins>
@@ -228,17 +282,17 @@
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojo</artifactId>
-            <version>1.14.1</version>
+            <version>1.14.2</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dijit</artifactId>
-            <version>1.14.1</version>
+            <version>1.14.2</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojox</artifactId>
-            <version>1.14.1</version>
+            <version>1.14.2</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>