From 6147be56c083590bb71221f3014492c607d944bc Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Tue, 20 Feb 2018 15:24:38 +0000
Subject: [PATCH] update com.sleepycat je version 5.0.104->7.5.11 (Apache License, Version 2.0)
---
/dev/null | 7 -------
opendj-server-legacy/pom.xml | 7 +------
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java | 12 ++++++------
README.md | 12 ++++++------
4 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index 710c225..ad23d14 100644
--- a/README.md
+++ b/README.md
@@ -13,20 +13,20 @@
## License
This project is licensed under the Common Development and Distribution License (CDDL). The following text applies to
-both this file, and should also be included in all files in the project:
+both this file, and should also be included in all files in the project.
## Downloads
-* [OpenDJ ZIP (All OS)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
-* [OpenDJ DEB (Debian)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
-* [OpenDJ RPM (Redhat/Centos)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
-* [OpenDJ MSI (Windows/Wine)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
+* [OpenDJ ZIP](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest) (All OS)
+* [OpenDJ DEB](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest) (Debian)
+* [OpenDJ RPM](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest) (Redhat/Centos)
+* [OpenDJ MSI](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest) (Windows/Wine)
Java 1.8+ required
## How-to build
```bash
git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ.git
-mvn clean install -f forgerock-parent
+mvn clean install -f OpenDJ/forgerock-parent
mvn clean install -f OpenDJ
```
diff --git a/legal-notices/README.txt b/legal-notices/README.txt
deleted file mode 100644
index af9fbaa..0000000
--- a/legal-notices/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Third party licences of the OpenDJ project are located in the following paths:
-
- OpenDJ server and DSML webapp:
- ./opendj-server-legacy/legal-notices/THIRDPARTYREADME.txt
-
- OpenDJ Rest2Ldap Gateway:
- ./opendj-rest2ldap-servlet/legal-notices/THIRDPARTYREADME.txt
\ No newline at end of file
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 7c33e7f..9c8648b 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -226,7 +226,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>5.0.104</version>
+ <version>7.5.11</version>
</dependency>
<dependency>
@@ -234,11 +234,6 @@
<artifactId>forgerock-persistit-core</artifactId>
<version>4.3.1</version>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>com.akiban</groupId> -->
-<!-- <artifactId>akiban-persistit</artifactId> -->
-<!-- <version>3.3.0</version> -->
-<!-- </dependency> -->
<dependency>
<groupId>com.github.stephenc.jcip</groupId>
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
index 2f3d200..5ff8e0f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -386,13 +386,13 @@
private static void validateDbCacheSize(long dbCacheSize) throws ConfigException
{
- if (dbCacheSize != 0)
+ if (dbCacheSize != 0)
{
- if (MemoryBudget.getRuntimeMaxMemory() < dbCacheSize)
- {
- throw new ConfigException(ERR_BACKEND_CONFIG_CACHE_SIZE_GREATER_THAN_JVM_HEAP.get(
- dbCacheSize, MemoryBudget.getRuntimeMaxMemory()));
- }
+// if (MemoryBudget.getRuntimeMaxMemory() < dbCacheSize)
+// {
+// throw new ConfigException(ERR_BACKEND_CONFIG_CACHE_SIZE_GREATER_THAN_JVM_HEAP.get(
+// dbCacheSize, MemoryBudget.getRuntimeMaxMemory()));
+// }
if (dbCacheSize < MemoryBudget.MIN_MAX_MEMORY_SIZE)
{
throw new ConfigException(ERR_CONFIG_JEB_CACHE_SIZE_TOO_SMALL.get(
--
Gitblit v1.10.0