Skip to content

Commit

Permalink
Added maven dependency for Bouncy Castle to server
Browse files Browse the repository at this point in the history 
It is used by Netty for self-signed certificate generation. It is a fallback
path if proprietary package sun.security.x509 provided by OpenJDK is not in
the classpath. In particular, IBM JDK does not include this package.
  • Loading branch information
@lutovich
lutovich committed Nov 5, 2015
1 parent 40bf3a5 commit 3e1742b
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 1 deletion.
1 change: 1 addition & 0 deletions advanced/server-advanced/LICENSES.txt
View file
Expand Up @@ -310,6 +310,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions advanced/server-advanced/NOTICE.txt
View file
Expand Up @@ -60,6 +60,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
1 change: 1 addition & 0 deletions community/neo4j-harness/LICENSES.txt
View file
Expand Up @@ -311,6 +311,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions community/neo4j-harness/NOTICE.txt
View file
Expand Up @@ -62,6 +62,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
1 change: 1 addition & 0 deletions community/server/LICENSES.txt
View file
Expand Up @@ -311,6 +311,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions community/server/NOTICE.txt
View file
Expand Up @@ -62,6 +62,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
4 changes: 4 additions & 0 deletions community/server/pom.xml
View file
Expand Up @@ -230,6 +230,10 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</dependency>

<!-- File uploads -->
<dependency>
Expand Down
1 change: 1 addition & 0 deletions enterprise/server-enterprise/LICENSES.txt
View file
Expand Up @@ -314,6 +314,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions enterprise/server-enterprise/NOTICE.txt
View file
Expand Up @@ -64,6 +64,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
1 change: 1 addition & 0 deletions packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt
View file
Expand Up @@ -352,6 +352,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt
View file
Expand Up @@ -70,6 +70,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
1 change: 1 addition & 0 deletions packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/LICENSES.txt
View file
Expand Up @@ -352,6 +352,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/NOTICE.txt
View file
Expand Up @@ -69,6 +69,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
1 change: 1 addition & 0 deletions packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt
View file
Expand Up @@ -352,6 +352,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt
View file
Expand Up @@ -70,6 +70,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
1 change: 1 addition & 0 deletions ...aging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt
View file
Expand Up @@ -356,6 +356,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt
View file
Expand Up @@ -73,6 +73,7 @@ BSD License
scala-parser-combinators

Bouncy Castle License
Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
Bouncy Castle Provider

Common Development and Distribution License Version 1.1
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
View file
Expand Up @@ -27,6 +27,7 @@
<lucene.version>3.6.2</lucene.version>
<powermock.version>1.5.5</powermock.version>
<logback-classic.version>1.1.2</logback-classic.version>
<bouncycastle.version>1.52</bouncycastle.version>
<generate-config-docs-phase>prepare-package</generate-config-docs-phase>
<hsqldb.version>2.3.2</hsqldb.version>
<test.runner.jvm.settings>-Xmx1G -XX:MaxPermSize=128M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=target/test-data -Dorg.neo4j.unsafe.impl.internal.dragons.UnsafeUtil.DIRTY_MEMORY=true</test.runner.jvm.settings>
Expand Down Expand Up @@ -701,7 +702,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.52</version>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.neo4j.3rdparty.javax.ws.rs</groupId>
Expand Down

0 comments on commit 3e1742b

Please sign in to comment.