Update third parties

diff --git a/Makefile-tp.mk b/Makefile-tp.mk
index df3b8c34ee22c0f73ddd0546953d8fe6eb2762a3..5fcaba3b15ad1baf7cd0b08c4b86d822cb2cc665 100644 (file)
--- a/Makefile-tp.mk
+++ b/Makefile-tp.mk
@@ -4,6 +4,7 @@ include sdk.mk
 all: distribution
        $(MAKE) -f Makefile-ext.mk
 
+
 BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
 
 A2_OUTPUT = $(SDK_BUILD_BASE)/a2
@@ -15,7 +16,7 @@ distribution: bootstrap
        
 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 \

diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
index 388ab7aba6f8cbbf62b4673141eed8fc24d33785..5aa9d9d5370a977f6b5f178b4be2bcb674d40a15 100644 (file)
--- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
+++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
@@ -41,6 +41,7 @@ import org.argeo.slc.DefaultCategoryNameVersion;
 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;
 
@@ -73,6 +74,11 @@ public class A2Factory {
                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,
@@ -91,6 +97,7 @@ public class A2Factory {
                }
        }
 
+       /** Process a standalone Maven artifact. */
        public void processSingleM2ArtifactDistributionUnit(Path bndFile) {
                try {
                        String category = bndFile.getParent().getFileName().toString();
@@ -116,7 +123,7 @@ public class A2Factory {
                                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);
 
@@ -128,6 +135,7 @@ public class A2Factory {
                }
        }
 
+       /** Process multiple Maven artifacts. */
        public void processM2BasedDistributionUnit(Path duDir) {
                try {
                        String category = duDir.getParent().getFileName().toString();
@@ -137,10 +145,13 @@ public class A2Factory {
                        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);
@@ -157,8 +168,8 @@ public class A2Factory {
                        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)) {
@@ -212,7 +223,7 @@ public class A2Factory {
 
                                // 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);
@@ -228,6 +239,7 @@ public class A2Factory {
 
        }
 
+       /** Merge multiple Maven artifacts. */
        protected void mergeM2Artifacts(Path mergeBnd) throws IOException {
                Path duDir = mergeBnd.getParent();
                String category = duDir.getParent().getFileName().toString();
@@ -266,7 +278,7 @@ public class A2Factory {
                        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) {
@@ -352,16 +364,7 @@ public class A2Factory {
 
        }
 
-       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) {
 
@@ -440,6 +443,18 @@ public class A2Factory {
 
        }
 
+       /** 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");
@@ -473,6 +488,22 @@ public class A2Factory {
 
        }
 
+       /** 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();
@@ -490,27 +521,47 @@ public class A2Factory {
                        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);
@@ -519,7 +570,7 @@ public class A2Factory {
                                                                processBundleJar(file, targetCategoryBase, new HashMap<>());
                                                                logger.log(Level.DEBUG, () -> "Processed " + file);
                                                        }
-                                                       break pathMatchers;
+                                                       break includeMatchers;
                                                }
                                        }
                                        return FileVisitResult.CONTINUE;
@@ -536,6 +587,58 @@ public class A2Factory {
 
        }
 
+       /** 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;
@@ -621,54 +724,12 @@ public class A2Factory {
                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>() {
@@ -688,6 +749,7 @@ public class A2Factory {
                });
        }
 
+       /** Extract name/version from a MANIFEST. */
        protected DefaultNameVersion nameVersionFromManifest(Manifest manifest) {
                Attributes attrs = manifest.getMainAttributes();
                // symbolic name
@@ -701,6 +763,7 @@ public class A2Factory {
                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;
@@ -716,7 +779,7 @@ public class A2Factory {
                }
                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);
                        }
@@ -726,7 +789,7 @@ public class A2Factory {
                        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");
                        }
@@ -739,6 +802,12 @@ public class A2Factory {
 //             
 //     }
 
+       /** 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;
@@ -750,6 +819,8 @@ public class A2Factory {
                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()) {
@@ -759,6 +830,7 @@ public class A2Factory {
                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");
@@ -785,6 +857,7 @@ public class A2Factory {
                return jarPath;
        }
 
+       /** For development purproses. */
        public static void main(String[] args) {
                Path factoryBase = Paths.get("../../output/a2").toAbsolutePath().normalize();
                A2Factory factory = new A2Factory(factoryBase);
@@ -799,15 +872,28 @@ public class A2Factory {
 //             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
@@ -816,5 +902,8 @@ public class A2Factory {
                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"));
        }
 }

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 90dfe68dd0a8f9510939b2a276aed3d79e563bb2..2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 90dfe68dd0a8f9510939b2a276aed3d79e563bb2
+Subproject commit 2cb8a40febfe1b42ab2aebecbf6e0ec06b2c5e4d

diff --git a/sdk/output-argeo-tp-rap.target b/sdk/output-argeo-tp-rap.target
index a62d98d543d518dcc5e06d8006ead3b7bc6297de..de678926aabde33baf42ba39eaac0fa83ede850f 100644 (file)
--- a/sdk/output-argeo-tp-rap.target
+++ b/sdk/output-argeo-tp-rap.target
@@ -3,14 +3,6 @@
 <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

diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target
index 622299328cdf6e2c0547613fda9bbbaa50497368..5dfd1174b1331cfab1f71ae6342e599c70c932dd 100644 (file)
--- a/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@ -3,14 +3,6 @@
 <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

diff --git a/sdk/output-argeo-tp-rwt.target b/sdk/output-argeo-tp-rwt.target
new file mode 100644 (file)
index 0000000..13221b9
--- /dev/null
+++ b/sdk/output-argeo-tp-rwt.target
@@ -0,0 +1,16 @@
+<?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

diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target
new file mode 100644 (file)
index 0000000..7a6628c
--- /dev/null
+++ b/sdk/output-argeo-tp-swt.target
@@ -0,0 +1,16 @@
+<?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

diff --git a/tp/Make.java b/tp/Make.java
index 36447e3880aaf366427b88012876b2a977623388..6c3644349b89d40d94664d97a25a432180e79545 100644 (file)
--- a/tp/Make.java
+++ b/tp/Make.java
@@ -21,7 +21,11 @@ class Make {
                // 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"));
 

diff --git a/tp/org.argeo.tp.apache/batik/common.bnd b/tp/org.argeo.tp.apache/batik/common.bnd
new file mode 100644 (file)
index 0000000..bc76a97
--- /dev/null
+++ b/tp/org.argeo.tp.apache/batik/common.bnd
@@ -0,0 +1,2 @@
+Bundle-License: Apache-2.0
+SLC-Origin-M2: :1.14
\ No newline at end of file

diff --git a/tp/org.argeo.tp.apache/batik/merge.bnd b/tp/org.argeo.tp.apache/batik/merge.bnd
new file mode 100644 (file)
index 0000000..807d16f
--- /dev/null
+++ b/tp/org.argeo.tp.apache/batik/merge.bnd
@@ -0,0 +1,28 @@
+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

diff --git a/tp/org.argeo.tp.apache/batik/org.apache.batik.constants.bnd b/tp/org.argeo.tp.apache/batik/org.apache.batik.constants.bnd
new file mode 100644 (file)
index 0000000..fea69fa
--- /dev/null
+++ b/tp/org.argeo.tp.apache/batik/org.apache.batik.constants.bnd
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.apache.batik.constants
+SLC-Origin-M2: org.apache.xmlgraphics:batik-constants

diff --git a/tp/org.argeo.tp.apache/batik/org.apache.batik.css.bnd b/tp/org.argeo.tp.apache/batik/org.apache.batik.css.bnd
new file mode 100644 (file)
index 0000000..8ec1225
--- /dev/null
+++ b/tp/org.argeo.tp.apache/batik/org.apache.batik.css.bnd
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.apache.batik.css
+SLC-Origin-M2: org.apache.xmlgraphics:batik-css

diff --git a/tp/org.argeo.tp.apache/batik/org.apache.batik.i18n.bnd b/tp/org.argeo.tp.apache/batik/org.apache.batik.i18n.bnd
new file mode 100644 (file)
index 0000000..321ae88
--- /dev/null
+++ b/tp/org.argeo.tp.apache/batik/org.apache.batik.i18n.bnd
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.apache.batik.i18n
+SLC-Origin-M2: org.apache.xmlgraphics:batik-i18n

diff --git a/tp/org.argeo.tp.apache/batik/org.apache.batik.util.bnd b/tp/org.argeo.tp.apache/batik/org.apache.batik.util.bnd
new file mode 100644 (file)
index 0000000..0b672dc
--- /dev/null
+++ b/tp/org.argeo.tp.apache/batik/org.apache.batik.util.bnd
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: org.apache.batik.util
+SLC-Origin-M2: org.apache.xmlgraphics:batik-util

diff --git a/tp/org.argeo.tp.apache/org.apache.tika.core.bnd b/tp/org.argeo.tp.apache/org.apache.tika.core.bnd
index 38b1663202cf6e71e5e790c3e29e3c9ebc7627fe..cfe157a16f305cd0bd8fa8383698242f7356ad15 100644 (file)
--- a/tp/org.argeo.tp.apache/org.apache.tika.core.bnd
+++ b/tp/org.argeo.tp.apache/org.apache.tika.core.bnd
@@ -1,4 +1,4 @@
 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

diff --git a/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd b/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd
index 380c58fba20ab2a5ea548acfd102f32f2b5b3e59..90489d343febe9c59adaf3a0dd28395c6b7f2f39 100644 (file)
--- a/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd
+++ b/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd
@@ -2,4 +2,4 @@ Bundle-Activator: org.apache.tika.parser.internal.Activator
 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

diff --git a/tp/org.argeo.tp.apache/org.apache.xmlgraphics.bnd b/tp/org.argeo.tp.apache/org.apache.xmlgraphics.bnd
new file mode 100644 (file)
index 0000000..254a0af
--- /dev/null
+++ b/tp/org.argeo.tp.apache/org.apache.xmlgraphics.bnd
@@ -0,0 +1,3 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.xmlgraphics
+SLC-Origin-M2: org.apache.xmlgraphics:xmlgraphics-commons:2.7

diff --git a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd
index 4411b9a240ffb5465392c5525defd460721425dd..7f3378c5077868abd35f64ce611b70915f7a9411 100644 (file)
--- a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd
+++ b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd
@@ -1,3 +1,3 @@
 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

diff --git a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties
index 06cc3e96d93ef5fe629c991f173399aa9f19a0ad..f6fd178cf3cac5a9aa0b6bdd195d716d76256297 100644 (file)
--- a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties
+++ b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties
@@ -1,23 +1,23 @@
-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=

diff --git a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd
index 5c332a0409225bc9e9770a6af512d4e3b1e90e31..47f53cc2db3dd8ef04e569775c7bb81041af91f2 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd
+++ b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd
@@ -1,3 +1,3 @@
 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

diff --git a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/excludes.properties b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/excludes.properties
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties
index 1bfa0a60e56982d1413182cf83330475e9f832a6..93e66cb31bf1fa1710eb3026bcd26d030262a256 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties
+++ b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties
@@ -1,23 +1,15 @@
-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=

diff --git a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd
index e290997451655f0391ecc33fec5ed21bb1bb220e..584f0aafacc4cdc4ce4d2864b7a9f91794040da7 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd
+++ b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd
@@ -1,3 +1,3 @@
 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

diff --git a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/excludes.properties b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/excludes.properties
new file mode 100644 (file)
index 0000000..506de03
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/excludes.properties
@@ -0,0 +1,6 @@
+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=

diff --git a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties
index 2ddb58019eb56b5aa0f07773ac2e417bf084a354..812ea25693cebff08103337a34ffc1bb0732d1aa 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties
+++ b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties
@@ -1 +1,6 @@
-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=
+

diff --git a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.common.bnd b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.common.bnd
index edd9030e39c8bcfa06835a6d264b1dfdc4e2d425..6bade450e9a678986e77a4886a4219b492b01322 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.common.bnd
+++ b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.common.bnd
@@ -1,3 +1,3 @@
 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

diff --git a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.bnd b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.bnd
index c914536f688ecb287d8d3c8e5101019cbb693317..30033bf778182e785b3ad0c2a7c2929fa2ef0ab0 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.bnd
+++ b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.bnd
@@ -1,3 +1,3 @@
 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

diff --git a/tp/org.argeo.tp.eclipse.rwt/eclipse-rwt/common.bnd b/tp/org.argeo.tp.eclipse.rwt/eclipse-rwt/common.bnd
new file mode 100644 (file)
index 0000000..47f53cc
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.rwt/eclipse-rwt/common.bnd
@@ -0,0 +1,3 @@
+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

diff --git a/tp/org.argeo.tp.eclipse.rwt/eclipse-rwt/includes.properties b/tp/org.argeo.tp.eclipse.rwt/eclipse-rwt/includes.properties
new file mode 100644 (file)
index 0000000..149a56f
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.rwt/eclipse-rwt/includes.properties
@@ -0,0 +1,10 @@
+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=

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/common.bnd b/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/common.bnd
new file mode 100644 (file)
index 0000000..7f3378c
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/common.bnd
@@ -0,0 +1,3 @@
+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

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/excludes.properties b/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/excludes.properties
new file mode 100644 (file)
index 0000000..44f1055
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/excludes.properties
@@ -0,0 +1 @@
+plugins/org.eclipse.equinox.security.ui*.jar=

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/includes.properties b/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/includes.properties
new file mode 100644 (file)
index 0000000..f20b07d
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-equinox/includes.properties
@@ -0,0 +1 @@
+plugins/org.eclipse.equinox.security*.jar=

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/common.bnd b/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/common.bnd
new file mode 100644 (file)
index 0000000..750a8f0
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/common.bnd
@@ -0,0 +1,3 @@
+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

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/excludes.properties b/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/excludes.properties
new file mode 100644 (file)
index 0000000..5574815
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/excludes.properties
@@ -0,0 +1,2 @@
+plugins/org.eclipse.nebula.widgets.grid.example*.jar=
+plugins/org.eclipse.nebula.widgets.grid.css*.jar=

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/includes.properties b/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/includes.properties
new file mode 100644 (file)
index 0000000..09ea542
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-nebula/includes.properties
@@ -0,0 +1,2 @@
+plugins/org.eclipse.nebula.widgets.grid*.jar=
+plugins/org.eclipse.nebula.widgets.richtext*.jar=

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-swt/common.bnd b/tp/org.argeo.tp.eclipse.swt/eclipse-swt/common.bnd
new file mode 100644 (file)
index 0000000..584f0aa
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-swt/common.bnd
@@ -0,0 +1,3 @@
+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

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-swt/excludes.properties b/tp/org.argeo.tp.eclipse.swt/eclipse-swt/excludes.properties
new file mode 100644 (file)
index 0000000..b31d51e
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-swt/excludes.properties
@@ -0,0 +1 @@
+plugins/*ppc64le*
\ No newline at end of file

diff --git a/tp/org.argeo.tp.eclipse.swt/eclipse-swt/includes.properties b/tp/org.argeo.tp.eclipse.swt/eclipse-swt/includes.properties
new file mode 100644 (file)
index 0000000..3cb4cfa
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.swt/eclipse-swt/includes.properties
@@ -0,0 +1,6 @@
+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=

diff --git a/tp/org.argeo.tp.formats/batik/merge.bnd b/tp/org.argeo.tp.formats/batik/merge.bnd
deleted file mode 100644 (file)
index ba3dc0b..0000000
--- a/tp/org.argeo.tp.formats/batik/merge.bnd
+++ /dev/null
@@ -1,28 +0,0 @@
-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

diff --git a/tp/org.argeo.tp.formats/javax.activation.bnd b/tp/org.argeo.tp.formats/javax.activation.bnd
deleted file mode 100644 (file)
index 024dda8..0000000
--- a/tp/org.argeo.tp.formats/javax.activation.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: CDDL-1.0
-SLC-Origin-M2: com.sun.activation:javax.activation:1.2.0
-SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.formats/javax.mail.bnd b/tp/org.argeo.tp.formats/javax.mail.bnd
deleted file mode 100644 (file)
index 8166bc7..0000000
--- a/tp/org.argeo.tp.formats/javax.mail.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-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

diff --git a/tp/org.argeo.tp.formats/org.apache.xmlgraphics.bnd b/tp/org.argeo.tp.formats/org.apache.xmlgraphics.bnd
deleted file mode 100644 (file)
index 254a0af..0000000
--- a/tp/org.argeo.tp.formats/org.apache.xmlgraphics.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xmlgraphics
-SLC-Origin-M2: org.apache.xmlgraphics:xmlgraphics-commons:2.7

diff --git a/tp/org.argeo.tp.formats/org.w3c.css.sac.bnd b/tp/org.argeo.tp.formats/org.w3c.css.sac.bnd
deleted file mode 100644 (file)
index bbb35cc..0000000
--- a/tp/org.argeo.tp.formats/org.w3c.css.sac.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.css.sac
-SLC-Origin-M2: org.w3c.css:sac:1.3

diff --git a/tp/org.argeo.tp.formats/org.w3c.dom.smil.bnd b/tp/org.argeo.tp.formats/org.w3c.dom.smil.bnd
deleted file mode 100644 (file)
index 05b9dd6..0000000
--- a/tp/org.argeo.tp.formats/org.w3c.dom.smil.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-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

diff --git a/tp/org.argeo.tp.formats/org.w3c.dom.svg.bnd b/tp/org.argeo.tp.formats/org.w3c.dom.svg.bnd
deleted file mode 100644 (file)
index 44cb2b1..0000000
--- a/tp/org.argeo.tp.formats/org.w3c.dom.svg.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.dom.svg
-SLC-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1

diff --git a/tp/org.argeo.tp.gis/geotools/merge.bnd b/tp/org.argeo.tp.gis/geotools/merge.bnd
index 9b50b6300e7d7b5dfc5ea85c32386157adb6e1b2..891958b0a2ed2afcac1d92f09b6c226fa411040b 100644 (file)
--- a/tp/org.argeo.tp.gis/geotools/merge.bnd
+++ b/tp/org.argeo.tp.gis/geotools/merge.bnd
@@ -1,6 +1,6 @@
 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: \

diff --git a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd
index d48a04cefa0eb344f41abffeeb5ec758f915ab47..c2bda37ee9c54e9574b57ea3e173588aae3fbfcc 100644 (file)
--- a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd
+++ b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd
@@ -1,2 +1,2 @@
 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

diff --git a/tp/org.argeo.tp.jcr/oak/common.bnd b/tp/org.argeo.tp.jcr/oak/common.bnd
index d998340a3a36cde08ee74923e594604d01af3fc9..02fa45acba99c53cbca72c62c156d4db1f709d7b 100644 (file)
--- a/tp/org.argeo.tp.jcr/oak/common.bnd
+++ b/tp/org.argeo.tp.jcr/oak/common.bnd
@@ -1,2 +1,2 @@
 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

diff --git a/tp/org.argeo.tp.jetty/jetty/common.bnd b/tp/org.argeo.tp.jetty/jetty/common.bnd
index c26721c9fabe8a86606bda6f8a28614b9731e666..25c6ff9774038ebf0d64778f475ab1c5660d0deb 100644 (file)
--- a/tp/org.argeo.tp.jetty/jetty/common.bnd
+++ b/tp/org.argeo.tp.jetty/jetty/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :10.0.8
+SLC-Origin-M2: :10.0.9

diff --git a/tp/org.argeo.tp.poi/poi/common.bnd b/tp/org.argeo.tp.poi/poi/common.bnd
index c676bba08bbad0f4ab70410a1d0fa60f61a0720b..b3e399683237831202c496590cd3f171cb9ff82c 100644 (file)
--- a/tp/org.argeo.tp.poi/poi/common.bnd
+++ b/tp/org.argeo.tp.poi/poi/common.bnd
@@ -1,2 +1,2 @@
 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

diff --git a/tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd b/tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd
index 54f802f9faa5fc5f0139a71a9c00c322548a6f2b..27f4f43ecd6f24c97d2515b322a749fa4f85d0e8 100644 (file)
--- a/tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd
+++ b/tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd
@@ -1,4 +1,4 @@
 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

diff --git a/tp/org.argeo.tp/bouncycastle/bcmail.bnd b/tp/org.argeo.tp/bouncycastle/bcmail.bnd
new file mode 100644 (file)
index 0000000..38ba77b
--- /dev/null
+++ b/tp/org.argeo.tp/bouncycastle/bcmail.bnd
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: bcmail
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-M2: org.bouncycastle:bcmail-jdk18on

diff --git a/tp/org.argeo.tp/bouncycastle/bcpg.bnd b/tp/org.argeo.tp/bouncycastle/bcpg.bnd
index 545d83fa408603a5a34bf86eef8f70f92bab94b0..6e6f8af541dc3895072b2bd60f936553a6235517 100644 (file)
--- a/tp/org.argeo.tp/bouncycastle/bcpg.bnd
+++ b/tp/org.argeo.tp/bouncycastle/bcpg.bnd
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: bcpg
 SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcpg-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcpg-jdk18on

diff --git a/tp/org.argeo.tp/bouncycastle/bcpkix.bnd b/tp/org.argeo.tp/bouncycastle/bcpkix.bnd
index 0e922b0eb78aa8994e4e82b9a70104de0b914f9a..50b64bc68beeb97b2a6fe3cc1849f0e2665c9e12 100644 (file)
--- a/tp/org.argeo.tp/bouncycastle/bcpkix.bnd
+++ b/tp/org.argeo.tp/bouncycastle/bcpkix.bnd
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: bcpkix
 SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcpkix-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcpkix-jdk18on

diff --git a/tp/org.argeo.tp/bouncycastle/bcprov.bnd b/tp/org.argeo.tp/bouncycastle/bcprov.bnd
index e81167acf07dd482f380c603d368d9ff36a25422..b507d5e54aed50cd240af3468fe79c1131b0da0c 100644 (file)
--- a/tp/org.argeo.tp/bouncycastle/bcprov.bnd
+++ b/tp/org.argeo.tp/bouncycastle/bcprov.bnd
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: bcprov
 SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcprov-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcprov-jdk18on

diff --git a/tp/org.argeo.tp/bouncycastle/bcutil.bnd b/tp/org.argeo.tp/bouncycastle/bcutil.bnd
index d40f6dd6e4b464499cb60056930cef4ca1d632ea..778c309677abfa31a8100c044c29c05e6dc0a777 100644 (file)
--- a/tp/org.argeo.tp/bouncycastle/bcutil.bnd
+++ b/tp/org.argeo.tp/bouncycastle/bcutil.bnd
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: bcutil
 SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcutil-jdk15on
+SLC-Origin-M2: org.bouncycastle:bcutil-jdk18on

diff --git a/tp/org.argeo.tp/bouncycastle/common.bnd b/tp/org.argeo.tp/bouncycastle/common.bnd
index 4c701f3616293d8717eda27f05e10c1da12ac6d3..bbd389db0fefa01390cde23e0e5d66cafc1f25ec 100644 (file)
--- a/tp/org.argeo.tp/bouncycastle/common.bnd
+++ b/tp/org.argeo.tp/bouncycastle/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: MIT
-SLC-Origin-M2: :1.70
+SLC-Origin-M2: :1.71

diff --git a/tp/org.argeo.tp/javax.activation.bnd b/tp/org.argeo.tp/javax.activation.bnd
new file mode 100644 (file)
index 0000000..167bd5f
--- /dev/null
+++ b/tp/org.argeo.tp/javax.activation.bnd
@@ -0,0 +1,3 @@
+Bundle-License: BSD-3-Clause
+SLC-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2
+SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp/javax.mail.bnd b/tp/org.argeo.tp/javax.mail.bnd
new file mode 100644 (file)
index 0000000..4bc26fa
--- /dev/null
+++ b/tp/org.argeo.tp/javax.mail.bnd
@@ -0,0 +1,4 @@
+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

diff --git a/tp/org.argeo.tp/org.postgresql.jdbc42.bnd b/tp/org.argeo.tp/org.postgresql.jdbc42.bnd
index e9d1393dbbe972b2ca2472e68b8790e4f41563ee..7767b5ca4c5438c159c1b49bc5d9eac055972c39 100644 (file)
--- a/tp/org.argeo.tp/org.postgresql.jdbc42.bnd
+++ b/tp/org.argeo.tp/org.postgresql.jdbc42.bnd
@@ -1,4 +1,4 @@
 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

diff --git a/tp/org.argeo.tp/org.w3c.css.sac.bnd b/tp/org.argeo.tp/org.w3c.css.sac.bnd
new file mode 100644 (file)
index 0000000..bbb35cc
--- /dev/null
+++ b/tp/org.argeo.tp/org.w3c.css.sac.bnd
@@ -0,0 +1,3 @@
+Bundle-License: W3C
+Bundle-SymbolicName: org.w3c.css.sac
+SLC-Origin-M2: org.w3c.css:sac:1.3

diff --git a/tp/org.argeo.tp/org.w3c.dom.smil.bnd b/tp/org.argeo.tp/org.w3c.dom.smil.bnd
new file mode 100644 (file)
index 0000000..05b9dd6
--- /dev/null
+++ b/tp/org.argeo.tp/org.w3c.dom.smil.bnd
@@ -0,0 +1,4 @@
+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

diff --git a/tp/org.argeo.tp/org.w3c.dom.svg.bnd b/tp/org.argeo.tp/org.w3c.dom.svg.bnd
new file mode 100644 (file)
index 0000000..44cb2b1
--- /dev/null
+++ b/tp/org.argeo.tp/org.w3c.dom.svg.bnd
@@ -0,0 +1,3 @@
+Bundle-License: W3C
+Bundle-SymbolicName: org.w3c.dom.svg
+SLC-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1