directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject [2/2] directory-kerby git commit: DIRKRB-350 Clean up deps and refine package in the backends
Date Mon, 13 Jul 2015 21:20:18 GMT
DIRKRB-350 Clean up deps and refine package in the backends


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

Branch: refs/heads/master
Commit: ea347881e25c2c1b2fdad9eea2baf967db827f99
Parents: 9433362
Author: drankye <kai.zheng@intel.com>
Authored: Tue Jul 14 05:03:44 2015 +0800
Committer: Drankye <drankye@gmail.com>
Committed: Tue Jul 14 05:03:44 2015 +0800

----------------------------------------------------------------------
 kerby-backend/json-backend/pom.xml      | 29 ---------------------------
 kerby-backend/ldap-backend/pom.xml      | 29 ---------------------------
 kerby-backend/zookeeper-backend/pom.xml | 30 +---------------------------
 kerby-dist/kdc-dist/pom.xml             | 21 -------------------
 kerby-dist/tool-dist/pom.xml            |  6 ------
 5 files changed, 1 insertion(+), 114 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ea347881/kerby-backend/json-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/pom.xml b/kerby-backend/json-backend/pom.xml
index 0a5bd33..06bdbfd 100644
--- a/kerby-backend/json-backend/pom.xml
+++ b/kerby-backend/json-backend/pom.xml
@@ -61,33 +61,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>dist</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>package-all</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptorRefs>
-                    <descriptorRef>jar-with-dependencies</descriptorRef>
-                  </descriptorRefs>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ea347881/kerby-backend/ldap-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/pom.xml b/kerby-backend/ldap-backend/pom.xml
index 65353ab..7346471 100644
--- a/kerby-backend/ldap-backend/pom.xml
+++ b/kerby-backend/ldap-backend/pom.xml
@@ -100,33 +100,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>dist</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>package-all</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptorRefs>
-                    <descriptorRef>jar-with-dependencies</descriptorRef>
-                  </descriptorRefs>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ea347881/kerby-backend/zookeeper-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/pom.xml b/kerby-backend/zookeeper-backend/pom.xml
index 649948b..3a0fb75 100644
--- a/kerby-backend/zookeeper-backend/pom.xml
+++ b/kerby-backend/zookeeper-backend/pom.xml
@@ -24,6 +24,7 @@
   <artifactId>zookeeper-backend</artifactId>
   <name>Zookeeper identity backend</name>
   <description>Zookeeper identity backend</description>
+  <packaging>jar</packaging>
 
   <properties>
     <zookeeper.version>3.4.6</zookeeper.version>
@@ -58,33 +59,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>dist</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>package-all</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptorRefs>
-                    <descriptorRef>jar-with-dependencies</descriptorRef>
-                  </descriptorRefs>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ea347881/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index 809f368..e3b3530 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -39,27 +39,6 @@
       <id>dist</id>
       <build>
         <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <configuration>
-                  <tasks>
-                    <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-kdc/target/kerby-kdc-${project.version}-jar-with-dependencies.jar"
tofile="lib/kerby-kdc-${project.version}.jar"/>
-                    <copy file="../../kerby-backend/json-backend/target/json-backend-${project.version}-jar-with-dependencies.jar"
tofile="lib/json-backend-${project.version}-jar-with-dependencies.jar"/>
-                    <copy file="../../kerby-backend/ldap-backend/target/ldap-backend-${project.version}-jar-with-dependencies.jar"
tofile="lib/ldap-backend-${project.version}-jar-with-dependencies.jar"/>
-                    <copy file="../../kerby-backend/zookeeper-backend/target/zookeeper-backend-${project.version}-jar-with-dependencies.jar"
tofile="lib/zookeeper-backend-${project.version}-jar-with-dependencies.jar"/>
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ea347881/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index 7723c30..3a639a6 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -58,12 +58,6 @@
                     <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"/>
-
-                    <!--kadmin tool-->
-                    <copy file="../../kerby-tool/kdc-tool/target/kdc-tool-${project.version}.jar"
tofile="lib/kdc-tool-${project.version}.jar"/>
-                    <copy file="../../kerby-backend/json-backend/target/json-backend-${project.version}-jar-with-dependencies.jar"
tofile="lib/json-backend-${project.version}-jar-with-dependencies.jar"/>
-                    <copy file="../../kerby-backend/ldap-backend/target/ldap-backend-${project.version}-jar-with-dependencies.jar"
tofile="lib/ldap-backend-${project.version}-jar-with-dependencies.jar"/>
-                    <copy file="../../kerby-backend/zookeeper-backend/target/zookeeper-backend-${project.version}-jar-with-dependencies.jar"
tofile="lib/zookeeper-backend-${project.version}-jar-with-dependencies.jar"/>
                   </tasks>
                 </configuration>
                 <goals>


Mime
View raw message