From 5beb79f773c952ac9e172effe891a652607f2d29 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 15 Feb 2020 07:47:35 +0100
Subject: [PATCH] Make SLC v1 compatible with Java 11.

---
 dep/org.argeo.slc.dep.backend/pom.xml         |  78 +-----
 dep/org.argeo.slc.dep.e4.rap/pom.xml          |  70 ++----
 dep/org.argeo.slc.dep.minimal/pom.xml         |  39 ---
 dep/org.argeo.slc.dep.spring/pom.xml          | 225 ++++++------------
 dep/pom.xml                                   |  48 ++--
 .../dep/org.argeo.dep.cms.platform/pom.xml    |  76 +-----
 legacy/argeo-commons/dep/pom.xml              |   2 +-
 .../org.argeo.cms.ui.workbench.rap/pom.xml    |   4 +-
 .../org.argeo.cms.ui.workbench/pom.xml        |   2 +-
 .../org.argeo.ext.rap.ui.workbench/pom.xml    |   2 +-
 legacy/argeo-commons/pom.xml                  |   9 +-
 legacy/org.argeo.legacy.fake.java8/.classpath |   7 +
 legacy/org.argeo.legacy.fake.java8/.gitignore |   2 +
 legacy/org.argeo.legacy.fake.java8/.project   |  28 +++
 .../META-INF/.gitignore                       |   1 +
 legacy/org.argeo.legacy.fake.java8/bnd.bnd    |   2 +
 .../build.properties                          |   4 +
 legacy/org.argeo.legacy.fake.java8/pom.xml    |  26 ++
 .../src/javax/rmi/Fake.java                   |   5 +
 .../src/javax/xml/ws/Fake.java                |   5 +
 .../src/org/omg/CORBA/Fake.java               |   5 +
 legacy/pom.xml                                |   1 +
 org.argeo.slc.support/bnd.bnd                 |   1 +
 pom.xml                                       |   2 +-
 24 files changed, 233 insertions(+), 411 deletions(-)
 create mode 100644 legacy/org.argeo.legacy.fake.java8/.classpath
 create mode 100644 legacy/org.argeo.legacy.fake.java8/.gitignore
 create mode 100644 legacy/org.argeo.legacy.fake.java8/.project
 create mode 100644 legacy/org.argeo.legacy.fake.java8/META-INF/.gitignore
 create mode 100644 legacy/org.argeo.legacy.fake.java8/bnd.bnd
 create mode 100644 legacy/org.argeo.legacy.fake.java8/build.properties
 create mode 100644 legacy/org.argeo.legacy.fake.java8/pom.xml
 create mode 100644 legacy/org.argeo.legacy.fake.java8/src/javax/rmi/Fake.java
 create mode 100644 legacy/org.argeo.legacy.fake.java8/src/javax/xml/ws/Fake.java
 create mode 100644 legacy/org.argeo.legacy.fake.java8/src/org/omg/CORBA/Fake.java

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 77792933c..4089d164a 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -10,32 +10,6 @@
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
 	<name>SLC Backend</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<SLC-ModularDistribution>default</SLC-ModularDistribution>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- SLC Minimal -->
 		<dependency>
@@ -110,24 +84,24 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>biz.aQute.bndlib</artifactId>
+		<groupId>org.argeo.tp.sdk</groupId>
+		<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>org.junit</artifactId>
+		<groupId>org.argeo.tp.sdk</groupId>
+		<artifactId>org.junit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>org.redline-rpm</artifactId>
+		<groupId>org.argeo.tp.sdk</groupId>
+		<artifactId>org.redline-rpm</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
+		<groupId>org.argeo.tp.misc</groupId>
+		<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.eclipse.jgit</artifactId>
+		<groupId>org.argeo.tp.misc</groupId>
+		<artifactId>org.eclipse.jgit</artifactId>
 		</dependency>
 
 
