SEN-21 - RC37 Release
diff --git a/build.properties b/build.properties
index a70cd6d..5619b83 100644
--- a/build.properties
+++ b/build.properties
@@ -16,7 +16,7 @@
# Note: Directives that begin with '@' are substitution parms for Fortress' build.xml 'init-slapd' target.
#Use this property file to specify environment specific settings.
-version=1.0-RC36
+version=1.0-RC37
# Enable this property if computer does not have external connection to Internet:
local.mode=true
@@ -31,8 +31,8 @@
ldap.host=localhost
ldap.port=389
# example suffix, dc=example,dc=com:
-suffix.name=jts
-suffix.dc=us
+suffix.name=openldap
+suffix.dc=org
suffix=dc=${suffix.name},dc=${suffix.dc}
# Admin Pool:
diff --git a/build.xml b/build.xml
index bf25fe8..4103b0c 100644
--- a/build.xml
+++ b/build.xml
@@ -65,6 +65,8 @@
<property name="fortressSentryImpl.jar" value="${dist.dir}/fortressSentryImpl-${version}.jar"/>
<property name="javadoc.dist.zip" value="${dist.dir}/fortressSentryDoc-${version}.zip"/>
<property name="fortressSentryBuilder.zip" value="${dist.dir}/fortressSentryBuilder-${version}.zip"/>
+ <property name="realm-impl.jar" value="${dist.dir}/fortressSentryImpl-${version}.jar"/>
+ <property name="realm-proxy.jar" value="${dist.dir}/fortressProxyTomcat7-${version}.jar"/>
<property name="config.dir" value="${basedir}/conf"/>
<!-- Dependent LIBs in maven -->
@@ -573,6 +575,28 @@
Update project version (both build.xml and pom.xml) from SNAPSHOT to RELEASE
================================= -->
<target name="stage" depends="dist" description="deploy release version to Maven staging repository">
+
+ <!-- sign and deploy the impl jar -->
+ <artifact:mvn>
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file"/>
+ <arg value="-Durl=${maven-staging-repository-url}"/>
+ <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+ <arg value="-DpomFile=pom.xml"/>
+ <arg value="-Dfile=${realm-impl.jar}"/>
+ <arg value="-Pgpg"/>
+ </artifact:mvn>
+
+ <!-- sign and deploy the impl jar -->
+ <artifact:mvn>
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file"/>
+ <arg value="-Durl=${maven-staging-repository-url}"/>
+ <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+ <arg value="-DpomFile=pom.xml"/>
+ <arg value="-Dfile=${realm-proxy.jar}"/>
+ <arg value="-Dclassifier=proxy"/>
+ <arg value="-Pgpg"/>
+ </artifact:mvn>
+
<!-- sign and deploy the main artifact -->
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file"/>
@@ -580,6 +604,7 @@
<arg value="-DrepositoryId=${maven-staging-repository-id}"/>
<arg value="-DpomFile=pom.xml"/>
<arg value="-Dfile=${maven-jar}"/>
+ <arg value="-Dclassifier=dist"/>
<arg value="-Pgpg"/>
</artifact:mvn>
@@ -604,6 +629,7 @@
<arg value="-Dclassifier=javadoc"/>
<arg value="-Pgpg"/>
</artifact:mvn>
+
</target>
</project>
diff --git a/ivy.xml b/ivy.xml
index d3ba8c3..5be326d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -15,7 +15,7 @@
<ivy-module version="2.0">
<info organisation="org.apache" module="openldap-fortress-realm"/>
<dependencies>
- <dependency org="org.openldap" name="fortress" rev="1.0-RC36" conf="default->master"/>
+ <dependency org="org.openldap" name="fortress" rev="1.0-RC37" conf="default->master"/>
<dependency org="commons-lang" name="commons-lang" rev="2.4" conf="default->master"/>
<dependency org="commons-configuration" name="commons-configuration" rev="1.6" conf="default->master"/>
<dependency org="commons-lang" name="commons-lang" rev="2.4" conf="default->master"/>
@@ -27,12 +27,11 @@
<dependency org="log4j" name="log4j" rev="1.2.17" conf="default->master"/>
<dependency org="org.jasypt" name="jasypt" rev="1.8" conf="default->master"/>
<dependency org="org.jgrapht" name="jgrapht-jdk1.5" rev="0.7.3" conf="default->master"/>
- <dependency org="net.sf.ehcache" name="ehcache-core" rev="2.6.5" conf="default->master"/>
+ <dependency org="net.sf.ehcache" name="ehcache-core" rev="2.6.9" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-jcl" rev="1.7.5" conf="default->master"/>
<dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M15" conf="default->master"/>
-
<dependency org="org.apache.tomcat" name="tomcat-catalina" rev="7.0.22" conf="default->master">
<artifact name="tomcat-catalina" type="jar" />
</dependency>
diff --git a/pom.xml b/pom.xml
index 100914a..2f9a46a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<artifactId>sentry</artifactId>
<packaging>jar</packaging>
<name>Fortress Sentry</name>
- <version>1.0-RC36</version>
+ <version>1.0-RC37</version>
<description>Sentry is an ANSI RBAC INCITS 359 compliant policy enforcement engine.</description>
<url>http://www.openldap.org/fortress/</url>
<licenses>
@@ -43,17 +43,7 @@
<dependency>
<groupId>org.openldap</groupId>
<artifactId>fortress</artifactId>
- <version>1.0-RC36</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>6.0.33</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>7.0.22</version>
+ <version>1.0-RC37</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
