Merge pull request #69 from girirajsharma/10.x

Updated BC crypto version to 1.52 and JDK version to 1.8
wildfly · Sep 8, 2015 · 02d2ea2 · 02d2ea2
2 parents 576d470 + e6785e2
commit 02d2ea2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/helloworld-client-ssl/pom.xml b/helloworld-client-ssl/pom.xml
@@ -47,15 +47,15 @@
 
         <version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>
 
-        <version.org.bouncycastle.crypto>1.50</version.org.bouncycastle.crypto>
+        <version.org.bouncycastle.crypto>1.52</version.org.bouncycastle.crypto>
 
         <!-- other plugin versions -->
         <version.compiler.plugin>3.1</version.compiler.plugin>
         <version.war.plugin>2.5</version.war.plugin>
 
         <!-- maven-compiler-plugin -->
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
 
     <dependencyManagement>

diff --git a/helloworld-ssl/pom.xml b/helloworld-ssl/pom.xml
@@ -22,8 +22,8 @@
     <artifactId>wildfly-helloworld-ssl</artifactId>
     <version>9.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>WildFly Quickstarts: Helloworld</name>
-    <description>WildFly Quickstarts: Helloworld</description>
+    <name>WildFly Quickstarts: Helloworld SSL</name>
+    <description>WildFly Quickstarts: Helloworld SSL</description>
 
     <url>http://wildfly.org</url>
     <licenses>
@@ -47,14 +47,13 @@
 
         <version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>
 
-
         <!-- other plugin versions -->
         <version.compiler.plugin>3.1</version.compiler.plugin>
         <version.war.plugin>2.5</version.war.plugin>
 
         <!-- maven-compiler-plugin -->
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
 
     <dependencyManagement>

diff --git a/helloworld-war-ssl/pom.xml b/helloworld-war-ssl/pom.xml
@@ -47,6 +47,7 @@
 
         <version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>
 
+        <version.org.bouncycastle.crypto>1.52</version.org.bouncycastle.crypto>
 
         <!-- other plugin versions -->
         <version.compiler.plugin>3.1</version.compiler.plugin>
@@ -105,12 +106,12 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.52</version>
+            <version>${version.org.bouncycastle.crypto}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.52</version>
+            <version>${version.org.bouncycastle.crypto}</version>
         </dependency>
     </dependencies>