directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1188684 - /directory/shared/trunk/all/pom.xml
Date Tue, 25 Oct 2011 14:57:07 GMT
Author: pamarcelot
Date: Tue Oct 25 14:57:06 2011
New Revision: 1188684

URL: http://svn.apache.org/viewvc?rev=1188684&view=rev
Log:
Fix for DIRAPI-57 (Sources package should be available for the shaded module 'shared-all').
Moved back to a 'jar' packaging type, instead of 'bundle' which didn't make sense for this
module.

Modified:
    directory/shared/trunk/all/pom.xml

Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=1188684&r1=1188683&r2=1188684&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Tue Oct 25 14:57:06 2011
@@ -27,7 +27,7 @@
   
   <artifactId>shared-all</artifactId>
   <name>Apache Directory Shared All</name>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
@@ -120,44 +120,17 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <shadedGroupFilter>org.apache.directory</shadedGroupFilter>
+              <artifactSet>
+                <includes>
+                  <include>${project.groupId}</include>
+                </includes>
+              </artifactSet>
               <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
-              <shadedArtifactAttached>false</shadedArtifactAttached>
+              <createSourcesJar>true</createSourcesJar>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <inherited>true</inherited>
-        <extensions>true</extensions>
-        <configuration>
-          <manifestLocation>META-INF</manifestLocation>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.all</Bundle-SymbolicName>
-            <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-            <Export-Package>
-              org.apache.directory.shared.ldap.codec.api
-            </Export-Package>
-            <Bundle-Activator>
-              org.apache.directory.shared.ldap.codec.osgi.DefaultActivator
-            </Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>



Mime
View raw message