@@ -161,29 +135,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-argeo</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-					<!-- <includeGroupIds>org.argeo.slc</includeGroupIds> -->
-					<!-- <excludeTransitive>true</excludeTransitive> -->
-					<!-- <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -212,18 +163,11 @@
 												</source>
 											</sources>
 										</mapping>
-										<!-- <mapping> -->
-										<!-- <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory> -->
-										<!-- <username>root</username> -->
-										<!-- <groupname>root</groupname> -->
-										<!-- <directoryIncluded>false</directoryIncluded> -->
-										<!-- <artifact /> -->
-										<!-- </mapping> -->
 									</mappings>
 									<requires>
 										<require>argeo-cms-platform</require>
 										<require>argeo-cms-sdk-tp</require>
-										<require>slc-agent</require>
+										<require>slc-spring</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index aea4c1ef0..cc9220c66 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -10,32 +10,6 @@
 	</parent>
 	<artifactId>org.argeo.slc.dep.e4.rap</artifactId>
 	<name>SLC E4 RAP</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<SLC-ModularDistribution>default</SLC-ModularDistribution>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- Parent dependencies -->
 		<dependency>
@@ -65,26 +39,27 @@
 		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
 		<!-- <artifactId>org.apache.ant.launch</artifactId> -->
 		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>biz.aQute.bndlib</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>org.junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>org.redline-rpm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.eclipse.jgit</artifactId>
-		</dependency>
+
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
+<!-- 			<artifactId>biz.aQute.bndlib</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
+<!-- 			<artifactId>org.junit</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
+<!-- 			<artifactId>org.redline-rpm</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
+<!-- 			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
+<!-- 			<artifactId>org.eclipse.jgit</artifactId> -->
+<!-- 		</dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -169,7 +144,8 @@
 									</mappings>
 									<requires>
 										<require>argeo-cms-e4-rap</require>
-										<require>slc-agent</require>
+										<require>argeo-cms-sdk-tp</require>
+										<require>slc-spring</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 6367fda66..375be5664 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -10,45 +10,6 @@
 	</parent>
 	<artifactId>org.argeo.slc.dep.minimal</artifactId>
 	<name>SLC Agent</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<SLC-ModularDistribution>default</SLC-ModularDistribution>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- <plugin> -->
-			<!-- <groupId>org.apache.maven.plugins</groupId> -->
-			<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-			<!-- <executions> -->
-			<!-- <execution> -->
-			<!-- <id>copy-dependencies</id> -->
-			<!-- <phase>package</phase> -->
-			<!-- <goals> -->
-			<!-- <goal>copy-dependencies</goal> -->
-			<!-- </goals> -->
-			<!-- </execution> -->
-			<!-- </executions> -->
-			<!-- </plugin> -->
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- Parent dependencies -->
 		<dependency>
diff --git a/dep/org.argeo.slc.dep.spring/pom.xml b/dep/org.argeo.slc.dep.spring/pom.xml
index 05ab65c55..c0ee72752 100644
--- a/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/dep/org.argeo.slc.dep.spring/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
@@ -8,45 +10,6 @@
 	</parent>
 	<artifactId>org.argeo.slc.dep.spring</artifactId>
 	<name>SLC Agent based on Spring</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<SLC-ModularDistribution>default</SLC-ModularDistribution>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- <plugin> -->
-			<!-- <groupId>org.apache.maven.plugins</groupId> -->
-			<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-			<!-- <executions> -->
-			<!-- <execution> -->
-			<!-- <id>copy-dependencies</id> -->
-			<!-- <phase>package</phase> -->
-			<!-- <goals> -->
-			<!-- <goal>copy-dependencies</goal> -->
-			<!-- </goals> -->
-			<!-- </execution> -->
-			<!-- </executions> -->
-			<!-- </plugin> -->
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- Parent dependencies -->
 		<dependency>
@@ -72,6 +35,14 @@
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Transitional fake Java 8 APIs, required by old version of Spring, 
+			in the process of being removed -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.legacy.fake.java8</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+		</dependency>
+
 		<!-- Base Spring dependency -->
 		<dependency>
 			<groupId>org.argeo.tp.spring</groupId>
