You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2017/11/09 13:07:45 UTC
[1/2] directory-kerby git commit: DIRKRB-667 - Kerby and Tool
distributions are lacking required jars
Repository: directory-kerby
Updated Branches:
refs/heads/1.0.x-fixes 29a366873 -> 5ab17229e
DIRKRB-667 - Kerby and Tool distributions are lacking required jars
(cherry picked from commit cbd40a783debd3877330f7240fd41701da4aa9a7)
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/cc6acc6c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/cc6acc6c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/cc6acc6c
Branch: refs/heads/1.0.x-fixes
Commit: cc6acc6c5bb6dac702f874a32f4ae6e6bdaac91f
Parents: 29a3668
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Nov 9 13:06:17 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Nov 9 13:07:31 2017 +0000
----------------------------------------------------------------------
kerby-dist/kdc-dist/pom.xml | 50 ----------------------
kerby-dist/tool-dist/LICENSE | 5 +++
kerby-dist/tool-dist/NOTICE | 4 ++
kerby-dist/tool-dist/licenses/LICENSE-asm.txt | 28 ++++++++++++
kerby-dist/tool-dist/pom.xml | 6 ---
5 files changed, 37 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cc6acc6c/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index 8903d5c..e4cbfbf 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -40,54 +40,9 @@
</dependency>
<dependency>
<groupId>org.apache.kerby</groupId>
- <artifactId>kerb-admin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
<artifactId>kerby-asn1</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-server-api-all</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-client-api-all</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>token-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>${netty.version}</version>
- </dependency>
<!-- For KDC tool -->
<dependency>
@@ -130,10 +85,6 @@
<!-- For common and misc -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
@@ -161,7 +112,6 @@
</goals>
<configuration>
<outputDirectory>target/lib</outputDirectory>
- <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cc6acc6c/kerby-dist/tool-dist/LICENSE
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/LICENSE b/kerby-dist/tool-dist/LICENSE
index 141620c..01a92ed 100644
--- a/kerby-dist/tool-dist/LICENSE
+++ b/kerby-dist/tool-dist/LICENSE
@@ -209,3 +209,8 @@ to the terms and conditions of the following licenses.
This project bundles the SLF4J library (MIT license):
See licenses/LICENSE-slf4j.txt
+
+This project bundles the ASM library:
+
+See licenses/LICENSE-asm.txt
+
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cc6acc6c/kerby-dist/tool-dist/NOTICE
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/NOTICE b/kerby-dist/tool-dist/NOTICE
index 98f896f..c3df810 100644
--- a/kerby-dist/tool-dist/NOTICE
+++ b/kerby-dist/tool-dist/NOTICE
@@ -4,3 +4,7 @@ Copyright 2015-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This project includes/uses Nimbus JOSE + JWT
+
+Copyright 2012-2017, Connect2id Ltd.
+
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cc6acc6c/kerby-dist/tool-dist/licenses/LICENSE-asm.txt
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/licenses/LICENSE-asm.txt b/kerby-dist/tool-dist/licenses/LICENSE-asm.txt
new file mode 100644
index 0000000..5c3c207
--- /dev/null
+++ b/kerby-dist/tool-dist/licenses/LICENSE-asm.txt
@@ -0,0 +1,28 @@
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2011 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. Neither the name of the copyright holders 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 OWNER 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-kerby/blob/cc6acc6c/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index e877565..6109f65 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -43,11 +43,6 @@
<artifactId>kerb-client-api-all</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>token-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- For common and misc -->
<dependency>
@@ -83,7 +78,6 @@
</goals>
<configuration>
<outputDirectory>target/lib</outputDirectory>
- <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
[2/2] directory-kerby git commit: Typo fix
Posted by co...@apache.org.
Typo fix
(cherry picked from commit b6ff6f6c04cc4e04ff28ab5530644f27ab3d9f29)
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/5ab17229
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/5ab17229
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/5ab17229
Branch: refs/heads/1.0.x-fixes
Commit: 5ab17229e478e16017b711526139e6c36c3ca6f7
Parents: cc6acc6
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Nov 9 13:07:14 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Nov 9 13:07:39 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ab17229/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
index 76a323c..d0129e0 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
@@ -96,12 +96,12 @@ public class KdcInitTool {
if (adminKeytabFile.exists()) {
System.err.println("The kadmin keytab already exists in " + adminKeytabFile
- + ", this tool maybe have been executed already.");
+ + ", this tool may have been executed already.");
return;
}
if (protocolKeytabFile.exists()) {
System.err.println("The protocol keytab already exists in " + protocolKeytabFile
- + ", this tool maybe have been executed already.");
+ + ", this tool may have been executed already.");
return;
}