if (artifact.getVersion() == null) {
artifact.setVersion(m2Version);
} else {
- logger.log(WARNING, p.getFileName() + " : Using version " + artifact.getVersion()
+ logger.log(DEBUG, p.getFileName() + " : Using version " + artifact.getVersion()
+ " specified in descriptor rather than " + m2Version + " specified in " + COMMON_BND);
}
}
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());
nameVersion = new NameVersion(ourSymbolicName, ourVersion);
} else {
nameVersion = nameVersionFromManifest(manifest);
- if (nameVersion == null) {
- // hack for weird issue with JNA jar in Eclipse
- String[] arr_ = file.getFileName().toString().split("_");
- String v = arr_[1].substring(0, arr_[1].length() - 4);// remove .jar
- nameVersion = new NameVersion(arr_[0], v);
- logger.log(WARNING, file + " has no symbolic name, trying " + nameVersion.getName() + "/"
- + nameVersion.getVersion() + " based on its name");
- }
+ 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);
}
/**
- * Effectively download. Synchronised in order to avoid downloading twice in
- * parallel.
+ * Effectively download an archive.
*/
- synchronized Path downloadArchive(URL url, Path dir) throws IOException {
+ Path downloadArchive(URL url, Path dir) throws IOException {
return download(url, 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(URL url, Path dir, String name) throws IOException {
Path dest;
if (name == null) {
// license
String spdxLicenseId = SPDX_LICENSE_IDENTIFIER.get(mapping);
- if (spdxLicenseId == null) {
- if (jarDir.getFileName().toString().startsWith("com.sun.jna"))
- spdxLicenseId = "LGPL-2.1 OR Apache-2.0";
- else
- throw new IllegalStateException(
- "An SPDX license id must have beend defined for " + jarDir + " at this stage.");
- }
+ 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("SPDX-Identifier: " + spdxLicenseId + "\n\n");