浏览代码

dependency updates

Jason Rivard 3 年之前
父节点
当前提交
fec48dfa3d
共有 10 个文件被更改,包括 237 次插入523 次删除
  1. 12 0
      build/spotbugs-exclude.xml
  2. 196 494
      client/angular/package-lock.json
  3. 8 8
      client/angular/package.json
  4. 2 2
      data-service/pom.xml
  5. 1 1
      docker/pom.xml
  6. 1 1
      onejar/pom.xml
  7. 10 10
      pom.xml
  8. 2 2
      rest-test-service/pom.xml
  9. 4 4
      server/pom.xml
  10. 1 1
      webapp/pom.xml

+ 12 - 0
build/spotbugs-exclude.xml

@@ -31,4 +31,16 @@
         <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
     </Match>
+    <Match>
+        <!-- overly aggressive check added in 4.4.1 -->
+        <Bug pattern="MS_EXPOSE_REP"/>
+    </Match>
+    <Match>
+        <!-- overly aggressive check added in 4.4.1 -->
+        <Bug pattern="EI_EXPOSE_REP"/>
+    </Match>
+    <Match>
+        <!-- overly aggressive check added in 4.4.1 -->
+        <Bug pattern="EI_EXPOSE_REP2"/>
+    </Match>
 </FindBugsFilter>

文件差异内容过多而无法显示
+ 196 - 494
client/angular/package-lock.json


+ 8 - 8
client/angular/package.json

@@ -20,16 +20,16 @@
         "@microfocus/ias-icons": "1.0.4",
         "@microfocus/ng-ias": "1.0.1",
         "@microfocus/ux-ias": "1.1.2",
-        "@uirouter/angularjs": "1.0.15",
-        "angular": "^1.7.9",
-        "angular-aria": "1.7.8",
-        "angular-sanitize": "1.7.9",
-        "angular-translate": "2.18.1",
-        "core-js": "3.5.0",
+        "@uirouter/angularjs": "1.0.29",
+        "angular": "1.8.2",
+        "angular-aria": "1.8.2",
+        "angular-sanitize": "1.8.2",
+        "angular-translate": "2.19.0",
+        "core-js": "3.18.2",
         "textangular": "1.5.16"
     },
     "devDependencies": {
-        "@types/angular": "^1.8.1",
+        "@types/angular": "^1.8.3",
         "@types/angular-mocks": "1.5.11",
         "@types/angular-translate": "2.15.2",
         "@types/angular-ui-router": "1.1.40",
@@ -46,7 +46,7 @@
         "imports-loader": "0.8.0",
         "jasmine": "3.2.0",
         "jasmine-core": "3.2.1",
-        "jshint": "^2.13.0",
+        "jshint": "^2.13.1",
         "jshint-loader": "0.8.4",
         "json-loader": "0.5.7",
         "karma": "^4.4.1",

+ 2 - 2
data-service/pom.xml

@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.2</version>
                 <configuration>
                     <archiveClasses>true</archiveClasses>
                     <packagingExcludes>WEB-INF/classes</packagingExcludes>
@@ -155,7 +155,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.7</version>
+            <version>2.8.8</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>

+ 1 - 1
docker/pom.xml

@@ -33,7 +33,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.1.4</version>
                 <executions>
                     <execution>
                         <id>make-docker-image</id>

+ 1 - 1
onejar/pom.xml

@@ -16,7 +16,7 @@
     <name>PWM Password Self Service: Executable Server JAR</name>
 
     <properties>
-        <tomcat.version>9.0.52</tomcat.version>
+        <tomcat.version>9.0.54</tomcat.version>
     </properties>
 
     <build>

+ 10 - 10
pom.xml

@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.commonjava.maven.plugins</groupId>
                 <artifactId>directory-maven-plugin</artifactId>
-                <version>0.3.1</version>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>project-root-directory</id>
@@ -147,7 +147,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -252,7 +252,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.45.1</version>
+                        <version>9.0.1</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -331,12 +331,12 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.2.3</version>
+                <version>4.4.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
-                        <version>4.2.3</version>
+                        <version>4.4.1</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -385,7 +385,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>6.2.2</version>
+                <version>6.3.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -440,7 +440,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.2.3</version>
+            <version>4.4.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -454,13 +454,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.11.2</version>
+            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.20.2</version>
+            <version>3.21.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -472,7 +472,7 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
+            <version>0.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>

+ 2 - 2
rest-test-service/pom.xml

@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.2</version>
                 <configuration>
                     <archiveClasses>true</archiveClasses>
                     <packagingExcludes>WEB-INF/classes</packagingExcludes>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.7</version>
+            <version>2.8.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

+ 4 - 4
server/pom.xml

@@ -309,12 +309,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.7</version>
+            <version>2.8.8</version>
         </dependency>
         <dependency>
             <groupId>com.blueconic</groupId>
             <artifactId>browscap-java</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>
@@ -330,12 +330,12 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>webjars-locator-core</artifactId>
-            <version>0.47</version>
+            <version>0.48</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>com.nulab-inc</groupId>

+ 1 - 1
webapp/pom.xml

@@ -103,7 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.2</version>
                 <configuration>
                     <archiveClasses>false</archiveClasses>
                     <packagingExcludes>**/*.jsp</packagingExcludes>

部分文件因为文件数量过多而无法显示