You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2021/06/30 18:40:07 UTC

[directory-fortress-enmasse] branch master updated: 2.0.6 release preps

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-enmasse.git


The following commit(s) were added to refs/heads/master by this push:
     new 1aee1df  2.0.6 release preps
1aee1df is described below

commit 1aee1dfebf4957247e075f35bb7b23f268ada9d3
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Wed Jun 30 13:40:02 2021 -0500

    2.0.6 release preps
---
 README-QUICKSTART.md |  6 +++---
 README.md            |  2 +-
 pom.xml              | 10 +---------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/README-QUICKSTART.md b/README-QUICKSTART.md
index c69c879..535025b 100644
--- a/README-QUICKSTART.md
+++ b/README-QUICKSTART.md
@@ -16,7 +16,7 @@
    under the License.
 
 # README-QUICKSTART for Apache Fortress Rest
- * version 2.0.5
+ * version 2.0.6
 
 -------------------------------------------------------------------------------
 ## Table of Contents
@@ -58,7 +58,7 @@ Set the java system properties in tomcat with the target ldap server's coordinat
  a. For OpenLDAP:
 
  ```
- JAVA_OPTS="-Dversion=2.0.5 -Dfortress.admin.user=cn=Manager,dc=example,dc=com -Dfortress.admin.pw=secret -Dfortress.config.root=ou=Config,dc=example,dc=com"
+ JAVA_OPTS="-Dversion=2.0.6 -Dfortress.admin.user=cn=Manager,dc=example,dc=com -Dfortress.admin.pw=secret -Dfortress.config.root=ou=Config,dc=example,dc=com"
  ```
 
  b. For ApacheDS:
@@ -200,4 +200,4 @@ JAVA_OPTS=" -Dversion=2.0.5-SNAPSHOT                                        \
             -Dfortress.trust.store.onclasspath=false
 ```
 
-#### END OF README-QUICKSTART
\ No newline at end of file
+#### END OF README-QUICKSTART
diff --git a/README.md b/README.md
index 015de00..c540ae6 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
    under the License.
 
 # README for Apache Fortress Rest
- * Version 2.0.5
+ * Version 2.0.6
  * Apache Fortress Rest System Architecture Diagram
  ![Apache Fortress Rest System Architecture](images/fortress-rest-system-arch.png "Apache Fortress Rest System Architecture")
 
diff --git a/pom.xml b/pom.xml
index f0804a4..ab8aa1d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
     <title>${project.name} ${project.version}</title>
     <java.version>1.8</java.version>
     <!-- Dependencies version -->
-    <fortress.realm.version>2.0.5</fortress.realm.version>
+    <fortress.realm.version>2.0.6</fortress.realm.version>
     <cxf.version>3.3.6</cxf.version>
     <httpclient.version>3.1</httpclient.version>
     <java.version>1.8</java.version>
@@ -126,14 +126,6 @@
     <dependency>
       <groupId>org.apache.directory.fortress</groupId>
       <artifactId>fortress-realm-impl</artifactId>
-      <version>${fortress.realm.version}</version>
-        <exclusions>
-            <!-- fortress 1.0.0 and prior had this dependency which clashes with cxf version 3. -->
-            <exclusion>
-              <groupId>org.apache.cxf</groupId>
-              <artifactId>cxf-api</artifactId>
-            </exclusion>
-        </exclusions>
     </dependency>
 
     <!-- CXF Dependencies -->