Release 7.0.2

RallySoftware · Oct 4, 2018 · a79ec39 · a79ec39
1 parent 03083a1
commit a79ec39
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 11 deletions.
diff --git a/mujina-common/pom.xml b/mujina-common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.openconext</groupId>
     <artifactId>mujina</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/mujina-common/src/main/java/mujina/saml/SAMLBuilder.java b/mujina-common/src/main/java/mujina/saml/SAMLBuilder.java
@@ -136,7 +136,7 @@ public static void signAssertion(SignableXMLObject signableXMLObject, Credential
 
   public static Optional<String> getStringValueFromXMLObject(XMLObject xmlObj) {
     if (xmlObj instanceof XSString) {
-      return Optional.of(((XSString) xmlObj).getValue());
+      return Optional.ofNullable(((XSString) xmlObj).getValue());
     } else if (xmlObj instanceof XSAny) {
       XSAny xsAny = (XSAny) xmlObj;
       String textContent = xsAny.getTextContent();

diff --git a/mujina-idp/pom.xml b/mujina-idp/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.openconext</groupId>
     <artifactId>mujina</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/mujina-idp/src/main/resources/public/main.css b/mujina-idp/src/main/resources/public/main.css
@@ -133,7 +133,7 @@ span.remove-attribute-value {
     font-size: 16px;
 }
 div.attribute-value label {
-    font-size: 12px;
+    font-size: 13px;
 }
 div.attribute-value input {
     margin-top: 2px;

diff --git a/mujina-idp/src/main/resources/saml-attributes.json b/mujina-idp/src/main/resources/saml-attributes.json
@@ -74,11 +74,6 @@
     "id": "isMemberOf",
     "multiplicity": true
   },
-  {
-    "name": "urn:mace:dir:attribute-def:uid",
-    "id": "uid",
-    "multiplicity": false
-  },
   {
     "name": "urn:mace:dir:attribute-def:preferredLanguage",
     "id": "preferredLanguage",

diff --git a/mujina-sp/pom.xml b/mujina-sp/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.openconext</groupId>
     <artifactId>mujina</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.openconext</groupId>
   <artifactId>mujina</artifactId>
-  <version>7.0.1</version>
+  <version>7.0.2</version>
   <packaging>pom</packaging>
 
   <properties>