You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/07/15 16:11:22 UTC
[1/2] directory-kerby git commit: Refined kdc-dist package
Repository: directory-kerby
Updated Branches:
refs/heads/master bba567d37 -> a93737e23
Refined kdc-dist package
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/c2fa7cc5
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/c2fa7cc5
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/c2fa7cc5
Branch: refs/heads/master
Commit: c2fa7cc578c5c926691151bda6d464cad44c5376
Parents: 2b72ce3
Author: drankye <ka...@intel.com>
Authored: Wed Jul 15 22:10:32 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Wed Jul 15 22:10:32 2015 +0800
----------------------------------------------------------------------
kerby-backend/json-backend/pom.xml | 7 +---
kerby-dist/kdc-dist/pom.xml | 72 ++++++++++++++++++++++++++++++++-
kerby-kdc/pom.xml | 15 +++++++
3 files changed, 87 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c2fa7cc5/kerby-backend/json-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/pom.xml b/kerby-backend/json-backend/pom.xml
index 06bdbfd..d0150e3 100644
--- a/kerby-backend/json-backend/pom.xml
+++ b/kerby-backend/json-backend/pom.xml
@@ -26,10 +26,6 @@
<name>Json identity backend</name>
<description>Json identity backend</description>
- <properties>
- <json.version>2.3.1</json.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.kerby</groupId>
@@ -51,8 +47,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${json.version}</version>
- <scope>compile</scope>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c2fa7cc5/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index 829740e..e94611c 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -27,6 +27,7 @@
<packaging>pom</packaging>
<dependencies>
+ <!-- For KDC itself -->
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kdc</artifactId>
@@ -34,24 +35,92 @@
</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>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+
+ <!-- For KDC tool -->
+ <dependency>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>kdc-tool</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- For Zookeeper backend -->
+ <dependency>
+ <groupId>org.apache.kerby</groupId>
<artifactId>zookeeper-backend</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.0.Final</version>
+ </dependency>
+
+ <!-- For json backend -->
+ <dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>json-backend</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+
+ <!-- For common and misc -->
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
</dependencies>
<profiles>
@@ -71,7 +140,8 @@
</goals>
<configuration>
<outputDirectory>lib</outputDirectory>
- <excludeTransitive>false</excludeTransitive>
+ <excludeTransitive>true</excludeTransitive>
+ <excludeGroupIds>junit, org.assertj</excludeGroupIds>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c2fa7cc5/kerby-kdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc/pom.xml b/kerby-kdc/pom.xml
index f388b93..8845e0d 100644
--- a/kerby-kdc/pom.xml
+++ b/kerby-kdc/pom.xml
@@ -43,6 +43,21 @@
<version>4.0.29.Final</version>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
[2/2] directory-kerby git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-kerby
Posted by dr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a93737e2
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a93737e2
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a93737e2
Branch: refs/heads/master
Commit: a93737e23c0df32869887d2f32d73ed0eed7d9e4
Parents: c2fa7cc bba567d
Author: Drankye <dr...@gmail.com>
Authored: Wed Jul 15 22:11:03 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Wed Jul 15 22:11:03 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java | 3 ++-
.../org/apache/kerby/kerberos/provider/token/JwtTokenEncoder.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------