projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe96341
)
Deal with jars without symbolic name
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 7 Oct 2023 04:21:19 +0000
(06:21 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 7 Oct 2023 04:21:19 +0000
(06:21 +0200)
src/org/argeo/build/Repackage.java
patch
|
blob
|
history
diff --git
a/src/org/argeo/build/Repackage.java
b/src/org/argeo/build/Repackage.java
index f0d048c988702cac6b67aa5874813b5af1215096..442e7e0d40952d979e5432a0499fc2ec86eb2e4c 100644
(file)
--- a/
src/org/argeo/build/Repackage.java
+++ b/
src/org/argeo/build/Repackage.java
@@
-934,6
+934,8
@@
public class Repackage {
map.put(key.toString(), commonProps.getProperty(key.toString()));
A2Origin origin = new A2Origin();
Path bundleDir = processBundleJar(file, targetCategoryBase, map, origin);
map.put(key.toString(), commonProps.getProperty(key.toString()));
A2Origin origin = new A2Origin();
Path bundleDir = processBundleJar(file, targetCategoryBase, map, origin);
+ if (bundleDir == null)
+ return FileVisitResult.CONTINUE;
origins.put(bundleDir, origin);
logger.log(DEBUG, () -> "Processed " + file);
}
origins.put(bundleDir, origin);
logger.log(DEBUG, () -> "Processed " + file);
}
@@
-1039,6
+1041,10
@@
public class Repackage {
nameVersion = new NameVersion(ourSymbolicName, ourVersion);
} else {
nameVersion = nameVersionFromManifest(manifest);
nameVersion = new NameVersion(ourSymbolicName, ourVersion);
} else {
nameVersion = nameVersionFromManifest(manifest);
+ if (nameVersion == null) {
+ logger.log(WARNING, file + " has no symbolic name, skipping...");
+ return null;
+ }
if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
logger.log(WARNING,
"Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);
if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
logger.log(WARNING,
"Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);