Browse Source

update dependencies

Jason Rivard 5 years ago
parent
commit
88d8b7395c

+ 1 - 1
client/pom.xml

@@ -79,7 +79,7 @@
             <plugin>
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.8.0</version>
+                <version>1.9.1</version>
                 <configuration>
                 <configuration>
                     <nodeVersion>v12.13.1</nodeVersion>
                     <nodeVersion>v12.13.1</nodeVersion>
                     <npmVersion>6.13.4</npmVersion>
                     <npmVersion>6.13.4</npmVersion>

+ 2 - 2
data-service/pom.xml

@@ -127,7 +127,7 @@
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
             <artifactId>commons-csv</artifactId>
-            <version>1.7</version>
+            <version>1.8</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
@@ -142,7 +142,7 @@
         <dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.10</version>
+            <version>4.5.11</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>log4j</groupId>
             <groupId>log4j</groupId>

+ 4 - 2
docker/pom.xml

@@ -34,7 +34,7 @@
             <plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>1.8.0</version>
+                <version>2.0.0</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <id>make-docker-image</id>
                         <id>make-docker-image</id>
@@ -50,11 +50,13 @@
                             <to>
                             <to>
                                 <image>${dockerImageTag}</image>
                                 <image>${dockerImageTag}</image>
                             </to>
                             </to>
+                            <outputPaths>
+                                <tar>target/pwm-docker-image-${project.version}.tar</tar>
+                            </outputPaths>
                             <container>
                             <container>
                                 <entrypoint>
                                 <entrypoint>
                                     <arg>/app/startup.sh</arg>
                                     <arg>/app/startup.sh</arg>
                                 </entrypoint>
                                 </entrypoint>
-                                <format>docker</format>
                                 <ports>
                                 <ports>
                                     <port>8443</port>
                                     <port>8443</port>
                                 </ports>
                                 </ports>

+ 9 - 9
pom.xml

@@ -166,7 +166,7 @@
                     <dependency>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.28</version>
+                        <version>8.29</version>
                     </dependency>
                     </dependency>
                 </dependencies>
                 </dependencies>
                 <executions>
                 <executions>
@@ -250,7 +250,7 @@
                     <dependency>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
                         <artifactId>spotbugs</artifactId>
-                        <version>4.0.0-beta4</version>
+                        <version>4.0.0-RC3</version>
                     </dependency>
                     </dependency>
                 </dependencies>
                 </dependencies>
                 <configuration>
                 <configuration>
@@ -271,7 +271,7 @@
             <plugin> <!-- checks owsp vulnerability database -->
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>5.2.2</version>
+                <version>5.3.0</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <goals>
                         <goals>
@@ -288,13 +288,13 @@
         <dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
+            <version>1.18.12</version>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.0.0-beta4</version>
+            <version>4.0.0-RC3</version>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
 
 
@@ -314,13 +314,13 @@
         <dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <artifactId>assertj-core</artifactId>
-            <version>3.14.0</version>
+            <version>3.15.0</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
             <artifactId>wiremock</artifactId>
-            <version>2.25.1</version>
+            <version>2.26.0</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
@@ -332,13 +332,13 @@
         <dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
             <artifactId>jmh-core</artifactId>
-            <version>1.22</version>
+            <version>1.23</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.22</version>
+            <version>1.23</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
 
 

+ 5 - 5
server/pom.xml

@@ -208,7 +208,7 @@
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
             <artifactId>commons-csv</artifactId>
-            <version>1.7</version>
+            <version>1.8</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <groupId>commons-fileupload</groupId>
@@ -233,7 +233,7 @@
         <dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.10</version>
+            <version>4.5.11</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.graylog2</groupId>
             <groupId>org.graylog2</groupId>
@@ -293,7 +293,7 @@
         <dependency>
         <dependency>
             <groupId>com.blueconic</groupId>
             <groupId>com.blueconic</groupId>
             <artifactId>browscap-java</artifactId>
             <artifactId>browscap-java</artifactId>
-            <version>1.2.13</version>
+            <version>1.2.14</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>
             <groupId>org.jetbrains.xodus</groupId>
@@ -314,7 +314,7 @@
         <dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
             <artifactId>caffeine</artifactId>
-            <version>2.8.0</version>
+            <version>2.8.1</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.nulab-inc</groupId>
             <groupId>com.nulab-inc</groupId>
@@ -337,7 +337,7 @@
             <!-- added newer dependency of xodus-environment -->
             <!-- added newer dependency of xodus-environment -->
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
             <artifactId>commons-compress</artifactId>
-            <version>1.19</version>
+            <version>1.20</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
 
 

