Author: khmarbaise
Date: Mon Apr 11 18:29:04 2016
New Revision: 1738620
URL: http://svn.apache.org/viewvc?rev=1738620&view=rev
Log:
[MJAR-213] Upgrade to maven-archiver 3.0.1
o Upgrading to maven-archiver-3.0.1 means that the
Specification-Version within the MANIFEST.MF
does not allow having -SNAPSHOT.
This behaviour has been changed according to
the Product Versioning Spec. See also [MSHARED-191]
Modified:
maven/plugins/trunk/maven-jar-plugin/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/it/manifest-content/verify.bsh
Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1738620&r1=1738619&r2=1738620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Mon Apr 11 18:29:04 2016
@@ -70,7 +70,7 @@ under the License.
</distributionManagement>
<properties>
- <mavenArchiverVersion>3.0.0</mavenArchiverVersion>
+ <mavenArchiverVersion>3.0.1</mavenArchiverVersion>
<mavenVersion>3.0</mavenVersion>
</properties>
Modified: maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml?rev=1738620&r1=1738619&r2=1738620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/MJAR-82/pom.xml Mon Apr 11
18:29:04 2016
@@ -36,8 +36,12 @@
<manifest>
<mainClass>myproject.HelloWorld</mainClass>
<addClasspath>true</addClasspath>
-
<classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout>
- <!--<classpathPrefix></classpathPrefix>-->
+ <!--
+ ! With maven-archiver 3.0.1 the following deprecated code
+ ! has been removed which is replaced by the
classpathLayoutType.
+ !
<classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout>
+ -->
+ <classpathLayoutType>repository</classpathLayoutType>
</manifest>
</archive>
</configuration>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/it/manifest-content/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/manifest-content/verify.bsh?rev=1738620&r1=1738619&r2=1738620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/manifest-content/verify.bsh
(original)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/manifest-content/verify.bsh Mon
Apr 11 18:29:04 2016
@@ -58,9 +58,11 @@ try
return false;
}
- if ( !"1.0-SNAPSHOT".equals( manifest.get(
Attributes.Name.SPECIFICATION_VERSION ) ) )
+ //
https://docs.oracle.com/javase/6/docs/technotes/guides/versioning/spec/versioning2.html
+ // Based on the above this must be "1.0" and NOT "1.0-SNAPSHOT"
+ if ( !"1.0".equals( manifest.get( Attributes.Name.SPECIFICATION_VERSION )
) )
{
- System.err.println( Attributes.Name.SPECIFICATION_VERSION.toString() +
" not equals 1.0-SNAPSHOT" );
+ System.err.println( Attributes.Name.SPECIFICATION_VERSION.toString() +
" not equals 1.0" );
return false;
}
