Fixing invalid uses of POM properties (FTPSERVER-368)
git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/trunk@939764 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/pom.xml b/core/pom.xml
index 85c2328..ca5f72d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index b2073c5..9287289 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -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>
diff --git a/examples/ftpserver-example-spring-war/pom.xml b/examples/ftpserver-example-spring-war/pom.xml
index 65468d7..a2afe68 100644
--- a/examples/ftpserver-example-spring-war/pom.xml
+++ b/examples/ftpserver-example-spring-war/pom.xml
@@ -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>
diff --git a/examples/ftpserver-osgi-ftplet-service/pom.xml b/examples/ftpserver-osgi-ftplet-service/pom.xml
index 9ac1450..33aa223 100644
--- a/examples/ftpserver-osgi-ftplet-service/pom.xml
+++ b/examples/ftpserver-osgi-ftplet-service/pom.xml
@@ -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>
diff --git a/examples/ftpserver-osgi-spring-service/pom.xml b/examples/ftpserver-osgi-spring-service/pom.xml
index 4af4eec..7dce13f 100644
--- a/examples/ftpserver-osgi-spring-service/pom.xml
+++ b/examples/ftpserver-osgi-spring-service/pom.xml
@@ -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>
diff --git a/ftplet-api/pom.xml b/ftplet-api/pom.xml
index c75b175..407c578 100644
--- a/ftplet-api/pom.xml
+++ b/ftplet-api/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 1b0a233..874f01f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
