Author: krosenvold
Date: Sat Jul 18 19:22:05 2015
New Revision: 1691769
URL: http://svn.apache.org/r1691769
Log:
Removed unused code
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReflectionProperties.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml?rev=1691769&r1=1691768&r2=1691769&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
Sat Jul 18 19:22:05 2015
@@ -1,27 +1,29 @@
<?xml version='1.0'?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
+ ~ /*
+ ~ * Licensed to the Apache Software Foundation (ASF) under one
+ ~ * or more contributor license agreements. See the NOTICE file
+ ~ * distributed with this work for additional information
+ ~ * regarding copyright ownership. The ASF licenses this file
+ ~ * to you under the Apache License, Version 2.0 (the
+ ~ * "License"); you may not use this file except in compliance
+ ~ * with the License. You may obtain a copy of the License at
+ ~ *
+ ~ * http://www.apache.org/licenses/LICENSE-2.0
+ ~ *
+ ~ * Unless required by applicable law or agreed to in writing,
+ ~ * software distributed under the License is distributed on an
+ ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ * KIND, either express or implied. See the License for the
+ ~ * specific language governing permissions and limitations
+ ~ * under the License.
+ ~ */
+ -->
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
<id>src</id>
<formats>
<format>dir</format>
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=1691769&r1=1691768&r2=1691769&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 Jul 18 19:22:05 2015
@@ -642,16 +642,6 @@ public abstract class AbstractAssemblyMo
return result;
}
- AssemblyArchiver getAssemblyArchiver()
- {
- return assemblyArchiver;
- }
-
- AssemblyReader getAssemblyReader()
- {
- return assemblyReader;
- }
-
public File getBasedir()
{
return basedir;
@@ -676,17 +666,6 @@ public abstract class AbstractAssemblyMo
/**
* {@inheritDoc}
*
- * @deprecated This has been replaced by {@link #setDescriptors(String[])}
- */
- @Deprecated
- public void setDescriptor( final String descriptor )
- {
- this.descriptor = descriptor;
- }
-
- /**
- * {@inheritDoc}
- *
* @deprecated This has been replaced by {@link #getDescriptorReferences()}
*/
@Deprecated
@@ -695,16 +674,6 @@ public abstract class AbstractAssemblyMo
return descriptorId;
}
- /**
- * {@inheritDoc}
- *
- * @deprecated This has been replaced by {@link
#setDescriptorRefs(String[])}
- */
- @Deprecated
- public void setDescriptorId( final String descriptorId )
- {
- this.descriptorId = descriptorId;
- }
public String[] getDescriptorReferences()
{
@@ -716,11 +685,6 @@ public abstract class AbstractAssemblyMo
return descriptorSourceDirectory;
}
- public void setDescriptorSourceDirectory( final File
descriptorSourceDirectory )
- {
- this.descriptorSourceDirectory = descriptorSourceDirectory;
- }
-
public String[] getDescriptors()
{
return descriptors;
@@ -857,16 +821,6 @@ public abstract class AbstractAssemblyMo
this.classifier = classifier;
}
- protected MavenProjectHelper getProjectHelper()
- {
- return projectHelper;
- }
-
- public void setProjectHelper( final MavenProjectHelper projectHelper )
- {
- this.projectHelper = projectHelper;
- }
-
public void setAppendAssemblyId( final boolean appendAssemblyId )
{
this.appendAssemblyId = appendAssemblyId;
@@ -917,11 +871,6 @@ public abstract class AbstractAssemblyMo
return ignoreMissingDescriptor;
}
- public void setIgnoreMissingDescriptor( final boolean
ignoreMissingDescriptor )
- {
- this.ignoreMissingDescriptor = ignoreMissingDescriptor;
- }
-
public MavenSession getMavenSession()
{
return mavenSession;
