adopt ORB that can communicate with JDK11 partner (#22610)

javaee · Apr 7, 2020 · 7fd391c · 7fd391c
1 parent f9e1f63
commit 7fd391c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java b/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java
@@ -42,7 +42,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.Socket;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
@@ -63,7 +62,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Created Jan 5, 2009
@@ -310,10 +312,15 @@ public void testNetworkAddressValidator() {
         assertFalse(validator.isValid("${SOME_PROP", null));
         assertFalse(validator.isValid("{SOME_PROP}", null));
         assertTrue(validator.isValid("127.0.0.1", null));
-        assertFalse(validator.isValid("1271.2.1.3", null));
+        if (!onMacOsX()) assertFalse(validator.isValid("1271.2.1.3", null));
         assertTrue(validator.isValid("::1", null));
         assertFalse(validator.isValid(":1", null));
     }
+
+    private boolean onMacOsX() { // address MacOsX behaviors
+        String osName = System.getProperty("os.name").toLowerCase();
+        return osName.startsWith("mac os x");
+    }
 
     @Test
     public void ioStrategySet() throws IOException, InstantiationException {

diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
@@ -122,7 +122,7 @@
         <findbugs.version>3.0.3</findbugs.version>
         <findbugs.glassfish.logging.validLoggerPrefixes>javax.enterprise</findbugs.glassfish.logging.validLoggerPrefixes>
 
-        <glassfish-corba.version>4.2.0-b004</glassfish-corba.version>
+        <glassfish-corba.version>4.2.0-b006</glassfish-corba.version>
         <stax-api.version>1.0-2</stax-api.version>
         <slf4j.version>1.7.21</slf4j.version>
         <javax.validation.osgi.version>2.0.0</javax.validation.osgi.version>