Repository: mina-ftpserver Updated Branches: refs/heads/master ab08fb5c2 -> 50e47f44f
[maven-release-plugin] prepare release ftpserver-parent-1.1.0 Project: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/commit/50e47f44 Tree: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/tree/50e47f44 Diff: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/diff/50e47f44 Branch: refs/heads/master Commit: 50e47f44f642153f23b51967eab09eae2c372b70 Parents: ab08fb5 Author: Emmanuel Lécharny <elecha...@symas.com> Authored: Mon Oct 24 11:57:57 2016 +0200 Committer: Emmanuel Lécharny <elecha...@symas.com> Committed: Mon Oct 24 11:57:57 2016 +0200 ---------------------------------------------------------------------- core/pom.xml | 12 +++++------- distribution/pom.xml | 18 ++++++++---------- examples/ftpserver-example-spring-war/pom.xml | 9 +++------ examples/ftpserver-osgi-ftplet-service/pom.xml | 9 +++------ examples/ftpserver-osgi-spring-service/pom.xml | 9 +++------ examples/pom.xml | 6 +++--- ftplet-api/pom.xml | 10 ++++------ pom.xml | 9 +++------ 8 files changed, 32 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 1c8c163..14a2d9c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -13,19 +13,16 @@ the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>ftpserver-parent</artifactId> <groupId>org.apache.ftpserver</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ftpserver-core</artifactId> <name>Apache FtpServer Core</name> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <packaging>bundle</packaging> <scm> <connection> @@ -35,6 +32,7 @@ scm:svn:https://svn.apache.org/repos/asf/mina/ftpserver/trunk/core </developerConnection> <url> http://svn.apache.org/viewvc/mina/ftpserver/trunk/core</url> + <tag>ftpserver-parent-1.1.0</tag> </scm> <build> <resources> @@ -147,7 +145,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 502f64e..7f74e72 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -18,26 +18,24 @@ under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>ftpserver-parent</artifactId> <groupId>org.apache.ftpserver</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ftpserver</groupId> <artifactId>ftpserver</artifactId> <packaging>pom</packaging> <name>Apache FtpServer</name> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/mina/ftpserver/trunk/distribution</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/mina/ftpserver/trunk/distribution</developerConnection> <url>http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution</url> + <tag>ftpserver-parent-1.1.0</tag> </scm> <build> @@ -141,9 +139,9 @@ <configuration> <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}/${project.artifactId}-docs.zip"></get> - <unzip src="${project.build.directory}/${project.artifactId}-docs.zip" dest="${project.build.directory}/docs"></unzip> + <mkdir dir="${project.build.directory}/site" /> + <get src="http://people.apache.org/~ngn/ftpserver/docs/ftpserver.zip"; dest="${project.build.directory}/${project.artifactId}-docs.zip" /> + <unzip src="${project.build.directory}/${project.artifactId}-docs.zip" dest="${project.build.directory}/docs" /> </tasks> </configuration> </execution> @@ -157,7 +155,7 @@ <configuration> <tasks> <echo>Copying Javadocs</echo> - <mkdir dir="${project.build.directory}/api"></mkdir> + <mkdir dir="${project.build.directory}/api" /> <copy todir="${project.build.directory}/api"> <fileset dir="../target/site/apidocs" /> </copy> http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/examples/ftpserver-example-spring-war/pom.xml ---------------------------------------------------------------------- diff --git a/examples/ftpserver-example-spring-war/pom.xml b/examples/ftpserver-example-spring-war/pom.xml index 19180c6..20fddbe 100644 --- a/examples/ftpserver-example-spring-war/pom.xml +++ b/examples/ftpserver-example-spring-war/pom.xml @@ -13,14 +13,11 @@ the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>ftpserver-parent</artifactId> <groupId>org.apache.ftpserver</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +26,7 @@ <artifactId>ftpserver-spring-war</artifactId> <name>FtpServer Spring web project example</name> <packaging>war</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/examples/ftpserver-osgi-ftplet-service/pom.xml ---------------------------------------------------------------------- diff --git a/examples/ftpserver-osgi-ftplet-service/pom.xml b/examples/ftpserver-osgi-ftplet-service/pom.xml index 87ab724..7903aa3 100644 --- a/examples/ftpserver-osgi-ftplet-service/pom.xml +++ b/examples/ftpserver-osgi-ftplet-service/pom.xml @@ -13,15 +13,12 @@ the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <description>Simple example where an Ftplet is published as a OSGi service. Another bundle, using the white-board pattern can locate this and plug it into a running server.</description> <parent> <artifactId>ftpserver-parent</artifactId> <groupId>org.apache.ftpserver</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -30,7 +27,7 @@ <artifactId>ftpserver-osgi-ftplet-service</artifactId> <name>FtpServer OSGi Ftplet service example</name> <packaging>bundle</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/examples/ftpserver-osgi-spring-service/pom.xml ---------------------------------------------------------------------- diff --git a/examples/ftpserver-osgi-spring-service/pom.xml b/examples/ftpserver-osgi-spring-service/pom.xml index 9524f98..964e9e1 100644 --- a/examples/ftpserver-osgi-spring-service/pom.xml +++ b/examples/ftpserver-osgi-spring-service/pom.xml @@ -13,15 +13,12 @@ the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <description>Spring-DM based OSGi bundle that starts an FtpServer and looks for a published Ftplet service.</description> <parent> <artifactId>ftpserver-parent</artifactId> <groupId>org.apache.ftpserver</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -30,7 +27,7 @@ <artifactId>ftpserver-osgi-spring-service</artifactId> <name>FtpServer OSGi Spring-DM example</name> <packaging>bundle</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index f6c0fd3..6c94536 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,18 +17,18 @@ specific language governing permissions and limitations under the License. --> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <artifactId>ftpserver-parent</artifactId> <groupId>org.apache.ftpserver</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ftpserver</groupId> <artifactId>ftpserver-examples</artifactId> <packaging>pom</packaging> <name>Apache FtpServer Examples</name> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <modules> <module>ftpserver-example-spring-war</module> <module>ftpserver-osgi-ftplet-service</module> http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/ftplet-api/pom.xml ---------------------------------------------------------------------- diff --git a/ftplet-api/pom.xml b/ftplet-api/pom.xml index d6a6e66..1c11a4f 100644 --- a/ftplet-api/pom.xml +++ b/ftplet-api/pom.xml @@ -13,20 +13,17 @@ the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>ftpserver-parent</artifactId> <groupId>org.apache.ftpserver</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ftpserver</groupId> <artifactId>ftplet-api</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <packaging>bundle</packaging> <name>Apache Ftplet API</name> @@ -46,6 +43,7 @@ </developerConnection> <url>http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api </url> + <tag>ftpserver-parent-1.1.0</tag> </scm> <build> http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/50e47f44/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 15635f4..7e301fe 100644 --- a/pom.xml +++ b/pom.xml @@ -17,10 +17,7 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>apache</artifactId> <groupId>org.apache</groupId> @@ -31,7 +28,7 @@ <artifactId>ftpserver-parent</artifactId> <packaging>pom</packaging> <name>Apache FtpServer Parent</name> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <url>http://mina.apache.org/ftpserver</url> <issueManagement> <system>Jira</system> @@ -133,7 +130,7 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/as/mina-ftpserver.git</connection> <url>https://git-wip-us.apache.org/repos/asf?p=mina-ftpserver.git</url> <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/mina-ftpserver.git</developerConnection> - <tag>HEAD</tag> + <tag>ftpserver-parent-1.1.0</tag> </scm> <properties>
