Merge remote-tracking branch 'github/master' into HEAD

test/groovy/ArtifactSetVersionTest.groovy

@@ -41,7 +41,7 @@ class ArtifactSetVersionTest extends BasePiperTest {
         .around(thrown)
         .around(jlr)
         .around(jscr)
-        .around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning'))
+        .around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning'))
         .around(jwfr)
         .around(jder)
         .around(jsr)

test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy

@@ -20,7 +20,7 @@ class DockerArtifactVersioningTest extends BasePiperTest{
 
     String passedDir
 
-    JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/DockerArtifactVersioning')
+    JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/versioning/DockerArtifactVersioning')
     JenkinsWriteFileRule jwfr = new JenkinsWriteFileRule(this)
     JenkinsLoggingRule jlr = new JenkinsLoggingRule(this)
     ExpectedException thrown = ExpectedException.none()

test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy

@@ -24,7 +24,7 @@ class MavenArtifactVersioningTest extends BasePiperTest{
     public RuleChain ruleChain = Rules
         .getCommonRules(this)
         .around(jscr)
-        .around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning'))
+        .around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning'))
 
     @Before
     void init() {