projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fac60d5
)
Do not modify only when releasing
author
Mathieu Baudier <mbaudier@argeo.org>
Sun, 19 Mar 2023 08:37:44 +0000
(09:37 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sun, 19 Mar 2023 08:37:44 +0000
(09:37 +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 6bca9c4e486d9338a17c9773fe49c8af651d5f2a..d67a6759ee0f812e7d3551b62c8573a7ea911ca7 100644
(file)
--- a/
src/org/argeo/build/Repackage.java
+++ b/
src/org/argeo/build/Repackage.java
@@
-246,15
+246,21
@@
public class Repackage {
Path downloaded = downloadMaven(url, artifact);
// some proprietary artifacts do not allow any modification
Path downloaded = downloadMaven(url, artifact);
// some proprietary artifacts do not allow any modification
+ // when releasing (with separate sources) we just copy it
boolean doNotModify = Boolean.parseBoolean(
fileProps.getOrDefault(ManifestConstants.ARGEO_DO_NOT_MODIFY.toString(), "false").toString());
boolean doNotModify = Boolean.parseBoolean(
fileProps.getOrDefault(ManifestConstants.ARGEO_DO_NOT_MODIFY.toString(), "false").toString());
- if (doNotModify) {
+ if (doNotModify
&& sourceBundles
) {
Path unmodifiedTarget = targetCategoryBase.resolve(
fileProps.getProperty(BUNDLE_SYMBOLICNAME.toString()) + "." + artifact.getBranch() + ".jar");
Files.copy(downloaded, unmodifiedTarget, StandardCopyOption.REPLACE_EXISTING);
Path unmodifiedTarget = targetCategoryBase.resolve(
fileProps.getProperty(BUNDLE_SYMBOLICNAME.toString()) + "." + artifact.getBranch() + ".jar");
Files.copy(downloaded, unmodifiedTarget, StandardCopyOption.REPLACE_EXISTING);
+ downloadAndProcessM2Sources(repoStr, artifact,
+ targetCategoryBase.resolve(
+ fileProps.getProperty(BUNDLE_SYMBOLICNAME.toString()) + "." + artifact.getBranch()),
+ false);
return;
}
return;
}
-
+
+ // normal processing
A2Origin origin = new A2Origin();
Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact, origin);
A2Origin origin = new A2Origin();
Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact, origin);