directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r897577 - in /directory/shared/trunk: all/ all/pom.xml dsml-parser/pom.xml ldap-client-api/pom.xml ldap-convert/pom.xml ldap-schema-dao/pom.xml ldap-schema-loader/pom.xml ldap-schema-manager/pom.xml pom.xml
Date Sat, 09 Jan 2010 23:31:31 GMT
Author: seelmann
Date: Sat Jan  9 23:31:31 2010
New Revision: 897577

URL: http://svn.apache.org/viewvc?rev=897577&view=rev
Log:
o cleaned up dependencies in shared
o created shared-all module


Added:
    directory/shared/trunk/all/   (with props)
    directory/shared/trunk/all/pom.xml
Modified:
    directory/shared/trunk/dsml-parser/pom.xml
    directory/shared/trunk/ldap-client-api/pom.xml
    directory/shared/trunk/ldap-convert/pom.xml
    directory/shared/trunk/ldap-schema-dao/pom.xml
    directory/shared/trunk/ldap-schema-loader/pom.xml
    directory/shared/trunk/ldap-schema-manager/pom.xml
    directory/shared/trunk/pom.xml

Propchange: directory/shared/trunk/all/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jan  9 23:31:31 2010
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+bin
+target

Added: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=897577&view=auto
==============================================================================
--- directory/shared/trunk/all/pom.xml (added)
+++ directory/shared/trunk/all/pom.xml Sat Jan  9 23:31:31 2010
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.shared</groupId>
+    <artifactId>shared-parent</artifactId>
+    <version>0.9.18-SNAPSHOT</version>
+  </parent>
+  <artifactId>shared-all</artifactId>
+  <name>Apache Directory Shared All</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1-codec</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-cursor</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-dsml-parser</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-client-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-constants</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-converter</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-jndi</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema-dao</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema-loader</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema-manager</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>app</shadedClassifierName>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+              <shadedArtifactAttached>false</shadedArtifactAttached>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>

Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=897577&r1=897576&r2=897577&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Sat Jan  9 23:31:31 2010
@@ -40,11 +40,6 @@
       <artifactId>shared-ldap</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>shared-asn1</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
     </dependency>
@@ -52,14 +47,6 @@
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>antlr</groupId>
-      <artifactId>antlr</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
   </dependencies>
 
 </project>

Modified: directory/shared/trunk/ldap-client-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/pom.xml?rev=897577&r1=897576&r2=897577&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/pom.xml (original)
+++ directory/shared/trunk/ldap-client-api/pom.xml Sat Jan  9 23:31:31 2010
@@ -41,28 +41,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-asn1</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-constants</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    
-    <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
       <version>${pom.version}</version>
@@ -75,11 +53,6 @@
     </dependency>
 
     <dependency>
-      <groupId>antlr</groupId>
-      <artifactId>antlr</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
     </dependency>

Modified: directory/shared/trunk/ldap-convert/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/pom.xml?rev=897577&r1=897576&r2=897577&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/pom.xml (original)
+++ directory/shared/trunk/ldap-convert/pom.xml Sat Jan  9 23:31:31 2010
@@ -45,11 +45,6 @@
       <artifactId>shared-ldap</artifactId>
       <version>${pom.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>antlr</groupId>
-      <artifactId>antlr</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/shared/trunk/ldap-schema-dao/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-dao/pom.xml?rev=897577&r1=897576&r2=897577&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-dao/pom.xml (original)
+++ directory/shared/trunk/ldap-schema-dao/pom.xml Sat Jan  9 23:31:31 2010
@@ -34,26 +34,6 @@
     File based schema data access object for managing schema data.
   </description>
   
-  <dependencies>
-    <dependency>
-      <artifactId>shared-ldap</artifactId>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <artifactId>shared-ldap-schema-loader</artifactId>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
-    </dependency> 
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>

Modified: directory/shared/trunk/ldap-schema-loader/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-loader/pom.xml?rev=897577&r1=897576&r2=897577&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-loader/pom.xml (original)
+++ directory/shared/trunk/ldap-schema-loader/pom.xml Sat Jan  9 23:31:31 2010
@@ -47,18 +47,6 @@
       <groupId>${pom.groupId}</groupId>
       <version>${pom.version}</version>
     </dependency> 
-
-    <dependency>
-      <artifactId>shared-asn1</artifactId>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
-    </dependency> 
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/shared/trunk/ldap-schema-manager/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-manager/pom.xml?rev=897577&r1=897576&r2=897577&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-manager/pom.xml (original)
+++ directory/shared/trunk/ldap-schema-manager/pom.xml Sat Jan  9 23:31:31 2010
@@ -36,12 +36,6 @@
   
   <dependencies>
     <dependency>
-      <artifactId>shared-ldap</artifactId>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=897577&r1=897576&r2=897577&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sat Jan  9 23:31:31 2010
@@ -50,6 +50,7 @@
   </issueManagement>
 
   <modules>
+    <module>all</module>
     <module>asn1</module>
     <module>ldap</module>
     <module>ldap-jndi</module>
@@ -109,7 +110,6 @@
         <version>1.5.4</version>
       </dependency>
 
-
       <dependency>
         <groupId>antlr</groupId>
         <artifactId>antlr</artifactId>



Mime
View raw message