[incubator-training] 18/26: - Get rid of some maven warnings related to our directory structure - Make the job deploy the site even if it's not develop (for testing ... will change this back)

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-training.git

commit 3ff95c2495c2dd24a61013036ffc50e79dc6746f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Apr 26 11:53:28 2019 +0200

    - Get rid of some maven warnings related to our directory structure
    - Make the job deploy the site even if it's not develop (for testing ... will change this back)
---
 site/Jenkinsfile | 2 +-
 site/pom.xml     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/Jenkinsfile b/site/Jenkinsfile
index 64ee766..82d1b50 100644
--- a/site/Jenkinsfile
+++ b/site/Jenkinsfile
@@ -90,7 +90,7 @@ pipeline {
 
         stage('Deploy site') {
             when {
-                branch 'master'
+                branch 'feature/changed-directory-structure'
             }
             steps {
                 echo 'Deploying Site'
diff --git a/site/pom.xml b/site/pom.xml
index c91d99d..6656a5a 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -26,6 +26,8 @@
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <version>21</version>
+    <!-- Otherwise maven complains about the pom upstairs having different coordinates. -->
+    <relativePath></relativePath>
   </parent>
 
   <groupId>org.apache.training</groupId>