Author: ngn
Date: Fri Apr 30 18:06:00 2010
New Revision: 939764
URL: http://svn.apache.org/viewvc?rev=939764&view=rev
Log:
Fixing invalid uses of POM properties (FTPSERVER-368)
Modified:
mina/ftpserver/trunk/core/pom.xml
mina/ftpserver/trunk/distribution/pom.xml
mina/ftpserver/trunk/examples/ftpserver-example-spring-war/pom.xml
mina/ftpserver/trunk/examples/ftpserver-osgi-ftplet-service/pom.xml
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml
mina/ftpserver/trunk/ftplet-api/pom.xml
mina/ftpserver/trunk/pom.xml
Modified: mina/ftpserver/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/pom.xml?rev=939764&r1=939763&r2=939764&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/pom.xml (original)
+++ mina/ftpserver/trunk/core/pom.xml Fri Apr 30 18:06:00 2010
@@ -67,17 +67,17 @@
<instructions>
<Bundle-SymbolicName>
${artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache
Software Foundation</Bundle-Vendor>
- <Export-Package>
org.apache.ftpserver;version=${pom.version},
-
org.apache.ftpserver.command;version=${pom.version},
-
org.apache.ftpserver.config.spring;version=${pom.version},
-
org.apache.ftpserver.filesystem.nativefs;version=${pom.version},
-
org.apache.ftpserver.ftpletcontainer;version=${pom.version},
-
org.apache.ftpserver.ipfilter;version=${pom.version},
-
org.apache.ftpserver.listener;version=${pom.version},
-
org.apache.ftpserver.main;version=${pom.version},
-
org.apache.ftpserver.message;version=${pom.version},
-
org.apache.ftpserver.ssl;version=${pom.version},
-
org.apache.ftpserver.usermanager;version=${pom.version}
+ <Export-Package>
org.apache.ftpserver;version=${project.version},
+
org.apache.ftpserver.command;version=${project.version},
+
org.apache.ftpserver.config.spring;version=${project.version},
+
org.apache.ftpserver.filesystem.nativefs;version=${project.version},
+
org.apache.ftpserver.ftpletcontainer;version=${project.version},
+
org.apache.ftpserver.ipfilter;version=${project.version},
+
org.apache.ftpserver.listener;version=${project.version},
+
org.apache.ftpserver.main;version=${project.version},
+
org.apache.ftpserver.message;version=${project.version},
+
org.apache.ftpserver.ssl;version=${project.version},
+
org.apache.ftpserver.usermanager;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.ftpserver.command.impl,
org.apache.ftpserver.command.impl.listing,
@@ -130,7 +130,7 @@
</build>
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>ftplet-api</artifactId>
</dependency>
<dependency>
Modified: mina/ftpserver/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/pom.xml?rev=939764&r1=939763&r2=939764&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/pom.xml (original)
+++ mina/ftpserver/trunk/distribution/pom.xml Fri Apr 30 18:06:00 2010
@@ -134,8 +134,8 @@
<tasks>
<echo>Downloading Manual</echo>
<mkdir dir="${project.build.directory}/site"></mkdir>
- <get
src="http://people.apache.org/~ngn/ftpserver/docs/ftpserver.zip";
dest="${project.build.directory}/${pom.artifactId}-docs.zip"></get>
- <unzip
src="${project.build.directory}/${pom.artifactId}-docs.zip"
dest="${project.build.directory}/docs"></unzip>
+ <get
src="http://people.apache.org/~ngn/ftpserver/docs/ftpserver.zip";
dest="${project.build.directory}/${project.artifactId}-docs.zip"></get>
+ <unzip
src="${project.build.directory}/${project.artifactId}-docs.zip"
dest="${project.build.directory}/docs"></unzip>
</tasks>
</configuration>
</execution>
Modified: mina/ftpserver/trunk/examples/ftpserver-example-spring-war/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/examples/ftpserver-example-spring-war/pom.xml?rev=939764&r1=939763&r2=939764&view=diff
==============================================================================
--- mina/ftpserver/trunk/examples/ftpserver-example-spring-war/pom.xml
(original)
+++ mina/ftpserver/trunk/examples/ftpserver-example-spring-war/pom.xml Fri Apr
30 18:06:00 2010
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: mina/ftpserver/trunk/examples/ftpserver-osgi-ftplet-service/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/examples/ftpserver-osgi-ftplet-service/pom.xml?rev=939764&r1=939763&r2=939764&view=diff
==============================================================================
--- mina/ftpserver/trunk/examples/ftpserver-osgi-ftplet-service/pom.xml
(original)
+++ mina/ftpserver/trunk/examples/ftpserver-osgi-ftplet-service/pom.xml Fri Apr
30 18:06:00 2010
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftplet-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml?rev=939764&r1=939763&r2=939764&view=diff
==============================================================================
--- mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml
(original)
+++ mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml Fri Apr
30 18:06:00 2010
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
Modified: mina/ftpserver/trunk/ftplet-api/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/pom.xml?rev=939764&r1=939763&r2=939764&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/pom.xml (original)
+++ mina/ftpserver/trunk/ftplet-api/pom.xml Fri Apr 30 18:06:00 2010
@@ -55,7 +55,7 @@
<instructions>
<Bundle-SymbolicName>
${artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache
Software Foundation</Bundle-Vendor>
- <Export-Package>
org.apache.ftpserver.ftplet;version=${pom.version}</Export-Package>
+ <Export-Package>
org.apache.ftpserver.ftplet;version=${project.version}</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: mina/ftpserver/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/pom.xml?rev=939764&r1=939763&r2=939764&view=diff
==============================================================================
--- mina/ftpserver/trunk/pom.xml (original)
+++ mina/ftpserver/trunk/pom.xml Fri Apr 30 18:06:00 2010
@@ -139,15 +139,15 @@
<dependencies>
<!-- Submodules -->
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>ftplet-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>ftpserver-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -452,6 +452,6 @@
<properties>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
- <ftpserver.version>${pom.version}</ftpserver.version>
+ <ftpserver.version>${project.version}</ftpserver.version>
</properties>
</project>
