Author: rfscholte
Date: Sat Jun 18 18:01:26 2016
New Revision: 1749077
URL: http://svn.apache.org/viewvc?rev=1749077&view=rev
Log:
[MASSEMBLY-818] Remove deprecated parameters for the single goal
Remove includeSite; instead use this variable in the assembly descriptor
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java?rev=1749077&r1=1749076&r2=1749077&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
Sat Jun 18 18:01:26 2016
@@ -67,11 +67,6 @@ public interface AssemblerConfigurationS
MavenProject getProject();
/**
- * @return Site included.
- */
- boolean isSiteIncluded();
-
- /**
* @return The site directory.
*/
File getSiteDirectory();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java?rev=1749077&r1=1749076&r2=1749077&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
Sat Jun 18 18:01:26 2016
@@ -383,7 +383,7 @@ public class DefaultAssemblyReader
IOUtil.close( reader );
}
- if ( configSource.isSiteIncluded() ||
assembly.isIncludeSiteDirectory() )
+ if ( assembly.isIncludeSiteDirectory() )
{
includeSiteInAssembly( assembly, configSource );
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java?rev=1749077&r1=1749076&r2=1749077&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
Sat Jun 18 18:01:26 2016
@@ -246,15 +246,6 @@ public abstract class AbstractAssemblyMo
private File siteDirectory;
/**
- * Set to true to include the site generated by site:site goal.
- *
- * @deprecated Please set this variable in the assembly descriptor instead
- */
- @Deprecated
- @Parameter( property = "includeSite", defaultValue = "false" )
- private boolean includeSite;
-
- /**
* Set to true in order to not fail when a descriptor is missing.
*/
@Parameter( property = "assembly.ignoreMissingDescriptor", defaultValue =
"false" )
@@ -688,12 +679,6 @@ public abstract class AbstractAssemblyMo
}
@Override
- public boolean isSiteIncluded()
- {
- return includeSite;
- }
-
- @Override
public String getFinalName()
{
return finalName;
@@ -818,11 +803,6 @@ public abstract class AbstractAssemblyMo
this.descriptorRefs = descriptorRefs;
}
- public void setIncludeSite( final boolean includeSite )
- {
- this.includeSite = includeSite;
- }
-
public void setTempRoot( final File tempRoot )
{
this.tempRoot = tempRoot;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java?rev=1749077&r1=1749076&r2=1749077&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
Sat Jun 18 18:01:26 2016
@@ -560,50 +560,6 @@ public class DefaultAssemblyReaderTest
expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr,
"testLocation", null, configSource );
-
- assertEquals( assembly.getId(), result.getId() );
-
- final List<FileSet> fileSets = result.getFileSets();
-
- assertEquals( 1, fileSets.size() );
-
- assertEquals( "/site", fileSets.get( 0 ).getOutputDirectory() );
-
- mockManager.verifyAll();
- }
-
- public void
testReadAssembly_ShouldReadAssemblyWithSiteDirInclusionFromConfigWithoutComponentsOrInterpolation()
- throws IOException, AssemblyReadException,
InvalidAssemblerConfigurationException
- {
- final Assembly assembly = new Assembly();
- assembly.setId( "test" );
-
- final StringReader sr = writeToStringReader( assembly );
-
- final File siteDir = fileManager.createTempDir();
-
- expect( configSource.getSiteDirectory() ).andReturn( siteDir
).anyTimes();
-
- final File basedir = fileManager.createTempDir();
-
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
-
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
-
- expect( configSource.isSiteIncluded() ).andReturn( true ).anyTimes();
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -667,7 +623,6 @@ public class DefaultAssemblyReaderTest
final MavenProject project = new MavenProject( model );
expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes();
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -733,7 +688,6 @@ public class DefaultAssemblyReaderTest
expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
- expect( configSource.isSiteIncluded() ).andReturn( false );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -782,8 +736,6 @@ public class DefaultAssemblyReaderTest
expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes();
-
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -810,8 +762,6 @@ public class DefaultAssemblyReaderTest
expect( configSource.getProject() ).andReturn( new MavenProject( new
Model() ) ).anyTimes();
- expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes();
-
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
Writer writer = null;
@@ -845,8 +795,6 @@ public class DefaultAssemblyReaderTest
expect( configSource.getProject() ).andReturn( new MavenProject( new
Model() ) ).anyTimes();
- expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes();
-
expect( configSource.isIgnoreMissingDescriptor() ).andReturn( false
).anyTimes();
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
@@ -1095,8 +1043,6 @@ public class DefaultAssemblyReaderTest
expect( configSource.getProject() ).andReturn( new MavenProject( new
Model() ) ).anyTimes();
- expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes();
-
expect( configSource.isIgnoreMissingDescriptor() ).andReturn(
ignoreMissing ).anyTimes();
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
