Merge branch 'master' into PAYARA-3484

Author: jGauravGupta

ejb/remote/roles-allowed-ssl/src/main/resources/META-INF/glassfish-ejb-jar.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glassfish-ejb-jar PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 EJB 3.1//EN" "http://glassfish.org/dtds/glassfish-ejb-jar_3_1-1.dtd">
 <glassfish-ejb-jar>
-	<enterprise-beans>
-		<ejb>
-			<ejb-name>Bean</ejb-name>
-			<ior-security-config>
-				<transport-config>
-					<integrity>REQUIRED</integrity>
-					<confidentiality>REQUIRED</confidentiality>
-					<establish-trust-in-target>SUPPORTED</establish-trust-in-target>
-					<establish-trust-in-client>SUPPORTED</establish-trust-in-client>
-				</transport-config>
-				<as-context>
-					<auth-method>USERNAME_PASSWORD</auth-method>
-					<realm>default</realm>
-					<required>true</required>
-				</as-context>
-				<sas-context>
-					<caller-propagation>REQUIRED</caller-propagation>
-				</sas-context>
-			</ior-security-config>
-		</ejb>
-	</enterprise-beans>
+    <enterprise-beans>
+        <ejb>
+            <ejb-name>Bean</ejb-name>
+            <ior-security-config>
+                <transport-config>
+                    <integrity>REQUIRED</integrity>
+                    <confidentiality>REQUIRED</confidentiality>
+                    <establish-trust-in-target>SUPPORTED</establish-trust-in-target>
+                    <establish-trust-in-client>SUPPORTED</establish-trust-in-client>
+                </transport-config>
+                <as-context>
+                    <auth-method>USERNAME_PASSWORD</auth-method>
+                    <realm>default</realm>
+                    <required>true</required>
+                </as-context>
+                <sas-context>
+                    <caller-propagation>REQUIRED</caller-propagation>
+                </sas-context>
+            </ior-security-config>
+        </ejb>
+    </enterprise-beans>
 </glassfish-ejb-jar>

ejb/remote/vendor/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>ejb-remote-vendor</artifactId>
     <packaging>pom</packaging>
-    
+
     <name>Java EE 7 Sample: ejb - remote - vendor</name>
 
     <profiles>

pom.xml

@@ -133,6 +133,16 @@
                 <version>1.0.Beta3-m1</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>1.59</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>1.59</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

servlet/security-clientcert-jce/pom.xml

@@ -18,13 +18,11 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.59</version>
         </dependency>
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.59</version>
         </dependency>
     </dependencies>
 

servlet/security-clientcert/pom.xml

@@ -18,13 +18,11 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.59</version>
         </dependency>
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.59</version>
         </dependency>
     </dependencies>