This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-998
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 6756aeaf811f04eb81c898dbe98a7d2ad8a87375
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Fri Feb 9 20:31:04 2018 +0100
No need to store new value snapshotReleasePluginAllowed
---
.../phase/CheckDependencySnapshotsPhase.java | 1 -
.../PropertiesReleaseDescriptorStoreTest.java | 50 +++++++++++-----------
2 files changed, 25 insertions(+), 26 deletions(-)
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
index 223602d..e7bcfc6 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
@@ -208,7 +208,6 @@ public class CheckDependencySnapshotsPhase
if ( result.toLowerCase( Locale.ENGLISH
).startsWith( "y" ) )
{
addToFailures = false;
-
releaseDescriptor.setSnapshotReleasePluginAllowed( true );
}
else
{
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
index 2dbcf3f..b33046f 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
@@ -55,7 +55,7 @@ public class PropertiesReleaseDescriptorStoreTest
ReleaseDescriptor config = store.read( file ).build();
- ReleaseDescriptor expected = createExpectedReleaseConfiguration();
+ ReleaseDescriptor expected =
createExpectedReleaseConfiguration().build();
assertEquals( "check matches", expected, config );
}
@@ -67,7 +67,7 @@ public class PropertiesReleaseDescriptorStoreTest
builder.setWorkingDirectory( AbstractReleaseTestCase.getPath(
getTestFile( "target/test-classes" ) ) );
ReleaseDescriptor config = store.read( builder ).build();
- ReleaseDescriptor expected = createExpectedReleaseConfiguration();
+ ReleaseDescriptor expected =
createExpectedReleaseConfiguration().build();
expected.setWorkingDirectory( builder.build().getWorkingDirectory() );
assertEquals( "check matches", expected, config );
@@ -122,16 +122,16 @@ public class PropertiesReleaseDescriptorStoreTest
file.delete();
assertFalse( "Check file doesn't exist", file.exists() );
- ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ ReleaseDescriptorBuilder config =
createReleaseConfigurationForWriting();
- store.write( config, file );
+ store.write( config.build(), file );
ReleaseDescriptor rereadDescriptor = store.read( file ).build();
- assertAndAdjustScmPassword( config, rereadDescriptor );
- assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor );
+ assertAndAdjustScmPassword( config.build(), rereadDescriptor );
+ assertAndAdjustScmPrivateKeyPassPhrase( config.build(),
rereadDescriptor );
- assertEquals( "compare configuration", config, rereadDescriptor );
+ assertEquals( "compare configuration", config.build(),
rereadDescriptor );
}
public void testWriteToWorkingDirectory()
@@ -142,18 +142,18 @@ public class PropertiesReleaseDescriptorStoreTest
assertFalse( "Check file doesn't exist", file.exists() );
file.getParentFile().mkdirs();
- ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ ReleaseDescriptorBuilder config =
createReleaseConfigurationForWriting();
config.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
- store.write( config );
+ store.write( config.build() );
ReleaseDescriptor rereadDescriptor = store.read( file ).build();
rereadDescriptor.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
- assertAndAdjustScmPassword( config, rereadDescriptor );
- assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor );
+ assertAndAdjustScmPassword( config.build(), rereadDescriptor );
+ assertAndAdjustScmPrivateKeyPassPhrase( config.build(),
rereadDescriptor );
- assertEquals( "compare configuration", config, rereadDescriptor );
+ assertEquals( "compare configuration", config.build(),
rereadDescriptor );
}
public void testWriteToNewFileRequiredOnly()
@@ -235,16 +235,16 @@ public class PropertiesReleaseDescriptorStoreTest
File file = getTestFile(
"target/test-classes/rewrite-release.properties" );
assertTrue( "Check file already exists", file.exists() );
- ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ ReleaseDescriptorBuilder config =
createReleaseConfigurationForWriting();
- store.write( config, file );
+ store.write( config.build(), file );
ReleaseDescriptor rereadDescriptor = store.read( file ).build();
- assertAndAdjustScmPassword( config, rereadDescriptor );
- assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor );
+ assertAndAdjustScmPassword( config.build(), rereadDescriptor );
+ assertAndAdjustScmPrivateKeyPassPhrase( config.build(),
rereadDescriptor );
- assertEquals( "compare configuration", config, rereadDescriptor );
+ assertEquals( "compare configuration", config.build(),
rereadDescriptor );
}
public void testDeleteFile()
@@ -255,10 +255,10 @@ public class PropertiesReleaseDescriptorStoreTest
file.createNewFile();
assertTrue( "Check file already exists", file.exists() );
- ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ ReleaseDescriptorBuilder config =
createReleaseConfigurationForWriting();
config.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
- store.delete( config );
+ store.delete( config.build() );
assertFalse( "Check file already exists", file.exists() );
}
@@ -271,15 +271,15 @@ public class PropertiesReleaseDescriptorStoreTest
file.delete();
assertFalse( "Check file already exists", file.exists() );
- ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ ReleaseDescriptorBuilder config =
createReleaseConfigurationForWriting();
config.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
- store.delete( config );
+ store.delete( config.build() );
assertFalse( "Check file already exists", file.exists() );
}
- private ReleaseDescriptor createReleaseConfigurationForWriting()
+ private ReleaseDescriptorBuilder createReleaseConfigurationForWriting()
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setCompletedPhase( "completed-phase-write" );
@@ -314,7 +314,7 @@ public class PropertiesReleaseDescriptorStoreTest
// omit optional elements
builder.addOriginalScmInfo( "groupId:subproject1", scm );
- return builder.build();
+ return builder;
}
private static void assertDefaultReleaseConfiguration( ReleaseDescriptor
config )
@@ -395,7 +395,7 @@ public class PropertiesReleaseDescriptorStoreTest
assertEquals( expected.getScmPrivateKeyPassPhrase(),
original.getScmPrivateKeyPassPhrase() );
}
- private ReleaseDescriptor createExpectedReleaseConfiguration()
+ private ReleaseDescriptorBuilder createExpectedReleaseConfiguration()
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setCompletedPhase( "step1" );
@@ -442,7 +442,7 @@ public class PropertiesReleaseDescriptorStoreTest
versions.setDevelopment( "1.1-SNAPSHOT" );
builder.build().getResolvedSnapshotDependencies().put(
"external:artifactId", versions );
- return builder.build();
+ return builder;
}
}
--
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.
