Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Upgrade Berkeley DB JE. Fix DS module references after rename. (#1) #44

Merged
merged 2 commits into from
Nov 19, 2022
Merged

Upgrade Berkeley DB JE. Fix DS module references after rename. (#1) #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c2773b
Upgrade Berkeley DB JE. Fix DS module references after rename. (#1)
karelmaxa Nov 16, 2022
97b7cb9
Upgrade to the newest wrensec-parent.
pavelhoral Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opendj-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wrensecurity</groupId>
<artifactId>wrensec-parent</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
<relativePath />
</parent>

Expand Down
10 changes: 5 additions & 5 deletions opendj-server-legacy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>5.0.104</version>
<version>18.3.12</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -428,8 +428,8 @@
</goals>
<configuration>
<additionalJars>
<additionalJar>opendj-slf4j-adapter.jar</additionalJar>
<additionalJar>opendj-je-backend.jar</additionalJar>
<additionalJar>wrends-slf4j-adapter.jar</additionalJar>
<additionalJar>wrends-je-backend.jar</additionalJar>
</additionalJars>
</configuration>
</execution>
Expand All @@ -441,7 +441,7 @@
</goals>
<configuration>
<additionalJars>
<additionalJar>opendj-je-backend.jar</additionalJar>
<additionalJar>wrends-je-backend.jar</additionalJar>
</additionalJars>
</configuration>
</execution>
Expand Down Expand Up @@ -706,7 +706,7 @@

<!-- Package JE backend jar -->
<execution>
<id>build-opendj-je-backend-jar</id>
<id>build-wrends-je-backend-jar</id>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
Expand Down
5 changes: 3 additions & 2 deletions ...j-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import com.sleepycat.je.Durability;
import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.je.dbi.MemoryBudget;
import com.sleepycat.je.utilint.JVMSystemUtils;

/** This class maps JE properties to configuration attributes. */
class ConfigurableEnvironment
Expand Down Expand Up @@ -388,10 +389,10 @@ private static void validateDbCacheSize(long dbCacheSize) throws ConfigException
{
if (dbCacheSize != 0)
{
if (MemoryBudget.getRuntimeMaxMemory() < dbCacheSize)
if (JVMSystemUtils.getRuntimeMaxMemory() < dbCacheSize)
{
throw new ConfigException(ERR_BACKEND_CONFIG_CACHE_SIZE_GREATER_THAN_JVM_HEAP.get(
dbCacheSize, MemoryBudget.getRuntimeMaxMemory()));
dbCacheSize, JVMSystemUtils.getRuntimeMaxMemory()));
}
if (dbCacheSize < MemoryBudget.MIN_MAX_MEMORY_SIZE)
{
Expand Down
2 changes: 1 addition & 1 deletion opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ private static UpgradeTask performOEMMigrationIfNeeded() {
return conditionalUpgradeTasks(
isOemVersionAndNewerThan3dot0(),
deleteFile(new File(libDirectory, "je.jar")),
deleteFile(new File(libDirectory, "opendj-je-backend.jar")),
deleteFile(new File(libDirectory, "wrends-je-backend.jar")),
conditionalUpgradeTasks(
new UpgradeCondition() {
@Override
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
<exclude>org.forgerock.opendj:opendj-server-legacy</exclude>
</excludes>
<additionalJars>
<additionalJar>opendj-slf4j-adapter.jar</additionalJar>
<additionalJar>wrends-slf4j-adapter.jar</additionalJar>
</additionalJars>
</configuration>
</execution>
Expand Down