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 2015/04/17 16:58:54 UTC
directory-fortress-commander git commit: FC-91 - Use directory
project parent to pom
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master d0c170194 -> 03b42f47d
FC-91 - Use directory project parent to pom
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/03b42f47
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/03b42f47
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/03b42f47
Branch: refs/heads/master
Commit: 03b42f47d0c0be3f0e5bb8e475ff47c119effc16
Parents: d0c1701
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Apr 17 09:51:06 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Apr 17 09:51:06 2015 -0500
----------------------------------------------------------------------
pom.xml | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/03b42f47/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f50313c..d1d886d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,20 +20,22 @@
<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>
- <groupId>org.apache.directory</groupId>
+
+ <parent>
+ <groupId>org.apache.directory.project</groupId>
+ <artifactId>project</artifactId>
+ <version>34</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.directory.fortress</groupId>
<artifactId>fortress-web</artifactId>
<packaging>war</packaging>
<version>1.0-RC40-SNAPSHOT</version>
<name>Apache Fortress Web</name>
- <url>http://directory.apache.org/foress/</url>
+ <url>http://directory.apache.org/fortress/</url>
<description>Fortress Web is an ANSI RBAC INCITS 359 compliant administrative UI</description>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>15</version>
- </parent>
-
<licenses>
<license>
<name>Apache License 2.0</name>
@@ -97,11 +99,11 @@
<dependencies>
<!-- Fortress Realm pulls in Fortress Core for RBAC 'CRUD' & policy enforcement apis. -->
<dependency>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.fortress</groupId>
<artifactId>fortress-realm-impl</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -526,7 +528,7 @@
</connectors>
</configuration>
</plugin>
-
+
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -537,23 +539,23 @@
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">
+ 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-core: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-jdk1.5: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}"/>
@@ -570,7 +572,7 @@
<sysproperty key="tenant" value="HOME"/>
<arg value="-buildfile"/>
<arg file="./${load.file}" />
- <!--<arg file="./src/main/resources/FortressWebDemoUsers.xml"/>-->
+ <!-- <arg file="./src/main/resources/FortressRestServerPolicy.xml"/>-->
</java>
</target>
</configuration>
@@ -580,6 +582,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>