Skip to content

Commit 61c70b1

Browse files
committed
[MJAR-323] add Java-Version to MANIFEST.MF
requires apache/maven-archiver#259
1 parent b1d5d7a commit 61c70b1

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<properties>
7676
<javaVersion>8</javaVersion>
7777
<mavenVersion>3.9.11</mavenVersion>
78-
<mavenArchiverVersion>3.6.4</mavenArchiverVersion>
78+
<mavenArchiverVersion>3.6.5</mavenArchiverVersion>
7979
<project.build.outputTimestamp>2024-06-16T12:09:50Z</project.build.outputTimestamp>
8080
</properties>
8181

@@ -124,7 +124,11 @@
124124
<dependency>
125125
<groupId>org.codehaus.plexus</groupId>
126126
<artifactId>plexus-archiver</artifactId>
127+
<<<<<<< HEAD
127128
<version>4.10.1</version>
129+
=======
130+
<version>4.10.2</version>
131+
>>>>>>> 84aeaa9 ([MJAR-323] add Java-Version to MANIFEST.MF)
128132
</dependency>
129133

130134
<!-- Other used dependencies -->

src/it/manifest-content/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<organization>
2828
<name>jar plugin it</name>
2929
</organization>
30+
<properties>
31+
<maven.compiler.release>11</maven.compiler.release>
32+
</properties>
3033
<build>
3134
<plugins>
3235
<plugin>

src/it/manifest-content/verify.grovy renamed to src/it/manifest-content/verify.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import java.util.zip.*;
2525

2626
boolean result = true;
2727

28-
2928
try
3029
{
3130
File target = new File( basedir, "target" );
@@ -104,6 +103,11 @@ try
104103
return false;
105104
}
106105

106+
if ( !"11".equals( manifest.getValue( "Java-Version" ) ) )
107+
{
108+
System.err.println( "Java-Version not equals 11" );
109+
return false;
110+
}
107111
}
108112
catch( Throwable e )
109113
{

0 commit comments

Comments
 (0)