You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/09 15:41:07 UTC
svn commit: r1006160 - in /directory: apacheds-manuals/trunk/
apacheds-manuals/trunk/src/main/assembly/ apacheds/trunk/osgi/
apacheds/trunk/syncrepl/ shared/trunk/
Author: elecharny
Date: Sat Oct 9 13:41:06 2010
New Revision: 1006160
URL: http://svn.apache.org/viewvc?rev=1006160&view=rev
Log:
fixed some maven warnings
Modified:
directory/apacheds-manuals/trunk/pom.xml
directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml
directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml
directory/apacheds/trunk/osgi/pom.xml
directory/apacheds/trunk/syncrepl/pom.xml
directory/shared/trunk/pom.xml
Modified: directory/apacheds-manuals/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/pom.xml?rev=1006160&r1=1006159&r2=1006160&view=diff
==============================================================================
--- directory/apacheds-manuals/trunk/pom.xml (original)
+++ directory/apacheds-manuals/trunk/pom.xml Sat Oct 9 13:41:06 2010
@@ -131,17 +131,17 @@ under the License.
<configuration>
<!-- per execution configuration -->
<sourceDirectory>${basedir}/src/basic-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/html</targetDirectory>
+ <targetDirectory>${project.build.directory}/docbook/manuals/basic-user-guide-${project.version}/html</targetDirectory>
<postProcess>
<!-- Copy the images -->
- <copy todir="${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/html/images">
+ <copy todir="${project.build.directory}/docbook/manuals/basic-user-guide-${project.version}/html/images">
<fileset dir="${basedir}/src/basic-user-guide/images" />
</copy>
- <copy todir="${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/html/images">
+ <copy todir="${project.build.directory}/docbook/manuals/basic-user-guide-${project.version}/html/images">
<fileset dir="${project.build.directory}/docbook-xsl/docbook/images" />
</copy>
<!-- Copy the data -->
- <copy todir="${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/html/data">
+ <copy todir="${project.build.directory}/docbook/manuals/basic-user-guide-${project.version}/html/data">
<fileset dir="${basedir}/src/basic-user-guide/data" />
</copy>
</postProcess>
@@ -156,7 +156,7 @@ under the License.
<configuration>
<!-- per execution configuration -->
<sourceDirectory>${basedir}/src/basic-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/pdf</targetDirectory>
+ <targetDirectory>${project.build.directory}/docbook/manuals/basic-user-guide-${project.version}/pdf</targetDirectory>
<imgSrcPath>${basedir}/src/basic-user-guide/</imgSrcPath>
<admonGraphicsPath>${project.build.directory}/docbook-xsl/docbook/images/</admonGraphicsPath>
</configuration>
@@ -170,17 +170,17 @@ under the License.
<configuration>
<!-- per execution configuration -->
<sourceDirectory>${basedir}/src/advanced-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html</targetDirectory>
+ <targetDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/html</targetDirectory>
<postProcess>
<!-- Copy the images -->
- <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html/images">
+ <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/html/images">
<fileset dir="${basedir}/src/advanced-user-guide/images" />
</copy>
- <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html/images">
+ <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/html/images">
<fileset dir="${project.build.directory}/docbook-xsl/docbook/images" />
</copy>
<!-- Copy the data -->
- <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html/data">
+ <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/html/data">
<fileset dir="${basedir}/src/advanced-user-guide/data" />
</copy>
</postProcess>
@@ -195,7 +195,7 @@ under the License.
<configuration>
<!-- per execution configuration -->
<sourceDirectory>${basedir}/src/advanced-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/pdf</targetDirectory>
+ <targetDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/pdf</targetDirectory>
<imgSrcPath>${basedir}/src/advanced-user-guide/</imgSrcPath>
<admonGraphicsPath>${project.build.directory}/docbook-xsl/docbook/images/</admonGraphicsPath>
</configuration>
@@ -212,11 +212,11 @@ under the License.
<goal>assembly</goal>
</goals>
<configuration>
- <finalName>basic-user-guide-${pom.version}</finalName>
+ <finalName>basic-user-guide-${project.version}</finalName>
<descriptors>
<descriptor>${basedir}/src/main/assembly/basic-user-guide.xml</descriptor>
</descriptors>
- <outputDirectory>${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/zip</outputDirectory>
+ <outputDirectory>${project.build.directory}/docbook/manuals/basic-user-guide-${project.version}/zip</outputDirectory>
</configuration>
</execution>
<execution>
@@ -226,11 +226,11 @@ under the License.
<goal>assembly</goal>
</goals>
<configuration>
- <finalName>advanced-user-guide-${pom.version}</finalName>
+ <finalName>advanced-user-guide-${project.version}</finalName>
<descriptors>
<descriptor>${basedir}/src/main/assembly/advanced-user-guide.xml</descriptor>
</descriptors>
- <outputDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/zip</outputDirectory>
+ <outputDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/zip</outputDirectory>
</configuration>
</execution>
</executions>
Modified: directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml?rev=1006160&r1=1006159&r2=1006160&view=diff
==============================================================================
--- directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml (original)
+++ directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml Sat Oct 9 13:41:06 2010
@@ -24,11 +24,11 @@ under the License.
</formats>
<fileSets>
<fileSet>
- <directory>${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html</directory>
+ <directory>${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/html</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml?rev=1006160&r1=1006159&r2=1006160&view=diff
==============================================================================
--- directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml (original)
+++ directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml Sat Oct 9 13:41:06 2010
@@ -24,11 +24,11 @@ under the License.
</formats>
<fileSets>
<fileSet>
- <directory>${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/html</directory>
+ <directory>${project.build.directory}/docbook/manuals/basic-user-guide-${project.version}/html</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: directory/apacheds/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/osgi/pom.xml?rev=1006160&r1=1006159&r2=1006160&view=diff
==============================================================================
--- directory/apacheds/trunk/osgi/pom.xml (original)
+++ directory/apacheds/trunk/osgi/pom.xml Sat Oct 9 13:41:06 2010
@@ -31,7 +31,7 @@
<packaging>bundle</packaging>
<properties>
- <apache.directory.version>${pom.version}</apache.directory.version>
+ <apache.directory.version>${project.version}</apache.directory.version>
<xbean.version>3.5</xbean.version>
<commons-collections.version>3.2.1</commons-collections.version>
</properties>
@@ -40,32 +40,32 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ntp</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-dhcp</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-interceptor-kerberos</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -176,7 +176,7 @@
<Bundle-Description>Apache Directory Server - An LDAP v3 Server implementation</Bundle-Description>
<Bundle-SymbolicName>org.apache.directory.server</Bundle-SymbolicName>
<Export-Package>jdbm.*,
- org.apache.directory.*;version=${pom.version},
+ org.apache.directory.*;version=${project.version},
'=META-INF.services.org.apache.xbean.spring.http.apacheds.org.config'
</Export-Package>
<Import-Package>
Modified: directory/apacheds/trunk/syncrepl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/syncrepl/pom.xml?rev=1006160&r1=1006159&r2=1006160&view=diff
==============================================================================
--- directory/apacheds/trunk/syncrepl/pom.xml (original)
+++ directory/apacheds/trunk/syncrepl/pom.xml Sat Oct 9 13:41:06 2010
@@ -52,25 +52,25 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-partition</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-ldif-partition</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1006160&r1=1006159&r2=1006160&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sat Oct 9 13:41:06 2010
@@ -32,7 +32,7 @@
<properties>
<projectName>ApacheDS-Shared</projectName>
- <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/shared/gen-docs/${version}/</distMgmtSiteUrl>
+ <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/shared/gen-docs/${project.version}/</distMgmtSiteUrl>
<!-- Set versions for depending projects -->
<skin.version>1.0.2-SNAPSHOT</skin.version>