提交 7ad19c63 编写于 作者: O o2null

更新到6.4

上级 41b461e2
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
<packaging>pom</packaging>
<properties>
<maven.compiler.source>11</maven.compiler.source>
......@@ -371,10 +371,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-iostreams</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
......@@ -383,6 +379,10 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
......@@ -426,8 +426,6 @@
</compilerArgs>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
......@@ -495,13 +493,6 @@
</excludes>
</configuration>
</plugin>
<!-- plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId>
<version>3.13.0</version> <configuration> <linkXRef>true</linkXRef> <sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens> <targetJdk>1.8</targetJdk> <failOnViolation>false</failOnViolation>
<outputDirectory>${basedir}</outputDirectory> </configuration> <executions>
<execution> <id>pmd-check</id> <phase>verify</phase> <goals> <goal>check</goal>
</goals> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <version>2.3</version> </plugin -->
</plugins>
</build>
<dependencyManagement>
......@@ -851,8 +842,6 @@
<artifactId>javapoet</artifactId>
<version>1.11.1</version>
</dependency>
<!--dependency> <groupId>javax.visrec</groupId> <artifactId>visrec-api</artifactId>
<version>20200316</version> </dependency -->
<dependency>
<groupId>com.github.neuroph</groupId>
<artifactId>neuroph-core</artifactId>
......@@ -873,34 +862,7 @@
<artifactId>neuroph-contrib</artifactId>
<version>2.98</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
<version>2.14.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-iostreams -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-iostreams</artifactId>
<version>2.14.1</version>
</dependency>
<!--用于与slf4j保持桥接 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.14.1</version>
</dependency>
<!-- slf4j核心包 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
</dependency>
<!-- dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId>
<version>1.7.25</version> </dependency> <dependency> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <version>1.7.25</version> </dependency- -->
<!-- dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId>
<version>3.2.0</version> </dependency -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
......@@ -961,145 +923,145 @@
<artifactId>log4j-core</artifactId>
<version>2.14.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.14.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_base_core_project</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_attendance_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_bbs_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_calendar_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_cms_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_cms_core_express</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_component_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_file_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_general_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_hotpic_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_meeting_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_message_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_mind_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_organization_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_jpush_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_organization_core_express</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_portal_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_processplatform_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_processplatform_core_express</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_query_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_query_core_express</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_report_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_strategydeploy_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_strategydeploy_assemble_control</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_program_center</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_program_center_core_entity</artifactId>
<version>6.3</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_teamwork_core_entity</artifactId>
<version>6.3</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_workschedu_core_entity</artifactId>
<version>6.3</version>
<version>6.4</version>
</dependency>
<dependency>
<groupId>net.lingala.zip4j</groupId>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_attendance_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_attendance_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_base_core_project</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_bbs_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_bbs_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_calendar_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_calendar_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_cms_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_cms_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_cms_core_express</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_component_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_component_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_console</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_file_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_file_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_general_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_general_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_hotpic_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_hotpic_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_jpush_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_jpush_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_meeting_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_meeting_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_message_assemble_communicate</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_message_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_mind_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_mind_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_organization_assemble_authentication</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_organization_assemble_control</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_organization_assemble_express</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_organization_assemble_personal</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_organization_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_organization_core_express</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_portal_assemble_designer</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_portal_assemble_surface</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_portal_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_processplatform_assemble_bam</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_processplatform_assemble_designer</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_processplatform_assemble_surface</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_processplatform_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_processplatform_core_express</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_processplatform_service_processing</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_program_center</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_program_center_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_query_assemble_designer</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_query_assemble_surface</artifactId>
<packaging>war</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_query_core_entity</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_query_core_express</artifactId>
<packaging>jar</packaging>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>6.3</version>
<version>6.4</version>
</parent>
<artifactId>x_query_service_processing</artifactId>
<packaging>war</packaging>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册