Skip to content

Commit 138591d

Browse files
committed
Fix #885 - 'includePackedArtifacts' must be automatically disabled when
running with an incompatible vm
1 parent 625ef43 commit 138591d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

RELEASE_NOTES.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ This page describes the noteworthy improvements provided by each release of Ecli
55
## 2.7.2
66
Fixes:
77
- [2.7.1][regression] Neither raw version nor format was specified #876
8+
- [2.7.1] 'includePackedArtifacts' must be automatically disabled when running with an incompatible vm #885
89

910
## 2.7.1
1011

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Sonatype Inc. - initial API and implementation
1010
* Christoph Läubrich - [Bug 461284] - Improve discovery and attach of .target files in eclipse-target-definition
1111
* [Bug 567098] - pomDependencies=consider should wrap non-osgi jars
12+
* [Issue #885] - 'includePackedArtifacts' must be automatically disabled when running with an incompatible vm
1213
*******************************************************************************/
1314
package org.eclipse.tycho.core.resolver;
1415

@@ -167,7 +168,12 @@ private void setIncludePackedArtifacts(TargetPlatformConfiguration result, Xpp3D
167168
if (value == null) {
168169
return;
169170
}
170-
result.setIncludePackedArtifacts(Boolean.parseBoolean(value));
171+
boolean include = Boolean.parseBoolean(value);
172+
if (include && Runtime.version().feature() >= 14) {
173+
logger.warn("Pack200 is not supported when running on Java 14 and higher");
174+
return;
175+
}
176+
result.setIncludePackedArtifacts(include);
171177
}
172178

173179
private void setTargetDefinitionIncludeSources(TargetPlatformConfiguration result, Xpp3Dom configuration)

0 commit comments

Comments
 (0)