You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/03/02 15:17:50 UTC
[2/3] directory-fortress-enmasse git commit: [maven-release-plugin]
rollback the release of 1.0-RC42
[maven-release-plugin] rollback the release of 1.0-RC42
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/96b35da7
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/96b35da7
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/96b35da7
Branch: refs/heads/master
Commit: 96b35da72e099da87cebfe6e838d09be1ac465df
Parents: 84a088b
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Mar 2 15:10:34 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Mar 2 15:10:34 2016 +0100
----------------------------------------------------------------------
pom.xml | 70 ++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 40 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/96b35da7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 310fc66..acf2eaf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,10 @@
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>
@@ -30,7 +33,7 @@
<groupId>org.apache.directory.fortress</groupId>
<artifactId>fortress-rest</artifactId>
<packaging>war</packaging>
- <version>1.0-RC42</version>
+ <version>1.0-RC42-SNAPSHOT</version>
<name>Apache Fortress Rest</name>
<url>http://directory.apache.org/fortress/</url>
<description>Fortress Rest provides a RESTful implementation of Fortress' ANSI RBAC INCITS 359 engine</description>
@@ -47,7 +50,7 @@
<developerConnection>
scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-rest.git
</developerConnection>
- <tag>1.0-RC42</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -419,37 +422,44 @@
<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="${antlr:antlr: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="${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>