@@ -166,89 +137,6 @@
 			<artifactId>org.argeo.slc.agent.jcr</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc</groupId> -->
-		<!-- <artifactId>org.argeo.slc.node.jackrabbit</artifactId> -->
-		<!-- <version>2.1.5-SNAPSHOT</version> -->
-		<!-- </dependency> -->
-
-
-		<!-- Base Spring dependency -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.beans</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.core</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.javax</groupId> -->
-<!-- 			<artifactId>javax.el</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
-<!-- 			<artifactId>org.eclipse.gemini.blueprint.core</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
-<!-- 			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
-<!-- 			<artifactId>org.eclipse.gemini.blueprint.io</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.aspectj.weaver</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.aopalliance</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.aop</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.context</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.expression</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.instrument</artifactId> -->
-<!-- 		</dependency> -->
-
-		<!-- Spring -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.aspects</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.context.support</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.jdbc</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.tx</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.web</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.web.servlet</artifactId> -->
-<!-- 		</dependency> -->
-
 	</dependencies>
 	<profiles>
 		<profile>
@@ -272,29 +160,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-argeo</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-					<!-- <includeGroupIds>org.argeo.slc</includeGroupIds> -->
-					<!-- <excludeTransitive>true</excludeTransitive> -->
-					<!-- <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -306,7 +171,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-agent</name>
+									<name>slc-spring</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -323,16 +188,10 @@
 												</source>
 											</sources>
 										</mapping>
-										<!-- <mapping> -->
-										<!-- <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory> -->
-										<!-- <username>root</username> -->
-										<!-- <groupname>root</groupname> -->
-										<!-- <directoryIncluded>false</directoryIncluded> -->
-										<!-- <artifact /> -->
-										<!-- </mapping> -->
 									</mappings>
 									<requires>
 										<require>argeo-cms-node</require>
+										<require>slc-spring-tp</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -341,5 +200,63 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source-tp</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>slc-spring-tp</name>
+									<projversion>${version.argeo-tp}</projversion>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/pom.xml b/dep/pom.xml
index d473533aa..6a5d92084 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -21,6 +21,24 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -87,34 +105,4 @@
 			</dependencies>
 		</profile>
 	</profiles>
-<!-- 	<profiles> -->
-<!-- 		<profile> -->
-<!-- 			<id>rpmbuild</id> -->
-<!-- 			<build> -->
-<!-- 				<plugins> -->
-<!-- 					<plugin> -->
-<!-- 						<artifactId>maven-antrun-plugin</artifactId> -->
-<!-- 						<executions> -->
-<!-- 							<execution> -->
-<!-- 								<phase>install</phase> -->
-<!-- 								<goals> -->
-<!-- 									<goal>run</goal> -->
-<!-- 								</goals> -->
-<!-- 								<configuration> -->
-<!-- 									<target> -->
-<!-- 										<copy todir="${rpm.stagingRepository}" verbose="true" -->
-<!-- 											failonerror="false"> -->
-<!-- 											<fileset dir="${project.build.directory}/rpm" -->
-<!-- 												includes="*/RPMS/**/*.rpm" /> -->
-<!-- 											<flattenmapper /> -->
-<!-- 										</copy> -->
-<!-- 									</target> -->
-<!-- 								</configuration> -->
-<!-- 							</execution> -->
-<!-- 						</executions> -->
-<!-- 					</plugin> -->
-<!-- 				</plugins> -->
-<!-- 			</build> -->
-<!-- 		</profile> -->
-<!-- 	</profiles> -->
 </project>
\ No newline at end of file
diff --git a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
index 249782a8b..fb125e920 100644
--- a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>legacy-dep</artifactId>
-		<version>2.1.85-SNAPSHOT</version>
+		<version>2.1.86-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.dep.cms.platform</artifactId>
@@ -69,17 +69,17 @@
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<version>${version.argeo-commons-legacy}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<version>${version.argeo-commons-legacy}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<version>${version.argeo-commons-legacy}</version>
 		</dependency>
 
 		<!-- Misc Third Parties -->
