import static java.nio.file.StandardOpenOption.APPEND;
import static java.nio.file.StandardOpenOption.CREATE;
import static java.util.jar.Attributes.Name.MANIFEST_VERSION;
-import static org.argeo.build.Repackage.ManifestHeader.ARGEO_DO_NOT_MODIFY;
+import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_DO_NOT_MODIFY;
import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_M2;
import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_M2_MERGE;
import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_M2_REPO;
import static org.argeo.build.Repackage.ManifestHeader.ECLIPSE_SOURCE_BUNDLE;
import static org.argeo.build.Repackage.ManifestHeader.EXPORT_PACKAGE;
import static org.argeo.build.Repackage.ManifestHeader.IMPORT_PACKAGE;
+import static org.argeo.build.Repackage.ManifestHeader.REQUIRE_CAPABILITY;
+//import static org.argeo.build.Repackage.ManifestHeader.REQUIRE_BUNDLE;
import static org.argeo.build.Repackage.ManifestHeader.SPDX_LICENSE_IDENTIFIER;
import java.io.BufferedWriter;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.System.Logger;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.nio.file.DirectoryStream;
import java.nio.file.FileSystem;
List<CompletableFuture<Void>> toDos = new ArrayList<>();
for (int i = 1; i < args.length; i++) {
- Path p = Paths.get(args[i]);
- if (sequential)
- factory.processCategory(p);
+ Path categoryPath = Paths.get(args[i]);
+ factory.cleanPreviousFailedBuild(categoryPath);
+ if (sequential) // sequential processing happens here
+ factory.processCategory(categoryPath);
else
- toDos.add(CompletableFuture.runAsync(() -> factory.processCategory(p)));
+ toDos.add(CompletableFuture.runAsync(() -> factory.processCategory(categoryPath)));
}
- if (!sequential)
+ if (!sequential)// parallel processing
CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join();
// Summary
logger.log(INFO, "# License summary:\n" + sb);
}
+ /** Deletes remaining sub directories. */
+ void cleanPreviousFailedBuild(Path categoryPath) {
+ Path outputCategoryPath = a2Base.resolve(categoryPath);
+ if (!Files.exists(outputCategoryPath))
+ return;
+ // clean previous failed build
+ try {
+ for (Path subDir : Files.newDirectoryStream(outputCategoryPath, (d) -> Files.isDirectory(d))) {
+ if (Files.exists(subDir)) {
+ logger.log(WARNING, "Bundle dir " + subDir
+ + " already exists, probably from a previous failed build, deleting it...");
+ deleteDirectory(subDir);
+ }
+ }
+ } catch (IOException e) {
+ logger.log(ERROR, "Cannot clean previous build", e);
+ }
+ }
+
/** MANIFEST headers. */
enum ManifestHeader {
// OSGi
EXPORT_PACKAGE("Export-Package"), //
/** OSGi imported packages list. */
IMPORT_PACKAGE("Import-Package"), //
- /** OSGi path to embedded jar. */
- BUNDLE_CLASSPATH("Bundle-Classpath"), //
+ /** Require capability. */
+ REQUIRE_CAPABILITY("Require-Capability"), //
+// /** OSGi required bundles. */
+// REQUIRE_BUNDLE("Require-Bundle"), //
+// /** OSGi path to embedded jar. */
+// BUNDLE_CLASSPATH("Bundle-Classpath"), //
// Java
/** Java module name. */
AUTOMATIC_MODULE_NAME("Automatic-Module-Name"), //
/** Maven repository, if not the default one. */
ARGEO_ORIGIN_M2_REPO("Argeo-Origin-M2-Repo"), //
/**
- * Do not perform BND analysis of the origin component. Typically Import_package
+ * Do not perform BND analysis of the origin component. Typically Import-Package
* and Export-Package will be kept untouched.
*/
ARGEO_ORIGIN_NO_METADATA_GENERATION("Argeo-Origin-NoMetadataGeneration"), //
+ /** Keep JPMS module-info */
+ ARGEO_ORIGIN_KEEP_MODULE_INFO("Argeo-Origin-KeepModuleInfo"), //
// /**
// * Embed the original jar without modifying it (may be required by some
// * proprietary licenses, such as JCR Day License).
* Do not modify original jar (may be required by some proprietary licenses,
* such as JCR Day License).
*/
- ARGEO_DO_NOT_MODIFY("Argeo-Origin-Do-Not-Modify"), //
+ ARGEO_ORIGIN_DO_NOT_MODIFY("Argeo-Origin-Do-Not-Modify"), //
/**
* Origin (non-Maven) URI of the component. It may be anything (jar, archive,
* etc.).
ARGEO_ORIGIN_SOURCES_URI("Argeo-Origin-Sources-URI"), //
;
- final String value;
+ final String headerName;
- private ManifestHeader(String value) {
- this.value = value;
+ private ManifestHeader(String headerName) {
+ this.headerName = headerName;
}
@Override
public String toString() {
- return value;
+ return headerName;
+ }
+
+ /** Get the value from either a {@link Manifest} or a {@link Properties}. */
+ String get(Object map) {
+ if (map instanceof Manifest manifest)
+ return manifest.getMainAttributes().getValue(headerName);
+ else if (map instanceof Properties props)
+ return props.getProperty(headerName);
+ else
+ throw new IllegalArgumentException("Unsupported mapping " + map.getClass());
+ }
+
+ /** Put the value into either a {@link Manifest} or a {@link Properties}. */
+ void put(Object map, String value) {
+ if (map instanceof Manifest manifest)
+ manifest.getMainAttributes().putValue(headerName, value);
+ else if (map instanceof Properties props)
+ props.setProperty(headerName, value);
+ else
+ throw new IllegalArgumentException("Unsupported mapping " + map.getClass());
}
}
void processCategory(Path categoryRelativePath) {
try {
Path targetCategoryBase = descriptorsBase.resolve(categoryRelativePath);
- DirectoryStream<Path> bnds = Files.newDirectoryStream(targetCategoryBase,
+
try (DirectoryStream<Path> bnds = Files.newDirectoryStream(targetCategoryBase,
(p) -> p.getFileName().toString().endsWith(".bnd") && !p.getFileName().toString().equals(COMMON_BND)
- && !p.getFileName().toString().equals(MERGE_BND));
- for (Path p : bnds) {
- processSingleM2ArtifactDistributionUnit(p);
+ && !p.getFileName().toString().equals(MERGE_BND))) {
+ for (Path p : bnds) {
+ processSingleM2ArtifactDistributionUnit(p);
+ }
}
- DirectoryStream<Path> dus = Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p));
- for (Path duDir : dus) {
- if (duDir.getFileName().toString().startsWith("eclipse-")) {
- processEclipseArchive(duDir);
- } else {
- processM2BasedDistributionUnit(duDir);
+ try (DirectoryStream<Path> dus = Files.newDirectoryStream(targetCategoryBase,
+ (p) -> Files.isDirectory(p))) {
+ for (Path duDir : dus) {
+ if (duDir.getFileName().toString().startsWith("eclipse-")) {
+ processEclipseArchive(duDir);
+ } else {
+ processM2BasedDistributionUnit(duDir);
+ }
}
}
} catch (IOException e) {
Path downloaded = downloadMaven(fileProps, artifact);
boolean doNotModify = Boolean
- .parseBoolean(fileProps.getOrDefault(ARGEO_DO_NOT_MODIFY.toString(), "false").toString());
+ .parseBoolean(fileProps.getOrDefault(ARGEO_ORIGIN_DO_NOT_MODIFY.toString(), "false").toString());
if (doNotModify) {
processNotModified(targetCategoryBase, downloaded, fileProps, artifact);
return;
// regular processing
A2Origin origin = new A2Origin();
Path bundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact, origin);
- downloadAndProcessM2Sources(fileProps, artifact, bundleDir, false);
+ downloadAndProcessM2Sources(fileProps, artifact, bundleDir, false, false);
createJar(bundleDir, origin);
} catch (Exception e) {
throw new RuntimeException("Cannot process " + bndFile, e);
}
m2Version = m2Version.substring(1);
- DirectoryStream<Path> ds = Files.newDirectoryStream(duDir,
+
try (DirectoryStream<Path> ds = Files.newDirectoryStream(duDir,
(p) -> p.getFileName().toString().endsWith(".bnd") && !p.getFileName().toString().equals(COMMON_BND)
- && !p.getFileName().toString().equals(MERGE_BND));
- for (Path p : ds) {
- Properties fileProps = new Properties();
- try (InputStream in = Files.newInputStream(p)) {
- fileProps.load(in);
- }
- String m2Coordinates = fileProps.getProperty(ARGEO_ORIGIN_M2.toString());
- M2Artifact artifact = new M2Artifact(m2Coordinates);
- if (artifact.getVersion() == null) {
- artifact.setVersion(m2Version);
- } else {
- logger.log(WARNING, p.getFileName() + " : Using version " + artifact.getVersion()
- + " specified in descriptor rather than " + m2Version + " specified in " + COMMON_BND);
- }
-
- // prepare manifest entries
- Properties mergedProps = new Properties();
- mergedProps.putAll(commonProps);
+ && !p.getFileName().toString().equals(MERGE_BND))) {
+ for (Path p : ds) {
+ Properties fileProps = new Properties();
+ try (InputStream in = Files.newInputStream(p)) {
+ fileProps.load(in);
+ }
+ String m2Coordinates = fileProps.getProperty(ARGEO_ORIGIN_M2.toString());
+ M2Artifact artifact = new M2Artifact(m2Coordinates);
+ if (artifact.getVersion() == null) {
+ artifact.setVersion(m2Version);
+ } else {
+ logger.log(DEBUG, p.getFileName() + " : Using version " + artifact.getVersion()
+ + " specified in descriptor rather than " + m2Version + " specified in " + COMMON_BND);
+ }
- fileEntries: for (Object key : fileProps.keySet()) {
- if (ARGEO_ORIGIN_M2.toString().equals(key))
- continue fileEntries;
- String value = fileProps.getProperty(key.toString());
- Object previousValue = mergedProps.put(key.toString(), value);
- if (previousValue != null) {
- logger.log(WARNING,
- commonBnd + ": " + key + " was " + previousValue + ", overridden with " + value);
+ // prepare manifest entries
+ Properties mergedProps = new Properties();
+ mergedProps.putAll(commonProps);
+
+ fileEntries: for (Object key : fileProps.keySet()) {
+ if (ARGEO_ORIGIN_M2.toString().equals(key))
+ continue fileEntries;
+ String value = fileProps.getProperty(key.toString());
+ Object previousValue = mergedProps.put(key.toString(), value);
+ if (previousValue != null) {
+ logger.log(WARNING,
+ commonBnd + ": " + key + " was " + previousValue + ", overridden with " + value);
+ }
+ }
+ mergedProps.put(ARGEO_ORIGIN_M2.toString(), artifact.toM2Coordinates());
+ if (!mergedProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
+ // use file name as symbolic name
+ String symbolicName = p.getFileName().toString();
+ symbolicName = symbolicName.substring(0, symbolicName.length() - ".bnd".length());
+ mergedProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName);
}
- }
- mergedProps.put(ARGEO_ORIGIN_M2.toString(), artifact.toM2Coordinates());
- if (!mergedProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
- // use file name as symbolic name
- String symbolicName = p.getFileName().toString();
- symbolicName = symbolicName.substring(0, symbolicName.length() - ".bnd".length());
- mergedProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName);
- }
- // download
- Path downloaded = downloadMaven(mergedProps, artifact);
+ // download
+ Path downloaded = downloadMaven(mergedProps, artifact);
- boolean doNotModify = Boolean
- .parseBoolean(mergedProps.getOrDefault(ARGEO_DO_NOT_MODIFY.toString(), "false").toString());
- if (doNotModify) {
- processNotModified(targetCategoryBase, downloaded, mergedProps, artifact);
- } else {
- A2Origin origin = new A2Origin();
- Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergedProps, artifact, origin);
- downloadAndProcessM2Sources(mergedProps, artifact, targetBundleDir, false);
- createJar(targetBundleDir, origin);
+ boolean doNotModify = Boolean.parseBoolean(
+ mergedProps.getOrDefault(ARGEO_ORIGIN_DO_NOT_MODIFY.toString(), "false").toString());
+ if (doNotModify) {
+ processNotModified(targetCategoryBase, downloaded, mergedProps, artifact);
+ } else {
+ A2Origin origin = new A2Origin();
+ Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergedProps, artifact,
+ origin);
+ downloadAndProcessM2Sources(mergedProps, artifact, targetBundleDir, false, false);
+ createJar(targetBundleDir, origin);
+ }
}
}
} catch (IOException e) {
}
if (entry.getName().endsWith("NOTICE") || entry.getName().endsWith("NOTICE.txt")
- || entry.getName().endsWith("LICENSE") || entry.getName().endsWith("LICENSE.md")
- || entry.getName().endsWith("LICENSE-notice.md") || entry.getName().endsWith("COPYING")
- || entry.getName().endsWith("COPYING.LESSER")) {
+ || entry.getName().endsWith("NOTICE.md") || entry.getName().endsWith("LICENSE")
+ || entry.getName().endsWith("LICENSE.md") || entry.getName().endsWith("LICENSE-notice.md")
+ || entry.getName().endsWith("COPYING") || entry.getName().endsWith("COPYING.LESSER")) {
Path artifactOriginDir = bundleDir.resolve(ARGEO_ORIGIN).resolve(artifact.getGroupId())
.resolve(artifact.getArtifactId());
Path target = artifactOriginDir.resolve(entry.getName());
} else if (entry.getName().startsWith("org/apache/batik/")) {
logger.log(TRACE, "Skip " + entry.getName());
continue entries;
+ } else if (entry.getName().startsWith("META-INF/NOTICE")) {
+ logger.log(WARNING, "Skip " + entry.getName() + " from " + artifact);
+ // TODO merge them?
+ continue entries;
} else {
throw new IllegalStateException("File " + target + " from " + artifact + " already exists");
}
origin.added.add("binary content of " + artifact);
// process sources
- downloadAndProcessM2Sources(mergeProps, artifact, bundleDir, true);
+ downloadAndProcessM2Sources(mergeProps, artifact, bundleDir, true, false);
}
// additional service files
case "Created-By":
continue keys;
}
- if ("Require-Capability".equals(key.toString())
+ if (REQUIRE_CAPABILITY.toString().equals(key.toString())
&& value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) {
origin.deleted.add("MANIFEST header " + key);
continue keys;// hack for very old classes
case "Created-By":
continue keys;
}
- if ("Require-Capability".equals(key.toString())
+ if (REQUIRE_CAPABILITY.toString().equals(key.toString())
&& value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) {
origin.deleted.add("MANIFEST header " + key);
continue keys;// !! hack for very old classes
// When releasing (with separate sources), we just copy it
Path unmodifiedTarget = targetCategoryBase
.resolve(fileProps.getProperty(BUNDLE_SYMBOLICNAME.toString()) + "." + artifact.getBranch() + ".jar");
+ Files.createDirectories(unmodifiedTarget.getParent());
Files.copy(downloaded, unmodifiedTarget, StandardCopyOption.REPLACE_EXISTING);
Path bundleDir = targetCategoryBase
.resolve(fileProps.getProperty(BUNDLE_SYMBOLICNAME.toString()) + "." + artifact.getBranch());
- downloadAndProcessM2Sources(fileProps, artifact, bundleDir, false);
+ downloadAndProcessM2Sources(fileProps, artifact, bundleDir, false, true);
Manifest manifest;
try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(unmodifiedTarget))) {
manifest = jarIn.getManifest();
}
- createSourceJar(bundleDir, manifest, true);
+ createSourceJar(bundleDir, manifest, fileProps);
}
/** Download and integrates sources for a single Maven artifact. */
- void downloadAndProcessM2Sources(Properties props, M2Artifact artifact, Path targetBundleDir, boolean merging)
- throws IOException {
+ void downloadAndProcessM2Sources(Properties props, M2Artifact artifact, Path targetBundleDir, boolean merging,
+ boolean unmodified) throws IOException {
try {
String repoStr = props.containsKey(ARGEO_ORIGIN_M2_REPO.toString())
? props.getProperty(ARGEO_ORIGIN_M2_REPO.toString())
: null;
String alternateUri = props.getProperty(ARGEO_ORIGIN_SOURCES_URI.toString());
M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources");
- URL sourcesUrl = alternateUri != null ? new URL(alternateUri)
+ URI sourcesUrl = alternateUri != null ? new URI(alternateUri)
: M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact);
Path sourcesDownloaded = downloadMaven(sourcesUrl, sourcesArtifact);
- processM2SourceJar(sourcesDownloaded, targetBundleDir, merging ? artifact : null);
+ processM2SourceJar(sourcesDownloaded, targetBundleDir, merging ? artifact : null, unmodified);
logger.log(TRACE, () -> "Processed source " + sourcesDownloaded);
} catch (Exception e) {
logger.log(ERROR, () -> "Cannot download source for " + artifact);
}
/** Integrate sources from a downloaded jar file. */
- void processM2SourceJar(Path file, Path bundleDir, M2Artifact mergingFrom) throws IOException {
+ void processM2SourceJar(Path file, Path bundleDir, M2Artifact mergingFrom, boolean unmodified) throws IOException {
A2Origin origin = new A2Origin();
- Path sourceDir = separateSources ? bundleDir.getParent().resolve(bundleDir.toString() + ".src")
+ Path sourceDir = separateSources || unmodified ? bundleDir.getParent().resolve(bundleDir.toString() + ".src")
: bundleDir.resolve("OSGI-OPT/src");
try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
String relPath = entry.getName();
if (entry.isDirectory())
continue entries;
- if (entry.getName().startsWith("META-INF")) {// skip META-INF entries
- origin.deleted.add("META-INF directory from the sources" + mergingMsg);
+ if (entry.getName().equals("META-INF/MANIFEST.MF")) {// skip META-INF entries
+ origin.deleted.add("MANIFEST.MF from the sources" + mergingMsg);
continue entries;
}
- if (entry.getName().startsWith("module-info.java")) {// skip Java module information
- origin.deleted.add("Java module information from the sources (module-info.java)" + mergingMsg);
- continue entries;
- }
- if (entry.getName().startsWith("/")) { // absolute paths
- int metaInfIndex = entry.getName().indexOf("META-INF");
- if (metaInfIndex >= 0) {
- relPath = entry.getName().substring(metaInfIndex);
- origin.moved.add(" to " + relPath + " entry with absolute path " + entry.getName());
- } else {
- logger.log(WARNING, entry.getName() + " has an absolute path");
- origin.deleted.add(entry.getName() + " from the sources" + mergingMsg);
+ if (!unmodified) {
+ if (entry.getName().startsWith("module-info.java")) {// skip Java module information
+ origin.deleted.add("Java module information from the sources (module-info.java)" + mergingMsg);
+ continue entries;
+ }
+ if (entry.getName().startsWith("/")) { // absolute paths
+ int metaInfIndex = entry.getName().indexOf("META-INF");
+ if (metaInfIndex >= 0) {
+ relPath = entry.getName().substring(metaInfIndex);
+ origin.moved.add(" to " + relPath + " entry with absolute path " + entry.getName());
+ } else {
+ logger.log(WARNING, entry.getName() + " has an absolute path");
+ origin.deleted.add(entry.getName() + " from the sources" + mergingMsg);
+ }
+ continue entries;
}
- continue entries;
}
Path target = sourceDir.resolve(relPath);
Files.createDirectories(target.getParent());
}
}
// write the changes
- if (separateSources) {
+ if (separateSources || unmodified) {
origin.appendChanges(sourceDir);
} else {
origin.added.add("source code under OSGI-OPT/src");
? props.getProperty(ARGEO_ORIGIN_M2_REPO.toString())
: null;
String alternateUri = props.getProperty(ARGEO_ORIGIN_URI.toString());
- URL url = alternateUri != null ? new URL(alternateUri) : M2ConventionsUtils.mavenRepoUrl(repoStr, artifact);
- return downloadMaven(url, artifact);
+ try {
+ URI uri = alternateUri != null ? new URI(alternateUri) : M2ConventionsUtils.mavenRepoUrl(repoStr, artifact);
+ return downloadMaven(uri, artifact);
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Wrong aritfact URI", e);
+ }
}
/** Download a Maven artifact. */
- Path downloadMaven(URL url, M2Artifact artifact) throws IOException {
- return download(url, mavenBase, M2ConventionsUtils.artifactPath("", artifact));
+ Path downloadMaven(URI uri, M2Artifact artifact) throws IOException {
+ return download(uri, mavenBase, M2ConventionsUtils.artifactPath("", artifact));
}
/*
map.put(key.toString(), commonProps.getProperty(key.toString()));
A2Origin origin = new A2Origin();
Path bundleDir = processBundleJar(file, targetCategoryBase, map, origin);
+ if (bundleDir == null) {
+ logger.log(WARNING, "No bundle dir created for " + file + ", skipping...");
+ return FileVisitResult.CONTINUE;
+ }
origins.put(bundleDir, origin);
logger.log(DEBUG, () -> "Processed " + file);
}
}
});
- DirectoryStream<Path> dirs = Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p)
- && p.getFileName().toString().indexOf('.') >= 0 && !p.getFileName().toString().endsWith(".src"));
- for (Path bundleDir : dirs) {
- A2Origin origin = origins.get(bundleDir);
- Objects.requireNonNull(origin, "No A2 origin found for " + bundleDir);
- createJar(bundleDir, origin);
+ try (DirectoryStream<Path> dirs = Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p)
+ && p.getFileName().toString().indexOf('.') >= 0 && !p.getFileName().toString().endsWith(".src"))) {
+ for (Path bundleDir : dirs) {
+ A2Origin origin = origins.get(bundleDir);
+ Objects.requireNonNull(origin, "No A2 origin found for " + bundleDir);
+ createJar(bundleDir, origin);
+ }
}
} catch (IOException e) {
throw new RuntimeException("Cannot process " + duDir, e);
/** Normalise a single (that is, non-merged) bundle. */
Path processBundleJar(Path file, Path targetBase, Map<String, String> entries, A2Origin origin) throws IOException {
// boolean embed = Boolean.parseBoolean(entries.getOrDefault(ARGEO_ORIGIN_EMBED.toString(), "false").toString());
- boolean doNotModify = Boolean
- .parseBoolean(entries.getOrDefault(ManifestHeader.ARGEO_DO_NOT_MODIFY.toString(), "false").toString());
+ boolean doNotModify = Boolean.parseBoolean(
+ entries.getOrDefault(ManifestHeader.ARGEO_ORIGIN_DO_NOT_MODIFY.toString(), "false").toString());
+ boolean keepModuleInfo = Boolean.parseBoolean(
+ entries.getOrDefault(ManifestHeader.ARGEO_ORIGIN_KEEP_MODULE_INFO.toString(), "false").toString());
NameVersion nameVersion;
Path bundleDir;
// singleton
Manifest sourceManifest;
try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
sourceManifest = jarIn.getManifest();
+ if (sourceManifest == null)
+ logger.log(WARNING, file + " has no manifest");
manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest();
String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString());
nameVersion = new NameVersion(ourSymbolicName, ourVersion);
} else {
nameVersion = nameVersionFromManifest(manifest);
+ if (nameVersion == null)
+ throw new IllegalStateException("Could not compute name/version from Manifest");
if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
logger.log(WARNING,
"Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);
nameVersion.setName(ourSymbolicName);
}
}
+
bundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
// copy original MANIFEST
}
// force Java 9 module name
- entries.put(ManifestHeader.AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName());
+ entries.put(AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName());
boolean isNative = false;
String os = null;
arch = libRelativePath.getName(1).toString();
}
-// if (!embed) {
// copy entries
JarEntry entry;
entries: while ((entry = jarIn.getNextJarEntry()) != null) {
continue entries;
}
if (entry.getName().endsWith("module-info.class")) { // skip Java 9 module info
- origin.deleted.add("Java module information (module-info.class)");
- continue entries;
+ if (keepModuleInfo) {
+ entries.remove(AUTOMATIC_MODULE_NAME.toString());
+ } else {
+ origin.deleted.add("Java module information (module-info.class)");
+ continue entries;
+ }
}
if (entry.getName().startsWith("META-INF/versions/")) { // skip multi-version
origin.deleted.add("additional Java versions (META-INF/versions)");
Files.copy(jarIn, target);
// native libraries
+ boolean removeDllFromJar = true;
if (isNative && (entry.getName().endsWith(".so") || entry.getName().endsWith(".dll")
- || entry.getName().endsWith(".jnilib"))) {
+ || entry.getName().endsWith(".jnilib") || entry.getName().endsWith(".a"))) {
Path categoryDir = bundleDir.getParent();
boolean copyDll = false;
Path targetDll = categoryDir.resolve(bundleDir.relativize(target));
Files.delete(targetDll);
Files.copy(target, targetDll);
}
- Files.delete(target);
- origin.deleted.add(bundleDir.relativize(target).toString());
+
+ if (removeDllFromJar) {
+ Files.delete(target);
+ origin.deleted.add(bundleDir.relativize(target).toString());
+ }
}
logger.log(TRACE, () -> "Copied " + target);
-// }
}
}
entries.get(BUNDLE_SYMBOLICNAME.toString()) + ";singleton:=true");
}
-// if (embed) {// copy embedded jar
-// Files.copy(file, bundleDir.resolve(file.getFileName()));
-// entries.put(ManifestHeader.BUNDLE_CLASSPATH.toString(), file.getFileName().toString());
-// }
-
// Final MANIFEST decisions
// We also check the original OSGi metadata and compare with our changes
for (String key : entries.keySet()) {
if (wasDifferent) {
if (SPDX_LICENSE_IDENTIFIER.toString().equals(key) && previousValue != null)
keepPrevious = true;
+ if (REQUIRE_CAPABILITY.toString().equals(key) && previousValue != null)
+ keepPrevious = true;
else if (BUNDLE_VERSION.toString().equals(key) && wasDifferent)
if (previousValue.equals(value + ".0")) // typically a Maven first release
keepPrevious = true;
}
// !! hack to remove unresolvable
- if (key.equals("Provide-Capability") || key.equals("Require-Capability"))
+ if (key.equals("Provide-Capability") || key.equals(REQUIRE_CAPABILITY.toString()))
if (nameVersion.getName().equals("osgi.core") || nameVersion.getName().equals("osgi.cmpn")) {
manifest.getMainAttributes().remove(key);
origin.deleted.add("MANIFEST header " + key);
for (Iterator<Map.Entry<Object, Object>> manifestEntries = manifest.getMainAttributes().entrySet()
.iterator(); manifestEntries.hasNext();) {
Map.Entry<Object, Object> manifestEntry = manifestEntries.next();
- switch (manifestEntry.getKey().toString()) {
+ String key = manifestEntry.getKey().toString();
+ // TODO make it more generic
+// if (key.equals(REQUIRE_BUNDLE.toString()) && nameVersion.getName().equals("com.sun.jna.platform"))
+// manifestEntries.remove();
+ switch (key) {
case "Archiver-Version":
case "Build-By":
case "Created-By":
}
/** Try to download from an URI. */
- Path tryDownloadArchive(String uri, Path dir) throws IOException {
+ Path tryDownloadArchive(String uriStr, Path dir) throws IOException {
// find mirror
List<String> urlBases = null;
String uriPrefix = null;
uriPrefixes: for (String uriPref : mirrors.keySet()) {
- if (uri.startsWith(uriPref)) {
+ if (uriStr.startsWith(uriPref)) {
if (mirrors.get(uriPref).size() > 0) {
urlBases = mirrors.get(uriPref);
uriPrefix = uriPref;
}
if (urlBases == null)
try {
- return downloadArchive(new URL(uri), dir);
- } catch (FileNotFoundException e) {
- throw new FileNotFoundException("Cannot find " + uri);
+ return downloadArchive(new URI(uriStr), dir);
+ } catch (FileNotFoundException | URISyntaxException e) {
+ throw new FileNotFoundException("Cannot find " + uriStr);
}
// try to download
for (String urlBase : urlBases) {
- String relativePath = uri.substring(uriPrefix.length());
- URL url = new URL(urlBase + relativePath);
+ String relativePath = uriStr.substring(uriPrefix.length());
+ String uStr = urlBase + relativePath;
try {
- return downloadArchive(url, dir);
- } catch (FileNotFoundException e) {
- logger.log(WARNING, "Cannot download " + url + ", trying another mirror");
+ return downloadArchive(new URI(uStr), dir);
+ } catch (FileNotFoundException | URISyntaxException e) {
+ logger.log(WARNING, "Cannot download " + uStr + ", trying another mirror");
}
}
- throw new FileNotFoundException("Cannot find " + uri);
+ throw new FileNotFoundException("Cannot find " + uriStr);
}
/**
- * Effectively download. Synchronised in order to avoid downloading twice in
- * parallel.
+ * Effectively download an archive.
*/
- synchronized Path downloadArchive(URL url, Path dir) throws IOException {
- return download(url, dir, (String) null);
+ Path downloadArchive(URI uri, Path dir) throws IOException {
+ return download(uri, dir, (String) null);
}
- /** Effectively download. */
- Path download(URL url, Path dir, String name) throws IOException {
+ /**
+ * Effectively download. Synchronised in order to avoid downloading twice in
+ * parallel.
+ */
+ synchronized Path download(URI uri, Path dir, String name) throws IOException {
Path dest;
if (name == null) {
// We use also use parent directory in case the archive itself has a fixed name
- String[] segments = url.getPath().split("/");
+ String[] segments = uri.getPath().split("/");
name = segments.length > 1 ? segments[segments.length - 2] + '-' + segments[segments.length - 1]
: segments[segments.length - 1];
}
dest = dir.resolve(name);
if (Files.exists(dest)) {
- logger.log(TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again");
+ logger.log(TRACE, () -> "File " + dest + " already exists for " + uri + ", not downloading again");
return dest;
} else {
Files.createDirectories(dest.getParent());
}
- try (InputStream in = url.openStream()) {
+ try (InputStream in = uri.toURL().openStream()) {
Files.copy(in, dest);
- logger.log(DEBUG, () -> "Downloaded " + dest + " from " + url);
+ logger.log(DEBUG, () -> "Downloaded " + dest + " from " + uri);
}
return dest;
}
deleteDirectory(bundleDir);
if (separateSources)
- createSourceJar(bundleDir, manifest, false);
+ createSourceJar(bundleDir, manifest, null);
return jarPath;
}
/** Package sources separately, in the Eclipse-SourceBundle format. */
- void createSourceJar(Path bundleDir, Manifest manifest, boolean notModified) throws IOException {
+ void createSourceJar(Path bundleDir, Manifest manifest, Properties props) throws IOException {
+ boolean unmodified = props != null;
Path bundleCategoryDir = bundleDir.getParent();
Path sourceDir = bundleCategoryDir.resolve(bundleDir.toString() + ".src");
if (!Files.exists(sourceDir)) {
return;
}
- if (!notModified)
- createReadMe(sourceDir, manifest);
-
Path relPath = a2Base.relativize(bundleCategoryDir);
Path srcCategoryDir = a2SrcBase.resolve(relPath);
Path srcJarP = srcCategoryDir.resolve(sourceDir.getFileName() + ".jar");
bundleSymbolicName = bundleSymbolicName.split(";")[0];
Manifest srcManifest = new Manifest();
srcManifest.getMainAttributes().put(MANIFEST_VERSION, "1.0");
- srcManifest.getMainAttributes().putValue(BUNDLE_SYMBOLICNAME.toString(), bundleSymbolicName + ".src");
- srcManifest.getMainAttributes().putValue(BUNDLE_VERSION.toString(),
- manifest.getMainAttributes().getValue(BUNDLE_VERSION.toString()).toString());
- srcManifest.getMainAttributes().putValue(ECLIPSE_SOURCE_BUNDLE.toString(), bundleSymbolicName + ";version=\""
- + manifest.getMainAttributes().getValue(BUNDLE_VERSION.toString()) + "\"");
-
+ BUNDLE_SYMBOLICNAME.put(srcManifest, bundleSymbolicName + ".src");
+ BUNDLE_VERSION.put(srcManifest, BUNDLE_VERSION.get(manifest));
+ ECLIPSE_SOURCE_BUNDLE.put(srcManifest,
+ bundleSymbolicName + ";version=\"" + BUNDLE_VERSION.get(manifest) + "\"");
+
+ // metadata
+ createReadMe(sourceDir, unmodified ? props : manifest);
+ // create jar
try (JarOutputStream srcJarOut = new JarOutputStream(Files.newOutputStream(srcJarP), srcManifest)) {
- srcJarOut.setLevel(Deflater.BEST_COMPRESSION);
+ // srcJarOut.setLevel(Deflater.BEST_COMPRESSION);
Files.walkFileTree(sourceDir, new SimpleFileVisitor<Path>() {
@Override
* Generate a readme clarifying and prominently notifying of the repackaging and
* modifications.
*/
- void createReadMe(Path jarDir, Manifest manifest) throws IOException {
+ void createReadMe(Path jarDir, Object mapping) throws IOException {
// write repackaged README
try (BufferedWriter writer = Files.newBufferedWriter(jarDir.resolve(README_REPACKAGED))) {
- boolean merged = manifest.getMainAttributes().getValue(ARGEO_ORIGIN_M2_MERGE.toString()) != null;
+ boolean merged = ARGEO_ORIGIN_M2_MERGE.get(mapping) != null;
if (merged)
writer.append("This component is a merging of third party components"
+ " in order to comply with A2 packaging standards.\n");
+ " in order to comply with A2 packaging standards.\n");
// license
- String spdxLicenseId = manifest.getMainAttributes().getValue(SPDX_LICENSE_IDENTIFIER.toString());
+ String spdxLicenseId = SPDX_LICENSE_IDENTIFIER.get(mapping);
if (spdxLicenseId == null)
throw new IllegalStateException("An SPDX license id must have beend defined at this stage.");
writer.append("\nIt is redistributed under the following license:\n\n");
writer.append("which is available here: https://spdx.org/licenses/" + spdxLicenseId + "\n");
}
} else {
- String url = manifest.getMainAttributes().getValue(BUNDLE_LICENSE.toString());
+ String url = BUNDLE_LICENSE.get(mapping);
if (url != null) {
writer.write("which is available here: " + url + "\n");
} else {
- logger.log(ERROR, "No licne URL for " + jarDir);
+ logger.log(ERROR, "No licence URL for " + jarDir);
}
}
- writer.write("\n");
// origin
- String m2Repo = manifest.getMainAttributes().getValue(ARGEO_ORIGIN_M2_REPO.toString());
- String originDesc = manifest.getMainAttributes().getValue(ARGEO_ORIGIN_M2.toString());
+ String originDesc = ARGEO_ORIGIN_URI.get(mapping);
if (originDesc != null)
- writer.append("The original component has M2 coordinates:\n" + originDesc.replace(',', '\n') + "\n"
- + (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
+ writer.append("\nThe original component comes from " + originDesc + ".\n");
else {
- originDesc = manifest.getMainAttributes().getValue(ARGEO_ORIGIN_URI.toString());
+ String m2Repo = ARGEO_ORIGIN_M2_REPO.get(mapping);
+ originDesc = ARGEO_ORIGIN_M2.get(mapping);
if (originDesc != null)
- writer.append("The original component comes from " + originDesc + ".\n");
+ writer.append("\nThe original component has M2 coordinates:\n" + originDesc.replace(',', '\n')
+ + "\n" + (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
else
logger.log(ERROR, "Cannot find origin information in " + jarDir);
}
+ String originSources = ARGEO_ORIGIN_SOURCES_URI.get(mapping);
+ if (originSources != null)
+ writer.append("\nThe original sources come from " + originSources + ".\n");
- writer.append("\nA detailed list of changes is available under " + CHANGES + ".\n");
- if (!jarDir.getFileName().endsWith(".src")) {// binary archive
+ if (Files.exists(jarDir.resolve(CHANGES)))
+ writer.append("\nA detailed list of changes is available under " + CHANGES + ".\n");
+
+ if (!jarDir.getFileName().toString().endsWith(".src")) {// binary archive
if (separateSources)
writer.append("Corresponding sources are available in the related archive named "
+ jarDir.toString() + ".src.jar.\n");
writer.append("Corresponding sources are available under OSGI-OPT/src.\n");
}
}
-
}
/**
/** Append changes to the A2-ORIGIN/changes file. */
void appendChanges(Path baseDirectory) throws IOException {
+ if (modified.isEmpty() && deleted.isEmpty() && added.isEmpty() && moved.isEmpty())
+ return; // no changes
Path changesFile = baseDirectory.resolve(CHANGES);
Files.createDirectories(changesFile.getParent());
try (BufferedWriter writer = Files.newBufferedWriter(changesFile, APPEND, CREATE)) {
}
/** Absolute path to the file */
- static URL mavenRepoUrl(String repoBase, M2Artifact artifact) {
- String url = artifactUrl(repoBase == null ? MAVEN_CENTRAL_BASE_URL : repoBase, artifact);
- try {
- return new URL(url);
- } catch (MalformedURLException e) {
- // it should not happen
- throw new IllegalStateException(e);
- }
+ static URI mavenRepoUrl(String repoBase, M2Artifact artifact) throws URISyntaxException {
+ String uri = artifactUrl(repoBase == null ? MAVEN_CENTRAL_BASE_URL : repoBase, artifact);
+ return new URI(uri);
}
/** Absolute path to the directories where the files will be stored */
projects / cc0 / argeo-build.git / blobdiff