File tree Expand file tree Collapse file tree 3 files changed +13
-2
lines changed Expand file tree Collapse file tree 3 files changed +13
-2
lines changed Original file line number Diff line number Diff line change 75
75
<properties >
76
76
<javaVersion >8</javaVersion >
77
77
<mavenVersion >3.9.11</mavenVersion >
78
- <mavenArchiverVersion >3.6.4 </mavenArchiverVersion >
78
+ <mavenArchiverVersion >3.6.5 </mavenArchiverVersion >
79
79
<project .build.outputTimestamp>2024-06-16T12:09:50Z</project .build.outputTimestamp>
80
80
</properties >
81
81
124
124
<dependency >
125
125
<groupId >org.codehaus.plexus</groupId >
126
126
<artifactId >plexus-archiver</artifactId >
127
+ <<<<<<< HEAD
127
128
<version >4.10.1</version >
129
+ =======
130
+ <version >4.10.2</version >
131
+ >>>>>>> 84aeaa9 ([MJAR-323] add Java-Version to MANIFEST.MF)
128
132
</dependency >
129
133
130
134
<!-- Other used dependencies -->
Original file line number Diff line number Diff line change 27
27
<organization >
28
28
<name >jar plugin it</name >
29
29
</organization >
30
+ <properties >
31
+ <maven .compiler.release>11</maven .compiler.release>
32
+ </properties >
30
33
<build >
31
34
<plugins >
32
35
<plugin >
Original file line number Diff line number Diff line change @@ -25,7 +25,6 @@ import java.util.zip.*;
25
25
26
26
boolean result = true ;
27
27
28
-
29
28
try
30
29
{
31
30
File target = new File ( basedir, " target" );
104
103
return false ;
105
104
}
106
105
106
+ if ( ! " 11" . equals( manifest. getValue( " Java-Version" ) ) )
107
+ {
108
+ System . err. println ( " Java-Version not equals 11" );
109
+ return false ;
110
+ }
107
111
}
108
112
catch ( Throwable e )
109
113
{
You can’t perform that action at this time.
0 commit comments