+ 6 - 1
server/src/main/java/password/pwm/http/PwmSession.java

@@ -20,6 +20,7 @@
 
 
 package password.pwm.http;
 package password.pwm.http;
 
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import password.pwm.AppProperty;
 import password.pwm.AppProperty;
 import password.pwm.PwmApplication;
 import password.pwm.PwmApplication;
 import password.pwm.PwmConstants;
 import password.pwm.PwmConstants;
@@ -60,7 +61,11 @@ public class PwmSession implements Serializable
     private static final PwmLogger LOGGER = PwmLogger.forClass( PwmSession.class );
     private static final PwmLogger LOGGER = PwmLogger.forClass( PwmSession.class );
 
 
     private final transient PwmApplication pwmApplication;
     private final transient PwmApplication pwmApplication;
+
+    @SuppressFBWarnings( "SE_TRANSIENT_FIELD_NOT_RESTORED" )
     private final transient LocalSessionStateBean sessionStateBean = new LocalSessionStateBean();
     private final transient LocalSessionStateBean sessionStateBean = new LocalSessionStateBean();
+
+    @SuppressFBWarnings( "SE_TRANSIENT_FIELD_NOT_RESTORED" )
     private final transient UserSessionDataCacheBean userSessionDataCacheBean = new UserSessionDataCacheBean();
     private final transient UserSessionDataCacheBean userSessionDataCacheBean = new UserSessionDataCacheBean();
 
 
     private LoginInfoBean loginInfoBean;
     private LoginInfoBean loginInfoBean;
@@ -68,7 +73,7 @@ public class PwmSession implements Serializable
 
 
     private static final Object CREATION_LOCK = new Object();
     private static final Object CREATION_LOCK = new Object();
 
 
-    private final SessionManager sessionManager;
+    private final transient SessionManager sessionManager;
 
 
     public static PwmSession createPwmSession( final PwmApplication pwmApplication )
     public static PwmSession createPwmSession( final PwmApplication pwmApplication )
             throws PwmUnrecoverableException
             throws PwmUnrecoverableException

+ 1 - 1
server/src/main/resources/password/pwm/i18n/PwmSetting.properties

@@ -1150,7 +1150,7 @@ Setting_Label_peopleSearch.searchAttributes=Search Attributes
 Setting_Label_peopleSearch.search.form=Search Attributes
 Setting_Label_peopleSearch.search.form=Search Attributes
 Setting_Label_peopleSearch.searchBase=LDAP Search base
 Setting_Label_peopleSearch.searchBase=LDAP Search base
 Setting_Label_peopleSearch.searchFilter=People Search LDAP Filter
 Setting_Label_peopleSearch.searchFilter=People Search LDAP Filter
-Setting_Label_peopleSearch.useProxy=Use Proxy Account
+Setting_Label_peopleSearch.useProxy=Use Proxy LDAP Account
 Setting_Label_pwmAdmin.queryMatch=Administrator Permission
 Setting_Label_pwmAdmin.queryMatch=Administrator Permission
 Setting_Label_pwmAdmin.allowSkipForcedActivities=Allow Admin to Skip Forced Activities
 Setting_Label_pwmAdmin.allowSkipForcedActivities=Allow Admin to Skip Forced Activities
 Setting_Label_pwm.appProperty.overrides=App Property Overrides
 Setting_Label_pwm.appProperty.overrides=App Property Overrides

+ 5 - 5
webapp/pom.xml

@@ -181,7 +181,7 @@
                 <!-- builds xml file of dependencies and licenses for use in about page -->
                 <!-- builds xml file of dependencies and licenses for use in about page -->
                 <groupId>com.github.jinnovations</groupId>
                 <groupId>com.github.jinnovations</groupId>
                 <artifactId>attribution-maven-plugin</artifactId>
                 <artifactId>attribution-maven-plugin</artifactId>
-                <version>0.9.5</version>
+                <version>0.9.7</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
                         <goals>
                         <goals>
@@ -285,22 +285,22 @@
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojo</artifactId>
             <artifactId>dojo</artifactId>
-            <version>1.15.0</version>
+            <version>1.16.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dijit</artifactId>
             <artifactId>dijit</artifactId>
-            <version>1.15.0</version>
+            <version>1.16.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojox</artifactId>
             <artifactId>dojox</artifactId>
-            <version>1.15.0</version>
+            <version>1.16.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dgrid</artifactId>
             <artifactId>dgrid</artifactId>
-            <version>1.2.1</version>
+            <version>1.3.0</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <groupId>org.webjars.bower</groupId>