@@ -183,14 +183,14 @@
 			<groupId>org.argeo.tp.spring</groupId>
 			<artifactId>org.springframework.tx</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web.servlet</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.web</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.web.servlet</artifactId> -->
+		<!-- </dependency> -->
 
 		<!-- Equinox HTTP registry is required by Eclipse 3 but causes problem 
 			with Eclipse 4 -->
@@ -301,29 +301,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-argeo</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-					<!-- <includeGroupIds>org.argeo.commons</includeGroupIds> -->
-					<!-- <excludeTransitive>true</excludeTransitive> -->
-					<!-- <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -352,13 +329,6 @@
 												</source>
 											</sources>
 										</mapping>
-										<!-- <mapping> -->
-										<!-- <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory> -->
-										<!-- <username>root</username> -->
-										<!-- <groupname>root</groupname> -->
-										<!-- <directoryIncluded>false</directoryIncluded> -->
-										<!-- <artifact /> -->
-										<!-- </mapping> -->
 									</mappings>
 									<requires>
 										<require>argeo-cms-node</require>
@@ -392,28 +362,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-tp</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-tp</outputDirectory> -->
-					<!-- <excludeGroupIds>org.argeo.commons</excludeGroupIds> -->
-					<!-- <excludeTransitive>true</excludeTransitive> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
diff --git a/legacy/argeo-commons/dep/pom.xml b/legacy/argeo-commons/dep/pom.xml
index d4abd083e..693762f48 100644
--- a/legacy/argeo-commons/dep/pom.xml
+++ b/legacy/argeo-commons/dep/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.85-SNAPSHOT</version>
+		<version>2.1.86-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>legacy-dep</artifactId>
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
index d756da075..72f5f3c81 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.85-SNAPSHOT</version>
+		<version>2.1.86-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<version>${version.argeo-commons-legacy}</version>
 		</dependency>
 		<!-- RAP specific -->
 		<dependency>
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
index 134a73adf..f351a3c0f 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.85-SNAPSHOT</version>
+		<version>2.1.86-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.cms.ui.workbench</artifactId>
diff --git a/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml b/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
index fe372e2d3..2e9f95168 100644
--- a/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
+++ b/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.argeo.slc.legacy.commons</groupId>
 		<artifactId>argeo-commons-legacy</artifactId>
-		<version>2.1.85-SNAPSHOT</version>
+		<version>2.1.86-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
diff --git a/legacy/argeo-commons/pom.xml b/legacy/argeo-commons/pom.xml
index e9524b347..8a459a44f 100644
--- a/legacy/argeo-commons/pom.xml
+++ b/legacy/argeo-commons/pom.xml
@@ -4,13 +4,14 @@
 	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.commons</groupId>
-		<artifactId>argeo-commons</artifactId>
-		<version>2.1.84</version>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>legacy</artifactId>
+		<version>2.1.17-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.legacy.commons</groupId>
 	<artifactId>argeo-commons-legacy</artifactId>
-	<version>2.1.85-SNAPSHOT</version>
+	<version>2.1.86-SNAPSHOT</version>
 	<name>Commons Legacy</name>
 	<packaging>pom</packaging>
 	<properties>
