rm -rf $(BUILD_BASE)/ext
rm -rf $(BUILD_BASE)/build
rm -rf $(BUILD_BASE)/deb
- rm -rf $(BUILD_BASE)/bootstrap
# SDK level
$(SDK_BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
FileSystemOptions opts = new FileSystemOptions();
try {
DefaultFileSystemConfigBuilder.getInstance().setUserAuthenticator(opts, userAuthenticator);
- } catch (FileSystemException e) {
+ } catch (Exception e) {
throw new MaintenanceException("Cannot create authentication", e);
}
// sshd.setShellFactory(new ProcessShellFactory(new String[] { "/bin/sh", "-i",
// "-l" }));
String[] shellCommand = OS.LOCAL.getDefaultShellCommand();
- sshd.setShellFactory(new ProcessShellFactory(shellCommand));
+ // FIXME transfer args
+// sshd.setShellFactory(new ProcessShellFactory(shellCommand));
+// sshd.setShellFactory(new ProcessShellFactory(shellCommand[0], shellCommand));
sshd.setCommandFactory(new ScpCommandFactory());
sshd.start();
} catch (Exception e) {
<modules>
<!-- Argeo CMS extensions -->
<module>org.argeo.cms.integration</module>
- <module>org.argeo.ext.equinox.jetty</module>
-
</modules>
</project>
Bundle-Version: ${version.released}${qualifier}
Private-Package: *.internal.*
Export-Package: !*.internal.*, *
--consumer-policy : ${range;[==,=+)}
+#-consumer-policy : ${range;[==,=+)}
-savemanifest : META-INF/MANIFEST.MF
-includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
-compression STORE
--- /dev/null
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.argeo.slc</groupId>
+ <artifactId>argeo-slc</artifactId>
+ <version>2.3-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>org.argeo.slc.factory</artifactId>
+ <name>SLC Factory</name>
+ <dependencies>
+ <!-- SLC -->
+ <dependency>
+ <groupId>org.argeo.slc</groupId>
+ <artifactId>org.argeo.slc.api</artifactId>
+ <version>2.3-SNAPSHOT</version>
+ </dependency>
+
+ <!-- BND -->
+ <dependency>
+ <groupId>org.argeo.tp.sdk</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
boolean doNotModify = Boolean.parseBoolean(fileProps
.getOrDefault(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "false").toString());
+ // we always force the symbolic name
+ if (artifact != null) {
+ if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
+ fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName());
+ }
+ if (!fileProps.containsKey(BUNDLE_VERSION.toString())) {
+ fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion());
+ }
+ }
+
if (doNotModify) {
fileEntries: for (Object key : fileProps.keySet()) {
if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key))
additionalEntries.put(key.toString(), value);
}
} else {
- if (artifact != null) {
- if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
- fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName());
- }
- if (!fileProps.containsKey(BUNDLE_VERSION.toString())) {
- fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion());
- }
- }
if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) {
fileProps.put(EXPORT_PACKAGE.toString(),
Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
// factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
-// factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp/slf4j"));
-// System.exit(0);
+ factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
+// factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jcr/oak"));
+ System.exit(0);
// Eclipse
factory.processEclipseArchive(
org.apache.lucene,\
org.apache.tika.core,\
org.apache.commons.dbcp,\
- org.apache.commons.pool,\
- com.google.guava,\
org.apache.jackrabbit.jcr2spi,\
org.apache.jackrabbit.spi2dav,\
org.apache.httpcomponents.httpclient,\
<version>2.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>org.argeo.slc.factory</artifactId>
- <name>SLC Factory</name>
+ <artifactId>org.argeo.slc.rpmfactory</artifactId>
+ <name>SLC RPM Factory</name>
<dependencies>
<!-- SLC -->
<dependency>
<modules>
<!-- SLC framework -->
<module>org.argeo.slc.api</module>
+ <module>org.argeo.slc.factory</module>
<module>org.argeo.slc.runtime</module>
<module>org.argeo.slc.jcr</module>
<module>org.argeo.slc.repo</module>
Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.3.0
\ No newline at end of file
+SLC-Origin-M2: :2.5.1
\ No newline at end of file
Bundle-SymbolicName: org.apache.sshd.cli
SLC-Origin-M2: org.apache.sshd:sshd-cli
-SLC-Origin-ManifestNotModified: true
Bundle-SymbolicName: org.apache.sshd.core
SLC-Origin-M2: org.apache.sshd:sshd-core
-SLC-Origin-ManifestNotModified: true
+Import-Package: \
+org.apache.tomcat.jni.*;resolution:=optional,\
+*
\ No newline at end of file
Bundle-SymbolicName: org.apache.sshd.git
SLC-Origin-M2: org.apache.sshd:sshd-git
-SLC-Origin-ManifestNotModified: true
+Import-Package: \
+org.eclipse.jgit.pgm.*;resolution:=optional,\
+org.kohsuke.*;resolution:=optional,\
+*
\ No newline at end of file
Bundle-SymbolicName: org.apache.sshd.putty
SLC-Origin-M2: org.apache.sshd:sshd-putty
-SLC-Origin-ManifestNotModified: true
+Import-Package: \
+net.i2p.*;resolution:=optional,\
+*
\ No newline at end of file
Bundle-SymbolicName: org.apache.sshd.scp
SLC-Origin-M2: org.apache.sshd:sshd-scp
-SLC-Origin-ManifestNotModified: true
Bundle-SymbolicName: org.apache.sshd.sftp
SLC-Origin-M2: org.apache.sshd:sshd-sftp
-SLC-Origin-ManifestNotModified: true
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.commons.cli
-SLC-Origin-M2: commons-cli:commons-cli:1.4
+SLC-Origin-M2: commons-cli:commons-cli:1.5.0
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.commons.codec
-SLC-Origin-M2: commons-codec:commons-codec:1.13
+SLC-Origin-M2: commons-codec:commons-codec:1.15
+++ /dev/null
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.collections
-SLC-Origin-M2: commons-collections:commons-collections:3.2.2
+++ /dev/null
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.dbcp
-SLC-Origin-M2: commons-dbcp:commons-dbcp:1.4
-Import-Package: javax.transaction.*; resolution:="optional",\
-*
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.commons.io
-SLC-Origin-M2: commons-io:commons-io:2.6
+SLC-Origin-M2: commons-io:commons-io:2.11.0
+Import-Package: sun.*;resolution:=optional, *
+++ /dev/null
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.pool
-SLC-Origin-M2: commons-pool:commons-pool:1.5.7
Bundle-SymbolicName: org.apache.commons.vfs
Import-Package: org.apache.tools.ant.*;resolution:=optional,
*
-SLC-Origin-M2: org.apache.commons:commons-vfs2:2.0
\ No newline at end of file
+SLC-Origin-M2: org.apache.commons:commons-vfs2:2.9.0
\ No newline at end of file
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.httpcomponents.httpclient
-SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.9
\ No newline at end of file
+SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.13
\ No newline at end of file
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.httpcomponents.httpcore
-SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.10
\ No newline at end of file
+SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.15
\ No newline at end of file
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.httpcomponents.httpmime
-SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.9
\ No newline at end of file
+SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.13
\ No newline at end of file
Bundle-License: Apache-2.0
Bundle-SymbolicName: org.apache.tika.core
-SLC-Origin-M2: org.apache.tika:tika-core:1.22
+SLC-Origin-M2: org.apache.tika:tika-core:1.27
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.22
\ No newline at end of file
+SLC-Origin-M2: org.apache.tika:tika-parsers:1.27
\ No newline at end of file
Bundle-SymbolicName: org.apache.xerces
Import-Package: sun.*;resolution:=optional,
*
-SLC-Origin-M2: xerces:xercesImpl:2.12.0
\ No newline at end of file
+SLC-Origin-M2: xerces:xercesImpl:2.12.2
\ No newline at end of file
+++ /dev/null
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: com.google.guava
-Bundle-Version: 27.1.0.jre
-SLC-Origin-M2: com.google.guava:guava:27.1-jre
-SLC-Origin-ManifestNotModified: true
--- /dev/null
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: com.google.guava
+Bundle-Version: 27.1.0.jre
+SLC-Origin-M2: com.google.guava:guava:27.1-jre
+SLC-Origin-ManifestNotModified: true
+++ /dev/null
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: com.google.guava.failureaccess
-SLC-Origin-M2: com.google.guava:failureaccess:1.0.1
-SLC-Origin-ManifestNotModified: true
--- /dev/null
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: com.google.guava.failureaccess
+SLC-Origin-M2: com.google.guava:failureaccess:1.0.1
+SLC-Origin-ManifestNotModified: true
Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.18.3
\ No newline at end of file
+SLC-Origin-M2: :2.20.4
\ No newline at end of file
+++ /dev/null
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-api
-Bundle-SymbolicName: org.apache.jackrabbit.api
-Export-Package: org.apache.jackrabbit.*
--- /dev/null
+SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-api
+Bundle-SymbolicName: org.apache.jackrabbit.api
+Export-Package: org.apache.jackrabbit.*
--- /dev/null
+Bundle-License: Apache-2.0
+SLC-Origin-M2: :1.40.0
\ No newline at end of file
--- /dev/null
+SLC-Origin-M2: org.apache.jackrabbit:oak-jackrabbit-api
+Bundle-SymbolicName: org.apache.jackrabbit.api
+Export-Package: org.apache.jackrabbit.*
--- /dev/null
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.commons.collections
+SLC-Origin-M2: commons-collections:commons-collections:3.2.2
--- /dev/null
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.commons.dbcp
+SLC-Origin-M2: commons-dbcp:commons-dbcp:1.4
+Import-Package: javax.transaction.*; resolution:="optional",\
+*
--- /dev/null
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.commons.pool
+SLC-Origin-M2: commons-pool:commons-pool:1.6
Bundle-License: Apache-2.0
-SLC-Origin-M2: :9.4.24.v20191120
+SLC-Origin-M2: :9.4.45.v20220203
Bundle-License: Apache-2.0
-SLC-Origin-M2: :9.4.24.v20191120
+SLC-Origin-M2: :9.4.45.v20220203
--- /dev/null
+SLC-Origin-M2: org.eclipse.jetty:jetty-util-ajax
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.util.ajax
Bundle-License: BSD-3-Clause
-SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r
Import-Package: \
sun.*;resolution:=optional, \
com.jcraft.jsch;resolution:=optional, \
Bundle-License: BSD-3-Clause
Bundle-SymbolicName: org.hamcrest
Bundle-Version: 2.1.0
-SLC-Origin-M2: org.hamcrest:hamcrest:2.1
+SLC-Origin-M2: org.hamcrest:hamcrest:2.2
SLC-Origin-ManifestNotModified: true
Import-Package: org.hamcrest;resolution:=optional,\
org.hamcrest.core;resolution:=optional,\
*
-SLC-Origin-M2: junit:junit:4.12
\ No newline at end of file
+SLC-Origin-M2: junit:junit:4.13.2
\ No newline at end of file
Bundle-License: MIT
Bundle-SymbolicName: org.redline-rpm
Import-Package: sun.security.*;resolution:=optional,
- org.apache.tools.ant.*;resolution:=optional,
- org.apache.tools.zip;resolution:=optional,
- *
-SLC-Origin-M2: org.redline-rpm:redline:1.2.8
+org.apache.tools.ant.*;resolution:=optional,
+org.apache.tools.zip;resolution:=optional,
+*
+SLC-Origin-M2: org.redline-rpm:redline:1.2.10
--- /dev/null
+Bundle-SymbolicName: bcutil
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-M2: org.bouncycastle:bcutil-jdk15on
Bundle-License: MIT
-SLC-Origin-M2: :1.64
+SLC-Origin-M2: :1.70
Bundle-License: Apache-2.0
Bundle-SymbolicName: com.googlecode.javaewah.JavaEWAH
-SLC-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.1.6
+SLC-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.1.13
SLC-Origin-ManifestNotModified: true
Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.10.0
+SLC-Origin-M2: :2.13.1
Bundle-License: MPL-2.0
Bundle-SymbolicName: org.h2
-SLC-Origin-M2: com.h2database:h2:1.4.199
+SLC-Origin-M2: com.h2database:h2:1.4.200
SLC-Origin-ManifestNotModified: true
Bundle-License: BSD-2-Clause
Bundle-SymbolicName: org.postgresql.jdbc42
-SLC-Origin-M2: org.postgresql:postgresql:42.2.8
+SLC-Origin-M2: org.postgresql:postgresql:42.3.2
SLC-Origin-ManifestNotModified: true
Bundle-License: Apache-2.0
-SLC-Origin-M2: :1.7.28
+SLC-Origin-M2: :1.7.36