all: distribution
$(MAKE) -f Makefile-ext.mk
+
BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
A2_OUTPUT = $(SDK_BUILD_BASE)/a2
bootstrap :
mkdir -p $(SDK_BUILD_BASE)/bootstrap
- wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.28.0/ecj-3.28.0.jar
+ wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.29.0/ecj-3.29.0.jar
wget -c -O $(BOOTSTRAP_BASE)/slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.28/slf4j-api-1.7.28.jar
wget -c -O $(BOOTSTRAP_BASE)/bndlib.jar https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.3.0/biz.aQute.bndlib-5.3.0.jar
$(JVM) -cp $(BOOTSTRAP_BASE)/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main -11 -nowarn -time -cp \
import org.argeo.slc.DefaultNameVersion;
import org.argeo.slc.ManifestConstants;
import org.argeo.slc.NameVersion;
+import org.argeo.slc.factory.m2.Artifact;
import org.argeo.slc.factory.m2.DefaultArtifact;
import org.argeo.slc.factory.m2.MavenConventionsUtils;
mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors);
}
+ /*
+ * MAVEN ORIGIN
+ */
+
+ /** Process a whole category/group id. */
public void processCategory(Path targetCategoryBase) {
try {
DirectoryStream<Path> bnds = Files.newDirectoryStream(targetCategoryBase,
}
}
+ /** Process a standalone Maven artifact. */
public void processSingleM2ArtifactDistributionUnit(Path bndFile) {
try {
String category = bndFile.getParent().getFileName().toString();
throw new IllegalArgumentException("No M2 coordinates available for " + bndFile);
DefaultArtifact artifact = new DefaultArtifact(m2Coordinates);
URL url = MavenConventionsUtils.mavenRepoUrl(repoStr, artifact);
- Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar");
+ Path downloaded = download(url, originBase, artifact);
Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact);
}
}
+ /** Process multiple Maven artifacts. */
public void processM2BasedDistributionUnit(Path duDir) {
try {
String category = duDir.getParent().getFileName().toString();
Path mergeBnd = duDir.resolve(MERGE_BND);
if (Files.exists(mergeBnd)) {
mergeM2Artifacts(mergeBnd);
- return;
+// return;
}
Path commonBnd = duDir.resolve(COMMON_BND);
+ if (!Files.exists(commonBnd)) {
+ return;
+ }
Properties commonProps = new Properties();
try (InputStream in = Files.newInputStream(commonBnd)) {
commonProps.load(in);
m2Version = m2Version.substring(1);
DirectoryStream<Path> ds = Files.newDirectoryStream(duDir,
- (p) -> p.getFileName().toString().endsWith(".bnd")
- && !p.getFileName().toString().equals(COMMON_BND));
+ (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)) {
// download
URL url = MavenConventionsUtils.mavenRepoUrl(repoStr, artifact);
- Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar");
+ Path downloaded = download(url, originBase, artifact);
Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact);
// logger.log(Level.DEBUG, () -> "Processed " + downloaded);
}
+ /** Merge multiple Maven artifacts. */
protected void mergeM2Artifacts(Path mergeBnd) throws IOException {
Path duDir = mergeBnd.getParent();
String category = duDir.getParent().getFileName().toString();
if (artifact.getVersion() == null)
artifact.setVersion(m2Version);
URL url = MavenConventionsUtils.mavenRepoUrl(repoStr, artifact);
- Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar");
+ Path downloaded = download(url, originBase, artifact);
JarEntry entry;
try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(downloaded), false)) {
entries: while ((entry = jarIn.getNextJarEntry()) != null) {
}
- protected void downloadAndProcessM2Sources(String repoStr, DefaultArtifact artifact, Path targetBundleDir)
- throws IOException {
- DefaultArtifact sourcesArtifact = new DefaultArtifact(artifact.toM2Coordinates(), "sources");
- URL sourcesUrl = MavenConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact);
- Path sourcesDownloaded = download(sourcesUrl, originBase, artifact.toM2Coordinates() + ".sources.jar");
- processM2SourceJar(sourcesDownloaded, targetBundleDir);
- logger.log(Level.DEBUG, () -> "Processed source " + sourcesDownloaded);
-
- }
-
+ /** Generate MANIFEST using BND. */
protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps,
DefaultArtifact artifact) {
}
+ /** Download and integrates sources for a single Maven artifact. */
+ protected void downloadAndProcessM2Sources(String repoStr, DefaultArtifact artifact, Path targetBundleDir)
+ throws IOException {
+ DefaultArtifact sourcesArtifact = new DefaultArtifact(artifact.toM2Coordinates(), "sources");
+ URL sourcesUrl = MavenConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact);
+ Path sourcesDownloaded = download(sourcesUrl, originBase, artifact, true);
+ processM2SourceJar(sourcesDownloaded, targetBundleDir);
+ logger.log(Level.DEBUG, () -> "Processed source " + sourcesDownloaded);
+
+ }
+
+ /** Integrate sources from a downloaded jar file. */
protected void processM2SourceJar(Path file, Path targetBundleDir) throws IOException {
try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src");
}
+ /** Download a Maven artifact. */
+ protected Path download(URL url, Path dir, Artifact artifact) throws IOException {
+ return download(url, dir, artifact, false);
+ }
+
+ /** Download a Maven artifact. */
+ protected Path download(URL url, Path dir, Artifact artifact, boolean sources) throws IOException {
+ return download(url, dir, artifact.getGroupId() + '/' + artifact.getArtifactId() + "-" + artifact.getVersion()
+ + (sources ? "-sources" : "") + ".jar");
+ }
+
+ /*
+ * ECLIPSE ORIGIN
+ */
+
+ /** Process an archive in Eclipse format. */
public void processEclipseArchive(Path duDir) {
try {
String category = duDir.getParent().getFileName().toString();
try (InputStream in = Files.newInputStream(commonBnd)) {
commonProps.load(in);
}
- Properties includes = new Properties();
- try (InputStream in = Files.newInputStream(duDir.resolve("includes.properties"))) {
- includes.load(in);
- }
String url = commonProps.getProperty(ManifestConstants.SLC_ORIGIN_URI.toString());
Path downloaded = tryDownload(url, originBase);
FileSystem zipFs = FileSystems.newFileSystem(downloaded, (ClassLoader) null);
- List<PathMatcher> pathMatchers = new ArrayList<>();
+ // filters
+ List<PathMatcher> includeMatchers = new ArrayList<>();
+ Properties includes = new Properties();
+ try (InputStream in = Files.newInputStream(duDir.resolve("includes.properties"))) {
+ includes.load(in);
+ }
for (Object pattern : includes.keySet()) {
PathMatcher pathMatcher = zipFs.getPathMatcher("glob:/" + pattern);
- pathMatchers.add(pathMatcher);
+ includeMatchers.add(pathMatcher);
+ }
+
+ List<PathMatcher> excludeMatchers = new ArrayList<>();
+ Path excludeFile = duDir.resolve("excludes.properties");
+ if (Files.exists(excludeFile)) {
+ Properties excludes = new Properties();
+ try (InputStream in = Files.newInputStream(excludeFile)) {
+ excludes.load(in);
+ }
+ for (Object pattern : excludes.keySet()) {
+ PathMatcher pathMatcher = zipFs.getPathMatcher("glob:/" + pattern);
+ excludeMatchers.add(pathMatcher);
+ }
}
Files.walkFileTree(zipFs.getRootDirectories().iterator().next(), new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
- pathMatchers: for (PathMatcher pathMatcher : pathMatchers) {
- if (pathMatcher.matches(file)) {
+ includeMatchers: for (PathMatcher includeMatcher : includeMatchers) {
+ if (includeMatcher.matches(file)) {
+ for (PathMatcher excludeMatcher : excludeMatchers) {
+ if (excludeMatcher.matches(file)) {
+ logger.log(Level.WARNING, "Skipping excluded " + file);
+ return FileVisitResult.CONTINUE;
+ }
+ }
if (file.getFileName().toString().contains(".source_")) {
processEclipseSourceJar(file, targetCategoryBase);
logger.log(Level.DEBUG, () -> "Processed source " + file);
processBundleJar(file, targetCategoryBase, new HashMap<>());
logger.log(Level.DEBUG, () -> "Processed " + file);
}
- break pathMatchers;
+ break includeMatchers;
}
}
return FileVisitResult.CONTINUE;
}
+ /** Process sources in Eclipse format. */
+ protected void processEclipseSourceJar(Path file, Path targetBase) throws IOException {
+ try {
+ Path targetBundleDir;
+ try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
+ Manifest manifest = jarIn.getManifest();
+
+ String[] relatedBundle = manifest.getMainAttributes().getValue("Eclipse-SourceBundle").split(";");
+ String version = relatedBundle[1].substring("version=\"".length());
+ version = version.substring(0, version.length() - 1);
+ NameVersion nameVersion = new DefaultNameVersion(relatedBundle[0], version);
+ targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
+
+ Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src");
+
+ // TODO make it less dangerous?
+ if (Files.exists(targetSourceDir)) {
+// deleteDirectory(targetSourceDir);
+ } else {
+ Files.createDirectories(targetSourceDir);
+ }
+
+ // copy entries
+ JarEntry entry;
+ entries: while ((entry = jarIn.getNextJarEntry()) != null) {
+ if (entry.isDirectory())
+ continue entries;
+ if (entry.getName().startsWith("META-INF"))// skip META-INF entries
+ continue entries;
+ Path target = targetSourceDir.resolve(entry.getName());
+ Files.createDirectories(target.getParent());
+ Files.copy(jarIn, target);
+ logger.log(Level.TRACE, () -> "Copied source " + target);
+ }
+
+ // copy MANIFEST
+// Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF");
+// Files.createDirectories(manifestPath.getParent());
+// try (OutputStream out = Files.newOutputStream(manifestPath)) {
+// manifest.write(out);
+// }
+ }
+ } catch (IOException e) {
+ throw new IllegalStateException("Cannot process " + file, e);
+ }
+
+ }
+
+ /*
+ * COMMON PROCESSING
+ */
+ /** Normalise a bundle. */
protected Path processBundleJar(Path file, Path targetBase, Map<String, String> entries) throws IOException {
DefaultNameVersion nameVersion;
Path targetBundleDir;
return targetBundleDir;
}
- protected void processEclipseSourceJar(Path file, Path targetBase) throws IOException {
- try {
- Path targetBundleDir;
- try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
- Manifest manifest = jarIn.getManifest();
-
- String[] relatedBundle = manifest.getMainAttributes().getValue("Eclipse-SourceBundle").split(";");
- String version = relatedBundle[1].substring("version=\"".length());
- version = version.substring(0, version.length() - 1);
- NameVersion nameVersion = new DefaultNameVersion(relatedBundle[0], version);
- targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
-
- Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src");
-
- // TODO make it less dangerous?
- if (Files.exists(targetSourceDir)) {
-// deleteDirectory(targetSourceDir);
- } else {
- Files.createDirectories(targetSourceDir);
- }
-
- // copy entries
- JarEntry entry;
- entries: while ((entry = jarIn.getNextJarEntry()) != null) {
- if (entry.isDirectory())
- continue entries;
- if (entry.getName().startsWith("META-INF"))// skip META-INF entries
- continue entries;
- Path target = targetSourceDir.resolve(entry.getName());
- Files.createDirectories(target.getParent());
- Files.copy(jarIn, target);
- logger.log(Level.TRACE, () -> "Copied source " + target);
- }
-
- // copy MANIFEST
-// Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF");
-// Files.createDirectories(manifestPath.getParent());
-// try (OutputStream out = Files.newOutputStream(manifestPath)) {
-// manifest.write(out);
-// }
- }
- } catch (IOException e) {
- throw new IllegalStateException("Cannot process " + file, e);
- }
-
- }
+ /*
+ * UTILITIES
+ */
- static void deleteDirectory(Path path) throws IOException {
+ /** Recursively deletes a directory. */
+ private static void deleteDirectory(Path path) throws IOException {
if (!Files.exists(path))
return;
Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
});
}
+ /** Extract name/version from a MANIFEST. */
protected DefaultNameVersion nameVersionFromManifest(Manifest manifest) {
Attributes attrs = manifest.getMainAttributes();
// symbolic name
return new DefaultNameVersion(symbolicName, version);
}
+ /** Try to download from an URI. */
protected Path tryDownload(String uri, Path dir) throws IOException {
// find mirror
List<String> urlBases = null;
}
if (urlBases == null)
try {
- return download(new URL(uri), dir, null);
+ return download(new URL(uri), dir);
} catch (FileNotFoundException e) {
throw new FileNotFoundException("Cannot find " + uri);
}
String relativePath = uri.substring(uriPrefix.length());
URL url = new URL(urlBase + relativePath);
try {
- return download(url, dir, null);
+ return download(url, dir);
} catch (FileNotFoundException e) {
logger.log(Level.WARNING, "Cannot download " + url + ", trying another mirror");
}
//
// }
+ /** Effectively download. */
+ protected Path download(URL url, Path dir) throws IOException {
+ return download(url, dir, (String) null);
+ }
+
+ /** Effectively download. */
protected Path download(URL url, Path dir, String name) throws IOException {
Path dest;
if (Files.exists(dest)) {
logger.log(Level.TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again");
return dest;
+ } else {
+ Files.createDirectories(dest.getParent());
}
try (InputStream in = url.openStream()) {
return dest;
}
+ /** Create a JAR file from a directory. */
protected Path createJar(Path bundleDir) throws IOException {
Path jarPath = bundleDir.getParent().resolve(bundleDir.getFileName() + ".jar");
Path manifestPath = bundleDir.resolve("META-INF/MANIFEST.MF");
return jarPath;
}
+ /** For development purproses. */
public static void main(String[] args) {
Path factoryBase = Paths.get("../../output/a2").toAbsolutePath().normalize();
A2Factory factory = new A2Factory(factoryBase);
// factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
// factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
// factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
- factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
+// factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
+ factory.processEclipseArchive(
+ descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rwt").resolve("eclipse-rwt"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-swt"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-nebula"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
+ factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
System.exit(0);
// Eclipse
factory.processEclipseArchive(
descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rwt").resolve("eclipse-rwt"));
factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-swt"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-nebula"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox"));
factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
-
+ factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
System.exit(0);
// Maven
factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty"));
factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jcr"));
+ factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
+ factory.processCategory(descriptorsBase.resolve("org.argeo.tp.poi"));
+ factory.processCategory(descriptorsBase.resolve("org.argeo.tp.gis"));
}
}
-Subproject commit 90dfe68dd0a8f9510939b2a276aed3d79e563bb2
+Subproject commit 2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d
<target name="(output) argeo-tp-rap">
<locations>
<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+ <location type="Target" uri="file:${project_loc:/argeo-slc-unstable}/sdk/output-argeo-tp-rwt.target"/>
</locations>
</target>
\ No newline at end of file
<target name="(output) argeo-tp-rcp">
<locations>
<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
- <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+ <location type="Target" uri="file:${project_loc:/argeo-slc-unstable}/sdk/output-argeo-tp-swt.target"/>
</locations>
</target>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="(output) argeo-tp-rwt">
+ <locations>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rwt" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+ </locations>
+</target>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="(output) argeo-tp-swt">
+ <locations>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.swt" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+ <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+ </locations>
+</target>
\ No newline at end of file
// Eclipse
factory.processEclipseArchive(
descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rwt").resolve("eclipse-rwt"));
factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-swt"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-nebula"));
+ factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox"));
factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
--- /dev/null
+Bundle-License: Apache-2.0
+SLC-Origin-M2: :1.14
\ No newline at end of file
--- /dev/null
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.batik
+SLC-Origin-M2: :1.14
+Export-Package: *
+Import-Package: \
+org.apache.batik.script.*;resolution:="optional",\
+org.apache.batik.*,\
+org.apache.xmlgraphics.*,\
+org.w3c.*,\
+*;resolution:="optional"
+SLC-Origin-M2-Merge: \
+org.apache.xmlgraphics:batik-anim, \
+org.apache.xmlgraphics:batik-awt-util, \
+org.apache.xmlgraphics:batik-bridge, \
+org.apache.xmlgraphics:batik-codec, \
+org.apache.xmlgraphics:batik-dom, \
+org.apache.xmlgraphics:batik-ext, \
+org.apache.xmlgraphics:batik-extension, \
+org.apache.xmlgraphics:batik-gui-util, \
+org.apache.xmlgraphics:batik-gvt, \
+org.apache.xmlgraphics:batik-parser, \
+org.apache.xmlgraphics:batik-shared-resources, \
+org.apache.xmlgraphics:batik-script, \
+org.apache.xmlgraphics:batik-svg-dom, \
+org.apache.xmlgraphics:batik-svggen, \
+org.apache.xmlgraphics:batik-swing, \
+org.apache.xmlgraphics:batik-transcoder, \
+org.apache.xmlgraphics:batik-xml
\ No newline at end of file
--- /dev/null
+Bundle-SymbolicName: org.apache.batik.constants
+SLC-Origin-M2: org.apache.xmlgraphics:batik-constants
--- /dev/null
+Bundle-SymbolicName: org.apache.batik.css
+SLC-Origin-M2: org.apache.xmlgraphics:batik-css
--- /dev/null
+Bundle-SymbolicName: org.apache.batik.i18n
+SLC-Origin-M2: org.apache.xmlgraphics:batik-i18n
--- /dev/null
+Bundle-SymbolicName: org.apache.batik.util
+SLC-Origin-M2: org.apache.xmlgraphics:batik-util
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.tika.core
-SLC-Origin-M2: org.apache.tika:tika-core:1.27
+SLC-Origin-M2: org.apache.tika:tika-core:1.28.2
SLC-Origin-ManifestNotModified: true
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.tika.parsers
Import-Package: *;resolution:=optional
-SLC-Origin-M2: org.apache.tika:tika-parsers:1.27
\ No newline at end of file
+SLC-Origin-M2: org.apache.tika:tika-parsers:1.28.2
\ No newline at end of file
--- /dev/null
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.xmlgraphics
+SLC-Origin-M2: org.apache.xmlgraphics:xmlgraphics-commons:2.7
Bundle-License: EPL-1.0
SLC-Origin-ManifestNotModified: true
-SLC-Origin-URI: http://www.eclipse.org/downloads/equinox/drops/R-4.22-202111241800/equinox-SDK-4.22.zip
+SLC-Origin-URI: http://www.eclipse.org/downloads/equinox/drops/R-4.23-202203080310/equinox-SDK-4.23.zip
-plugins/org.eclipse.osgi_*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.osgi.source_*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.osgi.util*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.osgi.services*.jar=org.argeo.tp.eclipse.equinox
-plugins/jakarta.servlet-api*.jar=org.argeo.tp.javax
-plugins/org.apache.felix.gogo.*.jar=org.argeo.tp.apache.felix
-plugins/org.apache.felix.scr*.jar=org.argeo.tp.apache.felix
-plugins/org.eclipse.equinox.app*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.cm*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.common*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.console_*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.console.source_*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.ds*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.metatype*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.event*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.http.jetty*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.http.registry*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.http.servlet*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.http.servletbridge*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.preferences*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.registry*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.servletbridge*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.util*.jar=org.argeo.tp.eclipse.equinox
+plugins/org.eclipse.osgi_*.jar=
+plugins/org.eclipse.osgi.source_*.jar=
+plugins/org.eclipse.osgi.util*.jar=
+plugins/org.eclipse.osgi.services*.jar=
+plugins/jakarta.servlet-api*.jar=
+plugins/org.apache.felix.gogo.*.jar=
+plugins/org.apache.felix.scr*.jar=
+plugins/org.eclipse.equinox.app*.jar=
+plugins/org.eclipse.equinox.cm*.jar=
+plugins/org.eclipse.equinox.common*.jar=
+plugins/org.eclipse.equinox.console_*.jar=
+plugins/org.eclipse.equinox.console.source_*.jar=
+plugins/org.eclipse.equinox.ds*.jar=
+plugins/org.eclipse.equinox.metatype*.jar=
+plugins/org.eclipse.equinox.event*.jar=
+plugins/org.eclipse.equinox.http.jetty*.jar=
+plugins/org.eclipse.equinox.http.registry*.jar=
+plugins/org.eclipse.equinox.http.servlet*.jar=
+plugins/org.eclipse.equinox.http.servletbridge*.jar=
+plugins/org.eclipse.equinox.preferences*.jar=
+plugins/org.eclipse.equinox.registry*.jar=
+plugins/org.eclipse.equinox.servletbridge*.jar=
+plugins/org.eclipse.equinox.util*.jar=
Bundle-License: EPL-1.0
SLC-Origin-ManifestNotModified: true
-SLC-Origin-URI: http://www.eclipse.org/downloads/rt/rap/3.19/e4/rap-e4-3.19.0-R-20211130-1934.zip
+SLC-Origin-URI: http://www.eclipse.org/downloads/rt/rap/3.20/e4/rap-e4-3.20.0-R-20220309-1623.zip
-plugins/javax.inject*.jar=org.argeo.tp.javax
-plugins/javax.annotation*.jar=org.argeo.tp.javax
-plugins/org.apache.commons.jxpath*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.core.*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.rwt_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.rwt.source_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.rwt.osgi_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.rwt.osgi.source_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.fileupload*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.filedialog*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.e4*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.emf*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.e4_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.e4.source_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.ui.workbench*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.ui_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.ui.source_*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.ui.views*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.jface*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.ui.forms*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.help*.jar=org.argeo.tp.eclipse.rap
-plugins/org.eclipse.rap.nebula.*.jar=org.argeo.tp.eclipse.rap
-plugins/com.ibm.icu*.jar=org.argeo.tp.eclipse.rap
+plugins/javax.inject*.jar=
+plugins/javax.annotation*.jar=
+plugins/org.apache.commons.jxpath*.jar=
+plugins/org.eclipse.e4*.jar=
+plugins/org.eclipse.emf*.jar=
+plugins/org.eclipse.rap.e4_*.jar=
+plugins/org.eclipse.rap.e4.source_*.jar=
+plugins/org.eclipse.rap.ui.workbench*.jar=
+plugins/org.eclipse.rap.ui_*.jar=
+plugins/org.eclipse.rap.ui.source_*.jar=
+plugins/org.eclipse.rap.ui.views*.jar=
+plugins/org.eclipse.rap.ui.forms*.jar=
+plugins/org.eclipse.help*.jar=
+plugins/com.ibm.icu*.jar=
+plugins/org.eclipse.rap.jface.databinding*.jar=
Bundle-License: EPL-1.0
SLC-Origin-ManifestNotModified: true
-SLC-Origin-URI: http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.22-202111241800/org.eclipse.rcp.source-4.22.zip
+SLC-Origin-URI: http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.23-202203080310/org.eclipse.rcp.source-4.23.zip
--- /dev/null
+plugins/org.eclipse.swt*.jar=
+plugins/org.eclipse.core.*.jar=
+plugins/org.eclipse.jface_*.jar=
+plugins/org.eclipse.jface.source_*.jar=
+plugins/*ppc64le*
+plugins/org.eclipse.e4.ui.css*.jar=
-plugins/*.jar=org.argeo.tp.eclipse.rcp
+plugins/javax.inject*.jar=
+plugins/javax.annotation*.jar=
+plugins/org.apache.commons.jxpath*.jar=
+plugins/org.eclipse.*.jar=
+plugins/com.ibm.icu*.jar=
+
Bundle-License: EPEL-2.0
-SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.common:2.23.0
+SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.common:2.24.0
SLC-Origin-ManifestNotModified: true
Bundle-License: EPEL-2.0
-SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore:2.25.0
+SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore:2.26.0
SLC-Origin-ManifestNotModified: true
--- /dev/null
+Bundle-License: EPL-1.0
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-URI: http://www.eclipse.org/downloads/rt/rap/3.20/e4/rap-e4-3.20.0-R-20220309-1623.zip
--- /dev/null
+plugins/org.eclipse.core*.jar=
+plugins/org.eclipse.rap.rwt_*.jar=
+plugins/org.eclipse.rap.rwt.source_*.jar=
+plugins/org.eclipse.rap.rwt.osgi_*.jar=
+plugins/org.eclipse.rap.rwt.osgi.source_*.jar=
+plugins/org.eclipse.rap.fileupload*.jar=
+plugins/org.eclipse.rap.filedialog*.jar=
+plugins/org.eclipse.rap.jface_*.jar=
+plugins/org.eclipse.rap.jface.source_*.jar=
+plugins/org.eclipse.rap.nebula.*.jar=
--- /dev/null
+Bundle-License: EPL-1.0
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-URI: http://www.eclipse.org/downloads/equinox/drops/R-4.23-202203080310/equinox-SDK-4.23.zip
--- /dev/null
+plugins/org.eclipse.equinox.security.ui*.jar=
--- /dev/null
+plugins/org.eclipse.equinox.security*.jar=
--- /dev/null
+Bundle-License: EPL-2.0
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-URI: http://www.eclipse.org/downloads/nebula/releases/2.6.0/repository-nebula-2.6.0.zip
--- /dev/null
+plugins/org.eclipse.nebula.widgets.grid.example*.jar=
+plugins/org.eclipse.nebula.widgets.grid.css*.jar=
--- /dev/null
+plugins/org.eclipse.nebula.widgets.grid*.jar=
+plugins/org.eclipse.nebula.widgets.richtext*.jar=
--- /dev/null
+Bundle-License: EPL-1.0
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-URI: http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.23-202203080310/org.eclipse.rcp.source-4.23.zip
--- /dev/null
+plugins/*ppc64le*
\ No newline at end of file
--- /dev/null
+plugins/com.sun.jna*.jar=
+plugins/org.eclipse.swt*.jar=
+plugins/org.eclipse.core*.jar=
+plugins/org.eclipse.jface_*.jar=
+plugins/org.eclipse.jface.source_*.jar=
+plugins/org.eclipse.e4.ui.css*.jar=
+++ /dev/null
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.batik
-SLC-Origin-M2: :1.14
-Export-Package: *
-Import-Package: \
-*;resolution:="optional"
-SLC-Origin-M2-Merge: \
-org.apache.xmlgraphics:batik-anim, \
-org.apache.xmlgraphics:batik-awt-util, \
-org.apache.xmlgraphics:batik-bridge, \
-org.apache.xmlgraphics:batik-codec, \
-org.apache.xmlgraphics:batik-constants, \
-org.apache.xmlgraphics:batik-css, \
-org.apache.xmlgraphics:batik-dom, \
-org.apache.xmlgraphics:batik-ext, \
-org.apache.xmlgraphics:batik-extension, \
-org.apache.xmlgraphics:batik-gui-util, \
-org.apache.xmlgraphics:batik-gvt, \
-org.apache.xmlgraphics:batik-i18n, \
-org.apache.xmlgraphics:batik-parser, \
-org.apache.xmlgraphics:batik-shared-resources, \
-org.apache.xmlgraphics:batik-script, \
-org.apache.xmlgraphics:batik-svg-dom, \
-org.apache.xmlgraphics:batik-svggen, \
-org.apache.xmlgraphics:batik-swing, \
-org.apache.xmlgraphics:batik-transcoder, \
-org.apache.xmlgraphics:batik-util, \
-org.apache.xmlgraphics:batik-xml
\ No newline at end of file
+++ /dev/null
-Bundle-License: CDDL-1.0
-SLC-Origin-M2: com.sun.activation:javax.activation:1.2.0
-SLC-Origin-ManifestNotModified: true
+++ /dev/null
-Bundle-License: CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0
-Bundle-SymbolicName: javax.mail
-SLC-Origin-M2: com.sun.mail:javax.mail:1.6.2
-SLC-Origin-ManifestNotModified: true
+++ /dev/null
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xmlgraphics
-SLC-Origin-M2: org.apache.xmlgraphics:xmlgraphics-commons:2.7
+++ /dev/null
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.css.sac
-SLC-Origin-M2: org.w3c.css:sac:1.3
+++ /dev/null
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.dom.smil
-Bundle-Version: 1.0
-SLC-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25
+++ /dev/null
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.dom.svg
-SLC-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1
Bundle-License: LGPL-2.1-only
Bundle-SymbolicName: org.geotools
-SLC-Origin-M2: :26.3
+SLC-Origin-M2: :26.4
SLC-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
Import-Package: \
Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.20.4
\ No newline at end of file
+SLC-Origin-M2: :2.20.5
\ No newline at end of file
Bundle-License: Apache-2.0
-SLC-Origin-M2: :1.40.0
\ No newline at end of file
+SLC-Origin-M2: :1.42.0
\ No newline at end of file
Bundle-License: Apache-2.0
-SLC-Origin-M2: :10.0.8
+SLC-Origin-M2: :10.0.9
Bundle-License: Apache-2.0
-SLC-Origin-M2: :5.2.1
\ No newline at end of file
+SLC-Origin-M2: :5.2.2
\ No newline at end of file
Bundle-License: EPL-2.0
-SLC-Origin-M2: org.eclipse.jdt:ecj:3.28.0
+SLC-Origin-M2: org.eclipse.jdt:ecj:3.29.0
SLC-Origin-ManifestNotModified: true
Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
\ No newline at end of file
--- /dev/null
+Bundle-SymbolicName: bcmail
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-M2: org.bouncycastle:bcmail-jdk18on
Bundle-SymbolicName: bcpg
SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcpg-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcpg-jdk18on
Bundle-SymbolicName: bcpkix
SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcpkix-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcpkix-jdk18on
Bundle-SymbolicName: bcprov
SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcprov-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcprov-jdk18on
Bundle-SymbolicName: bcutil
SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcutil-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcutil-jdk18on
Bundle-License: MIT
-SLC-Origin-M2: :1.70
+SLC-Origin-M2: :1.71
--- /dev/null
+Bundle-License: BSD-3-Clause
+SLC-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2
+SLC-Origin-ManifestNotModified: true
--- /dev/null
+Bundle-License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+Bundle-SymbolicName: javax.mail
+SLC-Origin-M2: com.sun.mail:jakarta.mail:1.6.7
+SLC-Origin-ManifestNotModified: true
Bundle-License: BSD-2-Clause
Bundle-SymbolicName: org.postgresql.jdbc42
-SLC-Origin-M2: org.postgresql:postgresql:42.3.2
+SLC-Origin-M2: org.postgresql:postgresql:42.3.5
SLC-Origin-ManifestNotModified: true
--- /dev/null
+Bundle-License: W3C
+Bundle-SymbolicName: org.w3c.css.sac
+SLC-Origin-M2: org.w3c.css:sac:1.3
--- /dev/null
+Bundle-License: W3C
+Bundle-SymbolicName: org.w3c.dom.smil
+Bundle-Version: 1.0
+SLC-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25
--- /dev/null
+Bundle-License: W3C
+Bundle-SymbolicName: org.w3c.dom.svg
+SLC-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1