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 2019/12/10 14:47:31 UTC
[directory-fortress-commander] branch master updated: 2.0.4 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-commander.git
The following commit(s) were added to refs/heads/master by this push:
new 1e4b5bb 2.0.4 release preps
1e4b5bb is described below
commit 1e4b5bbd68982ad81f1434718ebdea3aeaa070a7
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Tue Dec 10 08:47:23 2019 -0600
2.0.4 release preps
---
README-QUICKSTART.md | 8 ++++----
README.md | 10 +++++-----
pom.xml | 3 ++-
src/main/resources/applicationContext.xml | 2 +-
.../java/org/apache/directory/fortress/web/StartExamples.java | 2 +-
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/README-QUICKSTART.md b/README-QUICKSTART.md
index 4804e25..dacbfbe 100644
--- a/README-QUICKSTART.md
+++ b/README-QUICKSTART.md
@@ -16,7 +16,7 @@
under the License.
# README-QUICKSTART for Apache Fortress Web
- * Version 2.0.3
+ * Version 2.0.4
-------------------------------------------------------------------------------
## Table of Contents
@@ -53,7 +53,7 @@ Set the java system properties in tomcat with the target ldap server's coordinat
a. For OpenLDAP:
```
- JAVA_OPTS="-Dversion=2.0.3 -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.4 -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:
@@ -66,7 +66,7 @@ Set the java system properties in tomcat with the target ldap server's coordinat
4. Download the fortress realm proxy jar into tomcat/lib folder:
```
- wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.3/fortress-realm-proxy-2.0.3.jar -P $TOMCAT_HOME/lib
+ wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.4/fortress-realm-proxy-2.0.4.jar -P $TOMCAT_HOME/lib
```
where *TOMCAT_HOME* matches your target env.
@@ -74,7 +74,7 @@ Set the java system properties in tomcat with the target ldap server's coordinat
5. Download the fortress web war into tomcat/webapps folder:
```
- wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-web/2.0.3/fortress-web-2.0.3.war -P $TOMCAT_HOME/webapps
+ wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-web/2.0.4/fortress-web-2.0.4.war -P $TOMCAT_HOME/webapps
```
where *TOMCAT_HOME* matches your target env.
diff --git a/README.md b/README.md
index d6e9455..294384e 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
under the License.
# README for Apache Fortress Web
- * Version 2.0.3
+ * Version 2.0.4
* Apache Fortress Web System Architecture Diagram
@@ -74,16 +74,16 @@ Everything else covered in steps that follow. Tested on Debian, Centos & Window
a. from git:
```
- git clone --branch 2.0.3 https://gitbox.apache.org/repos/asf/directory-fortress-commander.git/
+ git clone --branch 2.0.4 https://gitbox.apache.org/repos/asf/directory-fortress-commander.git/
cd directory-fortress-commander
```
b. or download package:
```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.3/fortress-web-2.0.3-source-release.zip
- unzip fortress-web-2.0.3-source-release.zip
- cd fortress-web-2.0.3
+ wget http://www.apache.org/dist/directory/fortress/dist/2.0.4/fortress-web-2.0.4-source-release.zip
+ unzip fortress-web-2.0.4-source-release.zip
+ cd fortress-web-2.0.4
```
2. Build the source.
diff --git a/pom.xml b/pom.xml
index d00180a..ef79933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<properties>
<title>${project.name} ${project.version}</title>
<java.version>1.8</java.version>
- <fortress.realm.version>2.0.4-SNAPSHOT</fortress.realm.version>
+ <fortress.realm.version>2.0.4</fortress.realm.version>
<wicket.version>7.10.0</wicket.version>
<wicket.jquery.version>7.10.0</wicket.jquery.version>
<wicket.kendo-ui.version>7.10.0</wicket.kendo-ui.version>
@@ -237,6 +237,7 @@
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
+ <!--<version>3.6.2</version>-->
<version>2.2.4</version>
<scope>test</scope>
</dependency>
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 2b0a8f4..7340b01 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -91,7 +91,7 @@
<property name="targetMethod" value="putAll"/>
<property name="arguments">
<util:properties>
- <prop key="version">2.0.3</prop>
+ <prop key="version">2.0.4</prop>
</util:properties>
</property>
</bean>
diff --git a/src/test/java/org/apache/directory/fortress/web/StartExamples.java b/src/test/java/org/apache/directory/fortress/web/StartExamples.java
index c2ccfc4..61ab8f7 100644
--- a/src/test/java/org/apache/directory/fortress/web/StartExamples.java
+++ b/src/test/java/org/apache/directory/fortress/web/StartExamples.java
@@ -52,7 +52,7 @@ public class StartExamples
SocketConnector connector = new SocketConnector();
// fortress-rest navigation (iff enabled in fortress.properties)
- System.setProperty("version", "2.0.3");
+ System.setProperty("version", "2.0.4");
System.setProperty( GlobalIds.IS_JETTY_SERVER, "true");
// Set some timeout options to make debugging easier.