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 2015/04/16 10:18:42 UTC
[1/2] directory-fortress-realm git commit: Changed the fortress-core
groupId to be o.a.d.fortress. Commented the assembly plugin atm
Repository: directory-fortress-realm
Updated Branches:
refs/heads/master 2d851fed3 -> 32a323536
Changed the fortress-core groupId to be o.a.d.fortress. Commented the assembly plugin atm
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/a8f7f2cb
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/a8f7f2cb
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/a8f7f2cb
Branch: refs/heads/master
Commit: a8f7f2cbca32e2934588a9cd4d2cf46bf7287e34
Parents: 795b3d0
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Apr 16 10:17:09 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Apr 16 10:17:09 2015 +0200
----------------------------------------------------------------------
impl/pom.xml | 4 ++--
pom.xml | 64 +++++++++++++++++++++++++++---------------------------
proxy/pom.xml | 2 +-
3 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/a8f7f2cb/impl/pom.xml
----------------------------------------------------------------------
diff --git a/impl/pom.xml b/impl/pom.xml
index 837db5d..8f5c10c 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -21,7 +21,7 @@
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>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.fortress</groupId>
<artifactId>fortress-realm</artifactId>
<version>1.0-RC40-SNAPSHOT</version>
</parent>
@@ -34,7 +34,7 @@
</description>
<properties>
- <fortress-core.version>1.0-RC40-SNAPSHOT</fortress-core.version>
+ <fortress-core.version>1.0-RC40</fortress-core.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/a8f7f2cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6dd217b..7bcc093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,32 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ 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/xsd/maven-4.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-realm</artifactId>
<packaging>pom</packaging>
<name>Apache Fortress Realm</name>
<description>Fortress Realm is an ANSI RBAC INCITS 359 compliant policy enforcement engine.</description>
<url>http://directory.apache.org/fortress/</url>
<version>1.0-RC40-SNAPSHOT</version>
+ <inceptionYear>2007</inceptionYear>
<properties>
<projectName>apache-directory-fortress-realm</projectName>
@@ -43,7 +51,7 @@
<javadoc.version>2.9.1</javadoc.version>
<!-- Set versions for depending jars -->
- <fortress-core.version>1.0-RC40-SNAPSHOT</fortress-core.version>
+ <fortress-core.version>1.0-RC40</fortress-core.version>
<!-- Set versions for depending jars -->
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
@@ -67,12 +75,6 @@
<url>https://issues.apache.org/jira/browse/FORTRESS-CORE</url>
</issueManagement>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>15</version>
- </parent>
-
<mailingLists>
<mailingList>
<name>Apache Directory -- Fortress List</name>
@@ -123,7 +125,7 @@
<plugins>
<!-- Assemble a realm distro archive -->
- <plugin>
+ <!-- plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<executions>
@@ -140,7 +142,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugini-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -342,12 +344,11 @@
</plugins>
</build>
-<!--
<dependencyManagement>
<dependencies>
- <!– Project sub-modules dependencies –>
+ <!-- Project sub-modules dependencies -->
<dependency>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.fortress</groupId>
<artifactId>fortress-core</artifactId>
<version>${fortress-core.version}</version>
</dependency>
@@ -360,7 +361,6 @@
</dependencies>
</dependencyManagement>
--->
<dependencies>
<!-- for Java5 findbugs annotations are required in each module at compile time -->
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/a8f7f2cb/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 7a93dfd..590ba68 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -21,7 +21,7 @@
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>
- <groupId>org.apache.directory</groupId>
+ <groupId>org.apache.directory.fortress</groupId>
<artifactId>fortress-realm</artifactId>
<version>1.0-RC40-SNAPSHOT</version>
</parent>
[2/2] directory-fortress-realm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-fortress-realm
Posted by el...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-realm
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/32a32353
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/32a32353
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/32a32353
Branch: refs/heads/master
Commit: 32a32353615e886225873b628aee0bd59c0456b3
Parents: a8f7f2c 2d851fe
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Apr 16 10:18:21 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Apr 16 10:18:21 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------