You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2018/04/18 13:50:08 UTC
mina-sshd git commit: Using ${project.XXX} instead of ${XXX}
properties in POM files
Repository: mina-sshd
Updated Branches:
refs/heads/master fbbefe1e6 -> 3560fb921
Using ${project.XXX} instead of ${XXX} properties in POM files
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/3560fb92
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/3560fb92
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/3560fb92
Branch: refs/heads/master
Commit: 3560fb921516aca20e19eaf78f18c8876ce78771
Parents: fbbefe1
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Wed Apr 18 16:53:27 2018 +0300
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Wed Apr 18 16:53:27 2018 +0300
----------------------------------------------------------------------
assembly/src/main/descriptors/unix-src.xml | 4 ++--
assembly/src/main/descriptors/windows-src.xml | 4 ++--
pom.xml | 2 +-
sshd-mina/pom.xml | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/3560fb92/assembly/src/main/descriptors/unix-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
index c36164b..7e0a1c2 100644
--- a/assembly/src/main/descriptors/unix-src.xml
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -23,7 +23,7 @@
<fileSets>
<!-- Binary Files -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.jpeg</include>
@@ -49,7 +49,7 @@
<!-- Text Files -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*</include>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/3560fb92/assembly/src/main/descriptors/windows-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/windows-src.xml b/assembly/src/main/descriptors/windows-src.xml
index baa54fe..b4a3071 100644
--- a/assembly/src/main/descriptors/windows-src.xml
+++ b/assembly/src/main/descriptors/windows-src.xml
@@ -23,7 +23,7 @@
<fileSets>
<!-- Binary Files -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.jpeg</include>
@@ -49,7 +49,7 @@
<!-- Text Files -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*</include>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/3560fb92/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9cbf957..1537ff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
</scm>
<properties>
- <projectRoot>${basedir}</projectRoot>
+ <projectRoot>${project.basedir}</projectRoot>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- NOTE: actual value updated by groovy-maven-plugin on initialization phase -->
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/3560fb92/sshd-mina/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-mina/pom.xml b/sshd-mina/pom.xml
index 5f0588f..1000f8a 100644
--- a/sshd-mina/pom.xml
+++ b/sshd-mina/pom.xml
@@ -114,10 +114,10 @@
</dependencies>
<build>
- <testSourceDirectory>${build.directory}/test-sources</testSourceDirectory>
+ <testSourceDirectory>${project.build.directory}/test-sources</testSourceDirectory>
<testResources>
<testResource>
- <directory>${build.directory}/test-resources</directory>
+ <directory>${project.build.directory}/test-resources</directory>
</testResource>
</testResources>
<plugins>
@@ -132,7 +132,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${build.directory}/test-resources</outputDirectory>
+ <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
<resources>
<resource>
<directory>${projectRoot}/sshd-core/src/test/resources</directory>
@@ -147,7 +147,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${build.directory}/test-sources</outputDirectory>
+ <outputDirectory>${project.build.directory}/test-sources</outputDirectory>
<resources>
<resource>
<directory>${projectRoot}/sshd-core/src/test/java</directory>