Author: pamarcelot
Date: Wed Sep 24 01:28:45 2008
New Revision: 698462
URL: http://svn.apache.org/viewvc?rev=698462&view=rev
Log:
Removed Manifest from SVN. Added generation of the Manifest in the pom.xml. Removed misuse
of a dependencyManagement section.
Removed:
directory/studio/trunk/apacheds/META-INF/MANIFEST.MF
Modified:
directory/studio/trunk/apacheds/pom.xml
Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=698462&r1=698461&r2=698462&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Wed Sep 24 01:28:45 2008
@@ -58,7 +58,7 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<skip>false</skip>
- <pde>true</pde>
+ <pde>true</pde>
<additionalProjectnatures>
<projectnature>org.eclipse.pde.PluginNature</projectnature>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
@@ -93,6 +93,45 @@
</archive>
</configuration>
</plugin>
+ <!-- MANIFEST.MF Generation -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Bundle-Activator>org.apache.directory.studio.apacheds.ApacheDsPlugin</Bundle-Activator>
+ <Eclipse-RegisterBuddy>org.apache.directory.studio.jars</Eclipse-RegisterBuddy>
+ <Require-Bundle>org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.console,
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.jdt.launching,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.apache.directory.studio.jars,
+ org.apache.directory.studio.apacheds.configuration,
+ org.apache.directory.studio.connection.core;resolution:=optional
+ </Require-Bundle>
+ <Export-Package>!*</Export-Package>
+ <Import-Package>!*</Import-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- Copying Apache Directory Server bundled dependencies -->
<plugin>
@@ -111,186 +150,232 @@
<artifactItem>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
+ <version>2.7.7</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-extract</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-partition</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-btree-base</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-entry</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-shared</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-store</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-kerberos-shared</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds-launcher</artifactId>
+ <version>1.2.0</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-changepw</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ntp</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-shared</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-bootstrap</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-extras</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-registries</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-xml</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-utils</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xbean-spring</artifactId>
+ <version>1.5.3</version>
</artifactItem>
<artifactItem>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
+ <version>1.1</version>
</artifactItem>
<artifactItem>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <version>3.2</version>
</artifactItem>
<artifactItem>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
+ <version>1.0.1</version>
</artifactItem>
<artifactItem>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>2.3</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-bootstrappers</artifactId>
+ <version>1.1.3</version>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.3</version>
</artifactItem>
<artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>1.2.14</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
+ <version>1.1.6</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
+ <version>1.1.6</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1</artifactId>
+ <version>0.9.11</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-codec</artifactId>
+ <version>0.9.11</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-bouncycastle-reduced</artifactId>
+ <version>0.9.11</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
+ <version>0.9.11</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-constants</artifactId>
+ <version>0.9.11</version>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>1.4.3</version>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <version>2.0.6</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>2.0.6</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <version>2.0.6</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
+ <version>3.3</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -300,287 +385,6 @@
</plugins>
</build>
- <!-- Special dependecyManagement tag used for bundled
- Apache Directory Server dependencies only -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-bootstrap-extract</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-bootstrap-partition</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-btree-base</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-constants</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-entry</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-shared</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-jdbm</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-jdbm-store</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-kerberos-shared</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.installers</groupId>
- <artifactId>apacheds-noarch-installer</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-changepw</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-dns</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-kerberos</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-ldap</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-ldap</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-ntp</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-shared</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-schema-bootstrap</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-schema-extras</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-schema-registries</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-jndi</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-xml</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-utils</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-xbean-spring</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.daemon</groupId>
- <artifactId>daemon-bootstrappers</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>1.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- <version>1.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
- <version>0.9.11</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-codec</artifactId>
- <version>0.9.11</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-bouncycastle-reduced</artifactId>
- <version>0.9.11</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap</artifactId>
- <version>0.9.11</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-constants</artifactId>
- <version>0.9.11</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.6</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0.6</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.6</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>3.3</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jmx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<!-- Libraries dependencies -->
<dependency>
|