diff --git a/legacy/org.argeo.legacy.fake.java8/.classpath b/legacy/org.argeo.legacy.fake.java8/.classpath
new file mode 100644
index 000000000..98582e1f9
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>>>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/legacy/org.argeo.legacy.fake.java8/.gitignore b/legacy/org.argeo.legacy.fake.java8/.gitignore
new file mode 100644
index 000000000..09e3bc9b2
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/legacy/org.argeo.legacy.fake.java8/.project b/legacy/org.argeo.legacy.fake.java8/.project
new file mode 100644
index 000000000..30f403480
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.legacy.fake.java8</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/legacy/org.argeo.legacy.fake.java8/META-INF/.gitignore b/legacy/org.argeo.legacy.fake.java8/META-INF/.gitignore
new file mode 100644
index 000000000..4854a41b9
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/legacy/org.argeo.legacy.fake.java8/bnd.bnd b/legacy/org.argeo.legacy.fake.java8/bnd.bnd
new file mode 100644
index 000000000..f007773fa
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/bnd.bnd
@@ -0,0 +1,2 @@
+Export-Package: javax.*;version=0.0.0,\
+org.omg.*;version=0.0.0
diff --git a/legacy/org.argeo.legacy.fake.java8/build.properties b/legacy/org.argeo.legacy.fake.java8/build.properties
new file mode 100644
index 000000000..39323f150
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/build.properties
@@ -0,0 +1,4 @@
+bin.includes = META-INF/
+jars.compile.order = .
+source.. = src/
+output.. = target/classes/
diff --git a/legacy/org.argeo.legacy.fake.java8/pom.xml b/legacy/org.argeo.legacy.fake.java8/pom.xml
new file mode 100644
index 000000000..845217f33
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/pom.xml
@@ -0,0 +1,26 @@
+<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>legacy</artifactId>
+		<version>2.1.17-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.legacy.fake.java8</artifactId>
+	<name>Legacy Fake Java 8 APIs</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-11</Bundle-RequiredExecutionEnvironment>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/legacy/org.argeo.legacy.fake.java8/src/javax/rmi/Fake.java b/legacy/org.argeo.legacy.fake.java8/src/javax/rmi/Fake.java
new file mode 100644
index 000000000..e5c7921c0
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/src/javax/rmi/Fake.java
@@ -0,0 +1,5 @@
+package javax.rmi;
+
+public class Fake {
+
+}
diff --git a/legacy/org.argeo.legacy.fake.java8/src/javax/xml/ws/Fake.java b/legacy/org.argeo.legacy.fake.java8/src/javax/xml/ws/Fake.java
new file mode 100644
index 000000000..d579f5eec
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/src/javax/xml/ws/Fake.java
@@ -0,0 +1,5 @@
+package javax.xml.ws;
+
+public class Fake {
+
+}
diff --git a/legacy/org.argeo.legacy.fake.java8/src/org/omg/CORBA/Fake.java b/legacy/org.argeo.legacy.fake.java8/src/org/omg/CORBA/Fake.java
new file mode 100644
index 000000000..cd153e507
--- /dev/null
+++ b/legacy/org.argeo.legacy.fake.java8/src/org/omg/CORBA/Fake.java
@@ -0,0 +1,5 @@
+package org.omg.CORBA;
+
+public class Fake {
+
+}
diff --git a/legacy/pom.xml b/legacy/pom.xml
index 9d9318320..1a4c72a77 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -12,6 +12,7 @@
 	<packaging>pom</packaging>
 	<name>SLC Legacy Argeo Software</name>
 	<modules>
+		<module>org.argeo.legacy.fake.java8</module>
 		<module>argeo-commons</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.support/bnd.bnd b/org.argeo.slc.support/bnd.bnd
index a6f93eda7..fc726210d 100644
--- a/org.argeo.slc.support/bnd.bnd
+++ b/org.argeo.slc.support/bnd.bnd
@@ -1,6 +1,7 @@
 Import-Package: org.apache.commons.logging,\
 org.dbunit.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
+javax.mail.*;resolution:="optional",\
 org.apache.commons.vfs.*,\
 javax.swing.plaf.metal,\
 org.osgi.*;version=0.0.0,\
diff --git a/pom.xml b/pom.xml
index 7fcd3adcc..572202b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 
-		<version.argeo-commons-legacy>2.1.85-SNAPSHOT</version.argeo-commons-legacy>
+		<version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
 	</properties>
 	<modules>
 		<!-- Runtime -->
-- 
2.39.2