You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/03/29 21:27:26 UTC
svn commit: r642600 - in /mina/ftpserver/trunk: admin-gui/pom.xml
core/pom.xml ftplet-api/pom.xml pom.xml
Author: ngn
Date: Sat Mar 29 13:27:25 2008
New Revision: 642600
URL: http://svn.apache.org/viewvc?rev=642600&view=rev
Log:
Improved POMs
* Use dependencyManagement
* Use expressions instead of hard coded values in some places
* Upgrade Maven plugins to the latest versions
Modified:
mina/ftpserver/trunk/admin-gui/pom.xml
mina/ftpserver/trunk/core/pom.xml
mina/ftpserver/trunk/ftplet-api/pom.xml
mina/ftpserver/trunk/pom.xml
Modified: mina/ftpserver/trunk/admin-gui/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/pom.xml?rev=642600&r1=642599&r2=642600&view=diff
==============================================================================
--- mina/ftpserver/trunk/admin-gui/pom.xml (original)
+++ mina/ftpserver/trunk/admin-gui/pom.xml Sat Mar 29 13:27:25 2008
@@ -6,7 +6,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-admin-gui</artifactId>
+ <artifactId>admin-gui</artifactId>
<name>Apache FtpServer Admin GUI</name>
<version>1.0.0-SNAPSHOT</version>
<scm>
@@ -35,29 +35,24 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.ftpserver</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>ftplet-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
</dependency>
</dependencies>
<reporting>
Modified: mina/ftpserver/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/pom.xml?rev=642600&r1=642599&r2=642600&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/pom.xml (original)
+++ mina/ftpserver/trunk/core/pom.xml Sat Mar 29 13:27:25 2008
@@ -1,132 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <parent>
- <artifactId>ftpserver-parent</artifactId>
- <groupId>org.apache.ftpserver</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <name>Apache FtpServer Core</name>
- <version>1.0.0-SNAPSHOT</version>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/mina/sandbox/ftpserver/trunk/core</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/mina/sandbox/ftpserver/trunk/core</developerConnection>
- <url>http://svn.apache.org/viewvc/mina/sandbox/ftpserver/trunk/core</url>
- </scm>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </testResource>
- </testResources>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftplet-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina-version}</version>
- </dependency>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <parent>
+ <artifactId>ftpserver-parent</artifactId>
+ <groupId>org.apache.ftpserver</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>core</artifactId>
+ <name>Apache FtpServer Core</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/mina/sandbox/ftpserver/trunk/core
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/mina/sandbox/ftpserver/trunk/core
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/mina/sandbox/ftpserver/trunk/core
+ </url>
+ </scm>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>ftplet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>
+ maven-project-info-reports-plugin
+ </artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: mina/ftpserver/trunk/ftplet-api/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/pom.xml?rev=642600&r1=642599&r2=642600&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/pom.xml (original)
+++ mina/ftpserver/trunk/ftplet-api/pom.xml Sat Mar 29 13:27:25 2008
@@ -18,7 +18,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: mina/ftpserver/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/pom.xml?rev=642600&r1=642599&r2=642600&view=diff
==============================================================================
--- mina/ftpserver/trunk/pom.xml (original)
+++ mina/ftpserver/trunk/pom.xml Sat Mar 29 13:27:25 2008
@@ -3,7 +3,7 @@
<parent>
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
- <version>3</version>
+ <version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ftpserver</groupId>
@@ -96,6 +96,77 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mina/sandbox/ftpserver/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/mina/sandbox/ftpserver/trunk</url>
</scm>
+
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Submodules -->
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>ftplet-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.0.0-M1</version>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+
<build>
<plugins>
<plugin>
@@ -122,25 +193,25 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.2</version>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
<downloadSources>true</downloadSources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>2.0-beta-7</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/mina/sandbox/ftpserver/tags/</tagBase>
</configuration>
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0-beta-2</version>
<executions>
<execution>
<goals>
@@ -160,6 +231,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -167,7 +239,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<executions>
<execution>
<id>create-source-jar</id>
@@ -185,7 +257,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
@@ -314,7 +386,6 @@
<module>commons-net-2</module>
<module>ftplet-api</module>
<module>core</module>
- <module>admin-gui</module>
</modules>
<distributionManagement>
@@ -328,12 +399,6 @@
<properties>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
-
- <mina-version>2.0.0-M1-SNAPSHOT</mina-version>
- <slf4j-version>1.4.3</slf4j-version>
- <log4j-version>1.2.13</log4j-version>
- <commons-logging-version>1.1</commons-logging-version>
- <junit-version>3.8.1</junit-version>
</properties>
<repositories>