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 2016/03/07 17:03:12 UTC
[1/2] directory-fortress-commander git commit: [maven-release-plugin]
rollback the release of 1.0-RC42
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master 7d5e9536f -> 4f7c9e75c
[maven-release-plugin] rollback the release of 1.0-RC42
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/845b883c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/845b883c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/845b883c
Branch: refs/heads/master
Commit: 845b883c1d124b6ae6556d05163fd71c1babc418
Parents: 7d5e953
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Mar 7 10:01:53 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Mar 7 10:01:53 2016 -0600
----------------------------------------------------------------------
pom.xml | 70 +++++++++++++++++++++++++++++++++---------------------------
1 file changed, 39 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/845b883c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4d6e5c8..3dd73d4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -33,7 +34,7 @@
<version>1.0-RC42-SNAPSHOT</version>
<name>Apache Fortress Web</name>
<url>http://directory.apache.org/fortress/</url>
- <description>Apache Fortress Web is an ANSI RBAC INCITS 359 compliant administrative UI</description>
+ <description>Fortress Web is an ANSI RBAC INCITS 359 compliant administrative UI</description>
<licenses>
<license>
@@ -43,10 +44,10 @@
</licenses>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-web.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-web.git
</developerConnection>
- <tag>1.0-RC42</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -575,30 +576,37 @@
<execution>
<phase>test</phase>
<configuration>
- <target name="fortress-load" if="load.file" description="Loads fortress rbac policy files into ldap">
- <echo message="############### Run Fortress Policy Load ###############" />
- <java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="true" dir="${basedir}" timeout="4000000" taskname="startAnt">
+ <target name="fortress-load" if="load.file"
+ description="Loads fortress rbac policy files into ldap">
+ <echo message="############### Run Fortress Policy Load ###############"/>
+ <java
+ classname="org.apache.tools.ant.launch.Launcher"
+ fork="true"
+ failonerror="true"
+ dir="${basedir}"
+ timeout="4000000"
+ taskname="startAnt">
<classpath>
- <pathelement location="./src/main/resources" />
- <pathelement location="${org.apache.ant:ant-launcher:jar}" />
- <pathelement location="${org.apache.ant:ant:jar}" />
- <pathelement location="${org.apache.directory.fortress:fortress-core:jar}" />
- <pathelement location="${org.openldap:accelerator-api:jar}" />
- <pathelement location="${org.openldap:accelerator-impl:jar}" />
- <pathelement location="${log4j:log4j:jar}" />
- <pathelement location="${org.apache.directory.api:api-all:jar}" />
- <pathelement location="${org.apache.mina:mina-core:jar}" />
- <pathelement location="${org.jgrapht:jgrapht-core:jar}" />
- <pathelement location="${org.jasypt:jasypt:jar}" />
- <pathelement location="${commons-configuration:commons-configuration:jar}" />
- <pathelement location="${commons-lang:commons-lang:jar}" />
- <pathelement location="${commons-collections:commons-collections:jar}" />
- <pathelement location="${commons-logging:commons-logging:jar}" />
- <pathelement location="${commons-io:commons-io:jar}" />
- <pathelement location="${commons-pool:commons-pool:jar}" />
- <pathelement location="${net.sf.ehcache:ehcache-core:jar}" />
- <pathelement location="${org.slf4j:slf4j-api:jar}" />
- <pathelement location="${org.slf4j:slf4j-log4j12:jar}" />
+ <pathelement location="./src/main/resources"/>
+ <pathelement location="${org.apache.ant:ant-launcher:jar}"/>
+ <pathelement location="${org.apache.ant:ant:jar}"/>
+ <pathelement location="${org.apache.directory.fortress:fortress-core:jar}"/>
+ <pathelement location="${org.openldap:accelerator-api:jar}"/>
+ <pathelement location="${org.openldap:accelerator-impl:jar}"/>
+ <pathelement location="${log4j:log4j:jar}"/>
+ <pathelement location="${org.apache.directory.api:api-all:jar}"/>
+ <pathelement location="${org.apache.mina:mina-core:jar}"/>
+ <pathelement location="${org.jgrapht:jgrapht-core:jar}"/>
+ <pathelement location="${org.jasypt:jasypt:jar}"/>
+ <pathelement location="${commons-configuration:commons-configuration:jar}"/>
+ <pathelement location="${commons-lang:commons-lang:jar}"/>
+ <pathelement location="${commons-collections:commons-collections:jar}"/>
+ <pathelement location="${commons-logging:commons-logging:jar}"/>
+ <pathelement location="${commons-io:commons-io:jar}"/>
+ <pathelement location="${commons-pool:commons-pool:jar}"/>
+ <pathelement location="${net.sf.ehcache:ehcache-core:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-log4j12:jar}"/>
<pathelement location="${org.apache.cxf:cxf-api:jar}" />
<pathelement location="${javax.ws.rs:javax.ws.rs-api:jar}" />
<pathelement location="${javax.ws.rs:javax.ws.rs-api:jar}" />
@@ -608,11 +616,11 @@
<pathelement location="${commons-codec:commons-codec:jar}" />
<pathelement location="${antlr:antlr:jar}" />
</classpath>
- <sysproperty key="version" value="${project.version}" />
+ <sysproperty key="version" value="${project.version}"/>
<sysproperty key="tenant" value="${tenant}" />
- <arg value="-buildfile" />
+ <arg value="-buildfile"/>
<arg file="./${load.file}" />
- <!-- <arg file="./src/main/resources/FortressRestServerPolicy.xml" />-->
+ <!-- <arg file="./src/main/resources/FortressRestServerPolicy.xml"/>-->
</java>
</target>
</configuration>
[2/2] directory-fortress-commander git commit: release preps
Posted by sm...@apache.org.
release preps
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/4f7c9e75
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/4f7c9e75
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/4f7c9e75
Branch: refs/heads/master
Commit: 4f7c9e75c579541731799f89895432516c232f18
Parents: 845b883
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Mar 7 10:03:07 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Mar 7 10:03:07 2016 -0600
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/4f7c9e75/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dd73d4..5830943 100755
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@
</licenses>
<scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-web.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-web.git
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git
</developerConnection>
<tag>HEAD</tag>
</scm>