EN-21 - RC39 Release
diff --git a/pom.xml b/pom.xml
index ca9b804..10f6a17 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.openldap</groupId>
<artifactId>enmasse</artifactId>
<packaging>war</packaging>
- <version>1.0-RC38</version>
+ <version>1.0-RC39</version>
<name>Fortress EnMasse</name>
<url>http://www.openldap.org/fortress/</url>
<description>EnMasse is a Web application that provides a RESTful implementation of Fortress' ANSI RBAC INCITS 359 engine.</description>
@@ -71,7 +71,7 @@
<properties>
<!-- leave this hardcoded, else get cyclic version error from maven -->
- <version>1.0-RC38</version>
+ <version>1.0-RC39</version>
<spring.security.version>3.1.4.RELEASE</spring.security.version>
<spring.version>3.0.4.RELEASE</spring.version>
<java.version>1.7</java.version>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.openldap</groupId>
<artifactId>sentry</artifactId>
- <version>${version}</version>
+ <version>1.0-RC39a</version>
</dependency>
<!-- EnMasse Dependencies -->
<dependency>
@@ -413,4 +413,11 @@
</profile>
</profiles>
+ <repositories>
+ <repository>
+ <id>maven2</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ </repositories>
+
</project>
\ No newline at end of file
diff --git a/src/main/resources/fortress.properties b/src/main/resources/fortress.properties
index 02e7ea6..ab5de01 100644
--- a/src/main/resources/fortress.properties
+++ b/src/main/resources/fortress.properties
@@ -9,12 +9,19 @@
# These credentials are used for read/write access to all nodes under suffix:
admin.user=cn=Manager,dc=openldap,dc=org
# LDAP admin root pass is encrypted using 'encrypt' target in build.xml:
-admin.pw=W7T0G9hylKZQ4K+DF8gfgA==
+admin.pw=secret
# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
min.admin.conn=1
max.admin.conn=25
+# Used for SSL Connection to LDAP Server:
+#enable.ldap.ssl=true
+#enable.ldap.ssl.debug=true
+#trust.store=/fully/qualified/path/and/file/name/to/java/truststore
+#trust.store.password=changeit
+#trust.store.set.prop=true
+
# This node contains fortress properties stored on behalf of connecting LDAP clients:
config.realm=DEFAULT
config.root=ou=Config,dc=openldap,dc=org
@@ -25,8 +32,6 @@
# Default for pool reconnect flag is false:
enable.pool.reconnect=true
-crypto.prop=abcd12345
-
ehcache.config.file=ehcache.xml
role1=admin
role2=role1
