directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject directory-kerby git commit: Refined tool-dist packaging
Date Wed, 15 Jul 2015 14:32:20 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/master a93737e23 -> 64e24b936


Refined tool-dist packaging


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/64e24b93
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/64e24b93
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/64e24b93

Branch: refs/heads/master
Commit: 64e24b93625101567f9446d4a90635815860eab1
Parents: a93737e
Author: drankye <kai.zheng@intel.com>
Authored: Wed Jul 15 22:31:56 2015 +0800
Committer: Drankye <drankye@gmail.com>
Committed: Wed Jul 15 22:31:56 2015 +0800

----------------------------------------------------------------------
 kerby-dist/kdc-dist/pom.xml           |  5 +++
 kerby-dist/tool-dist/pom.xml          | 65 +++++++++++++++---------------
 kerby-provider/token-provider/pom.xml |  4 +-
 3 files changed, 40 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/64e24b93/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index e94611c..9433b79 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -49,6 +49,11 @@
       <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>4.0.29.Final</version>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/64e24b93/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index 3a639a6..999a50c 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -27,6 +27,7 @@
   <packaging>pom</packaging>
 
   <dependencies>
+    <!-- For tool itself -->
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>client-tool</artifactId>
@@ -34,9 +35,31 @@
     </dependency>
     <dependency>
       <groupId>org.apache.kerby</groupId>
-      <artifactId>kdc-tool</artifactId>
+      <artifactId>kerby-asn1</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>
+
+    <!-- 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>
@@ -45,47 +68,25 @@
       <build>
         <plugins>
           <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
+                <id>copy</id>
                 <phase>package</phase>
-                <configuration>
-                  <tasks>
-                    <!--client tool-->
-                    <copy file="../../kerby-asn1/target/kerby-asn1-${project.version}.jar"
tofile="lib/kerby-asn1-${project.version}.jar"/>
-                    <copy file="../../kerby-kerb/kerb-server-api-all/target/kerb-server-api-all-${project.version}.jar"
tofile="lib/kerb-server-api-all-${project.version}.jar"/>
-                    <copy file="../../kerby-kerb/kerb-client-api-all/target/kerb-client-api-all-${project.version}.jar"
tofile="lib/kerb-client-api-all-${project.version}.jar"/>
-                    <copy file="../../kerby-tool/client-tool/target/client-tool-${project.version}.jar"
tofile="lib/client-tool-${project.version}.jar"/>
-                    <copy file="../../kerby-provider/token-provider/target/token-provider-${project.version}-jar-with-dependencies.jar"
tofile="lib/token-provider-tool-${project.version}-jar-with-dependencies.jar"/>
-                  </tasks>
-                </configuration>
                 <goals>
-                  <goal>run</goal>
+                  <goal>copy-dependencies</goal>
                 </goals>
+                <configuration>
+                  <outputDirectory>lib</outputDirectory>
+                  <excludeTransitive>true</excludeTransitive>
+                  <excludeGroupIds>junit, org.assertj</excludeGroupIds>
+                </configuration>
               </execution>
             </executions>
           </plugin>
-          <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeArtifactIds>slf4j-api</includeArtifactIds>
-                            <outputDirectory>lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
       </build>
     </profile>
   </profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/64e24b93/kerby-provider/token-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/pom.xml b/kerby-provider/token-provider/pom.xml
index 652331d..3c86360 100644
--- a/kerby-provider/token-provider/pom.xml
+++ b/kerby-provider/token-provider/pom.xml
@@ -22,9 +22,8 @@
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
-      <version>3.9</version>
+      <version>3.10</version>
     </dependency>
-
   </dependencies>
 
   <profiles>
@@ -47,6 +46,7 @@
                   <descriptorRefs>
                     <descriptorRef>jar-with-dependencies</descriptorRef>
                   </descriptorRefs>
+                  <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
               </execution>
             </executions>


Mime
View raw message