Merge branch 'master' into update-jdk-11

Author: vharseko

openam-clientsdk/pom.xml

@@ -13,7 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2023 3A Systems LLC
+ * Portions copyright 2017-2023 3A Systems LLC
  *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -135,7 +135,7 @@
                             <include>org.openidentityplatform.commons.i18n-framework:core</include>
                             <include>org.openidentityplatform.commons.i18n-framework:slf4j</include>
                             <include>org.openidentityplatform.commons:util</include>
-                            <include>com.google.guava:guava:jar:</include>
+                            <include>com.google.guava:*</include>
                             <include>org.openidentityplatform.commons.http-framework:core</include>
                             <include>com.fasterxml.jackson.core:jackson-databind</include>
                             <include>com.fasterxml.jackson.core:jackson-core</include>

openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java

@@ -23,6 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2017-2025 3A Systems, LLC
  */
 package com.iplanet.am.util;
 
@@ -48,7 +49,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.annotation.Nullable;
-import javax.xml.rpc.holders.StringHolder;
 
 import com.google.common.base.Predicate;
 import com.google.common.cache.Cache;
@@ -794,4 +794,11 @@ PropertiesHolder putAll(Properties newProperties) {
             return new PropertiesHolder(Maps.fromProperties(newProperties));
         }
     }
+
+    private static class StringHolder {
+        public String value=null;
+        public StringHolder(String property) {
+            this.value=property;
+        }
+    }
 }

openam-federation/OpenFM/pom.xml

@@ -180,7 +180,12 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.2</version>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>serializer</artifactId>
+            <version>2.7.3</version>
         </dependency>
     </dependencies>
 </project>

openam-ui/openam-ui-ria/Gruntfile.js

@@ -374,8 +374,7 @@ module.exports = function (grunt) {
         "less",
         "replace",
         "copy:compiled",
-        "copy:transpiled",
-        "karma:build"
+        "copy:transpiled"
     ]);
 
     grunt.registerTask("dev", ["copy:compose", "babel", "deploy", "watch"]);

openam-ui/openam-ui-ria/package-lock.json

@@ -9,7 +9,7 @@
     "jsdoc": "jsdoc --configure config/jsdoc/configuration.json",
     "start": "grunt",
     "build:production": "cross-env NODE_ENV=production grunt prod --verbose",
-    "test": "grunt karma:dev",
+    "test": "grunt karma:build",
     "predeps": "npm run clean:deps -s",
     "deps": "ncu -u && mvn clean install",
     "postdeps": "npm shrinkwrap --dev"

openam-ui/openam-ui-ria/package.json

@@ -328,6 +328,16 @@
                             <arguments>run build:production -- --target-version=${project.version}</arguments>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <arguments>run test</arguments>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>