Merge branch 'feature/java11' into 'develop'

Feature/java11

See merge request o2oa/o2oa!1500

o2server/pom.xml

@@ -338,6 +338,10 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-email</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -837,6 +841,11 @@
 				<artifactId>commons-email</artifactId>
 				<version>1.5</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.activation</groupId>
+				<artifactId>activation</artifactId>
+				<version>1.1.1</version>
+			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_base_core_project</artifactId>

o2server/x_console/pom.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>o2oa</groupId>
@@ -58,6 +61,9 @@
 							<addClasspath>false</addClasspath>
 							<mainClass>com.x.server.console.Main</mainClass>
 						</manifest>
+						<manifestEntries>
+							<Premain-Class>com.x.server.console.InstrumentationAgent</Premain-Class>
+						</manifestEntries>
 					</archive>
 				</configuration>
 			</plugin>