projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8f6d0e
)
Load common properties when merging
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 22 Mar 2023 05:19:14 +0000
(06:19 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 22 Mar 2023 05:19:14 +0000
(06:19 +0100)
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 1ed01ad2dae4b0c2adf71871c2fe53b5a5fa0eb3..6cfd3d48aedc0ce469b21b1c9f1e85dca2943b98 100644
(file)
--- a/
src/org/argeo/build/Repackage.java
+++ b/
src/org/argeo/build/Repackage.java
@@
-453,13
+453,20
@@
public class Repackage {
Path targetCategoryBase = a2Base.resolve(category);
Properties mergeProps = new Properties();
Path targetCategoryBase = a2Base.resolve(category);
Properties mergeProps = new Properties();
+ // first, load common properties
+ Path commonBnd = duDir.resolve(COMMON_BND);
+ if (Files.exists(commonBnd))
+ try (InputStream in = Files.newInputStream(commonBnd)) {
+ mergeProps.load(in);
+ }
+ // then, the merge properties themselves
try (InputStream in = Files.newInputStream(mergeBnd)) {
mergeProps.load(in);
}
String m2Version = mergeProps.getProperty(ARGEO_ORIGIN_M2.toString());
if (m2Version == null) {
try (InputStream in = Files.newInputStream(mergeBnd)) {
mergeProps.load(in);
}
String m2Version = mergeProps.getProperty(ARGEO_ORIGIN_M2.toString());
if (m2Version == null) {
- logger.log(WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit");
+ logger.log(WARNING, "Ignoring
merging in
" + duDir + " as it is not an M2-based distribution unit");
return;// ignore, this is probably an Eclipse archive
}
if (!m2Version.startsWith(":")) {
return;// ignore, this is probably an Eclipse archive
}
if (!m2Version.startsWith(":")) {