directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject directory-fortress-core git commit: Removed the LICENSE.cmdLineParser.txt file, the content is now moved to LICENSE, updated the pom.xml to use a different group
Date Thu, 09 Apr 2015 12:58:22 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 1197cbc2b -> c3eb0a844


Removed the LICENSE.cmdLineParser.txt file, the content is now moved to LICENSE, updated the
pom.xml to use a different group


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/c3eb0a84
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/c3eb0a84
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/c3eb0a84

Branch: refs/heads/master
Commit: c3eb0a8443729e5b9b2179297201e8521ae0ff8a
Parents: 1197cbc
Author: Emmanuel Lécharny <elecharny@symas.com>
Authored: Thu Apr 9 14:58:11 2015 +0200
Committer: Emmanuel Lécharny <elecharny@symas.com>
Committed: Thu Apr 9 14:58:11 2015 +0200

----------------------------------------------------------------------
 LICENSE                   | 35 +++++++++++++++++++++++++++++++++++
 LICENSE.cmdLineParser.txt | 32 --------------------------------
 NOTICE                    | 23 ++---------------------
 pom.xml                   |  1 +
 4 files changed, 38 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c3eb0a84/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 37a8cc9..bbfee4f 100755
--- a/LICENSE
+++ b/LICENSE
@@ -175,4 +175,39 @@
 
    END OF TERMS AND CONDITIONS
 
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+License for the cmdLineParser code by Steve Purcell, Vidar Holen, Michal Ceresna, 
+Ewan Mellor and penSec.IT UG
+
+/**
+ * Copyright (c) 2001-2012 Steve Purcell.
+ * Copyright (c) 2002      Vidar Holen.
+ * Copyright (c) 2002      Michal Ceresna.
+ * Copyright (c) 2005      Ewan Mellor.
+ * Copyright (c) 2010-2012 penSec.IT UG (haftungsbeschränkt).
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer. Redistributions in binary
+ * form must reproduce the above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or other materials provided
+ * with the distribution. Neither the name of the copyright holder nor the names
+ * of its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c3eb0a84/LICENSE.cmdLineParser.txt
----------------------------------------------------------------------
diff --git a/LICENSE.cmdLineParser.txt b/LICENSE.cmdLineParser.txt
deleted file mode 100644
index d864f33..0000000
--- a/LICENSE.cmdLineParser.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2001-2012 Steve Purcell.
- * Copyright (c) 2002      Vidar Holen.
- * Copyright (c) 2002      Michal Ceresna.
- * Copyright (c) 2005      Ewan Mellor.
- * Copyright (c) 2010-2012 penSec.IT UG (haftungsbeschränkt).
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer. Redistributions in binary
- * form must reproduce the above copyright notice, this list of conditions and
- * the following disclaimer in the documentation and/or other materials provided
- * with the distribution. Neither the name of the copyright holder nor the names
- * of its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c3eb0a84/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 812cb22..336a22c 100755
--- a/NOTICE
+++ b/NOTICE
@@ -1,24 +1,5 @@
-#
-#   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.
-#
 Apache Directory Fortress Identity Access Management SDK
-
-The purpose of this NOTICE.txt file is to include notices that are required by the copyright
owner and their license. Some of the accompanying products have an attribution requirement,
so see below. Other accompanying products do not require attribution, so are not listed.
+Copyright [2015] The Apache Software Foundation
 
 This product includes software developed by:
 
@@ -28,4 +9,4 @@ This product includes software developed by:
 4. The Java Community Process (http://www.jcp.org/)
 5. SLF4J (http://www.slf4j.org/)
 6. Terracotta (http://www.terracotta.org/TPL)
-7. Some code by Steve Purcell, Vidar Holen, Michal Ceresna, Ewan Mellor and penSec.IT UG
(see LICENSE.cmlLineParser.txt)
+7. Some code by Steve Purcell, Vidar Holen, Michal Ceresna, Ewan Mellor and penSec.IT UG
(see LICENSE)

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c3eb0a84/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8fe3e11..530d696 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
     <relativePath />
   </parent>
 
+  <groupId>org.apache.directory.fortress</groupId>
   <artifactId>fortress-core</artifactId>
   <packaging>jar</packaging>
   <name>Apache Fortress Core</name>


Mime
View raw message