diff --git a/o2server/pom.xml b/o2server/pom.xml index a5b8d8cbab1fb0a9efd49a119903d4e24554dd18..3ddb819e300a9e7f1f5b8d2e567391a07b9c8035 100644 --- a/o2server/pom.xml +++ b/o2server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 o2oa o2server - 5.3 + 5.4 pom 1.8 @@ -869,142 +869,142 @@ o2oa x_base_core_project - 5.3 + 5.4 o2oa x_attendance_core_entity - 5.3 + 5.4 o2oa x_bbs_core_entity - 5.3 + 5.4 o2oa x_calendar_core_entity - 5.3 + 5.4 o2oa x_cms_core_entity - 5.3 + 5.4 o2oa x_cms_core_express - 5.3 + 5.4 o2oa x_component_core_entity - 5.3 + 5.4 o2oa x_file_core_entity - 5.3 + 5.4 o2oa x_general_core_entity - 5.3 + 5.4 o2oa x_hotpic_core_entity - 5.3 + 5.4 o2oa x_meeting_core_entity - 5.3 + 5.4 o2oa x_message_core_entity - 5.3 + 5.4 o2oa x_mind_core_entity - 5.3 + 5.4 o2oa x_organization_core_entity - 5.3 + 5.4 o2oa x_jpush_core_entity - 5.3 + 5.4 o2oa x_organization_core_express - 5.3 + 5.4 o2oa x_portal_core_entity - 5.3 + 5.4 o2oa x_processplatform_core_entity - 5.3 + 5.4 o2oa x_processplatform_core_express - 5.3 + 5.4 o2oa x_query_core_entity - 5.3 + 5.4 o2oa x_query_core_express - 5.3 + 5.4 o2oa x_report_core_entity - 5.3 + 5.4 o2oa x_strategydeploy_core_entity - 5.3 + 5.4 o2oa x_strategydeploy_assemble_control - 5.3 + 5.4 o2oa x_program_center - 5.3 + 5.4 o2oa x_program_center_core_entity - 5.3 + 5.4 o2oa x_teamwork_core_entity - 5.3 + 5.4 o2oa x_workschedu_core_entity - 5.3 + 5.4 net.lingala.zip4j diff --git a/o2server/x_attendance_assemble_control/pom.xml b/o2server/x_attendance_assemble_control/pom.xml index c036cc1a518b1c1e1e3d5f3c08b8b3248c218221..0f7b7142fa54c3dd0844a32ace09d6aaa27918ff 100644 --- a/o2server/x_attendance_assemble_control/pom.xml +++ b/o2server/x_attendance_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_attendance_assemble_control war diff --git a/o2server/x_attendance_core_entity/pom.xml b/o2server/x_attendance_core_entity/pom.xml index 8e3eeaf66628793785bb9f545c28c0ef3bece22f..1c41d5f0a9b7eee4ec2cc2753858be4e996f38c1 100644 --- a/o2server/x_attendance_core_entity/pom.xml +++ b/o2server/x_attendance_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_attendance_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_base_core_project/pom.xml b/o2server/x_base_core_project/pom.xml index 864309f2b178bb84582fe4152b08e2cdb25497ae..4d9ae145fdf521d42dbfaff4d057e7a2a4edf7c3 100644 --- a/o2server/x_base_core_project/pom.xml +++ b/o2server/x_base_core_project/pom.xml @@ -1,12 +1,12 @@ - 4.0.0 o2oa o2server - 5.3 + 5.4 x_base_core_project jar @@ -91,4 +91,4 @@ - \ No newline at end of file + diff --git a/o2server/x_bbs_assemble_control/pom.xml b/o2server/x_bbs_assemble_control/pom.xml index 58a83e3da4e82d5452a3bc097407d82be2c41237..627f28fcfae2f01d208716fa9351511a6eab8c7a 100644 --- a/o2server/x_bbs_assemble_control/pom.xml +++ b/o2server/x_bbs_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_bbs_assemble_control war diff --git a/o2server/x_bbs_core_entity/pom.xml b/o2server/x_bbs_core_entity/pom.xml index 780c35a25aa8b704b2b8cd9e5ff129dfffbfc087..27729c594c9a424722b0706805e5b7e3cd8d63ce 100644 --- a/o2server/x_bbs_core_entity/pom.xml +++ b/o2server/x_bbs_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_bbs_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_calendar_assemble_control/pom.xml b/o2server/x_calendar_assemble_control/pom.xml index 67222f8142c2cfea486a2e040c16626b2705a3d5..4feaadb792dbd189165e5bba2bdf1db313639017 100644 --- a/o2server/x_calendar_assemble_control/pom.xml +++ b/o2server/x_calendar_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_calendar_assemble_control war diff --git a/o2server/x_calendar_core_entity/pom.xml b/o2server/x_calendar_core_entity/pom.xml index a6274022be6e005b4c1db6ba7d838cc74048e324..81e3b3c8c56a66d0855dd03590558ba01d393bf9 100644 --- a/o2server/x_calendar_core_entity/pom.xml +++ b/o2server/x_calendar_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_calendar_core_entity jar @@ -40,7 +40,7 @@ - + metaModelBuilder generate-sources @@ -127,4 +127,4 @@ - \ No newline at end of file + diff --git a/o2server/x_cms_assemble_control/pom.xml b/o2server/x_cms_assemble_control/pom.xml index aac43cd05fd52f7c71cf2600ef8aa896bc72e85d..ff423847a6f7e324b051b082cc387a9f151eae00 100644 --- a/o2server/x_cms_assemble_control/pom.xml +++ b/o2server/x_cms_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_cms_assemble_control war @@ -55,7 +55,7 @@ org.codehaus.mojo exec-maven-plugin - + DescribeWoBuilder prepare-package @@ -73,7 +73,7 @@ - + describeBuilder prepare-package diff --git a/o2server/x_cms_core_entity/pom.xml b/o2server/x_cms_core_entity/pom.xml index 4131d3c6ac0eb575c39cafffa42dfa2c3d12b66b..567757138dfd1712431d254b8ada9fb9f3f3ad82 100644 --- a/o2server/x_cms_core_entity/pom.xml +++ b/o2server/x_cms_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_cms_core_entity jar @@ -131,4 +131,4 @@ - \ No newline at end of file + diff --git a/o2server/x_cms_core_express/pom.xml b/o2server/x_cms_core_express/pom.xml index 32639dfd0c4f5a06c0728ef05f232d449e20c68a..ce31f43ad520f06af59d65024c230e8a26073441 100644 --- a/o2server/x_cms_core_express/pom.xml +++ b/o2server/x_cms_core_express/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_cms_core_express jar diff --git a/o2server/x_component_assemble_control/pom.xml b/o2server/x_component_assemble_control/pom.xml index 98c45d998a9a715da7a20395a21e9062a6f686cb..711d1abbfeb964971300426fb5bfacd905ae1272 100644 --- a/o2server/x_component_assemble_control/pom.xml +++ b/o2server/x_component_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_component_assemble_control war @@ -132,4 +132,4 @@ - \ No newline at end of file + diff --git a/o2server/x_component_core_entity/pom.xml b/o2server/x_component_core_entity/pom.xml index 986da56f9423ff8be558e067fa51f5fbc0e7b042..17ceb865b79c7688a6ed3444840bac3a9087ddf4 100644 --- a/o2server/x_component_core_entity/pom.xml +++ b/o2server/x_component_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_component_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_console/pom.xml b/o2server/x_console/pom.xml index 0b5c741e37f37ba1566bb29168e105501b96ae0b..a42e16d9d0951be04a5534401b49e181131943a1 100644 --- a/o2server/x_console/pom.xml +++ b/o2server/x_console/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_console jar diff --git a/o2server/x_file_assemble_control/pom.xml b/o2server/x_file_assemble_control/pom.xml index 5ae49095077f19328ca67f7c269afe6bfbbe5d3f..c9ba07ac9d95912ed1e343a486e6b9f5cbe23db1 100644 --- a/o2server/x_file_assemble_control/pom.xml +++ b/o2server/x_file_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_file_assemble_control war @@ -136,4 +136,4 @@ - \ No newline at end of file + diff --git a/o2server/x_file_core_entity/pom.xml b/o2server/x_file_core_entity/pom.xml index 2851e8e0083e96ed08d0c0bd1536c15e86a29dce..e23b3c90f012abf6ea2dc5bc8596467f86a19d31 100644 --- a/o2server/x_file_core_entity/pom.xml +++ b/o2server/x_file_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_file_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_general_assemble_control/pom.xml b/o2server/x_general_assemble_control/pom.xml index 736898a33cf586f2f832987c36c37b4c6e5616a4..0427d0db5979aa0ff20bac0f42b847ac5a7db6ae 100644 --- a/o2server/x_general_assemble_control/pom.xml +++ b/o2server/x_general_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_general_assemble_control war diff --git a/o2server/x_general_core_entity/pom.xml b/o2server/x_general_core_entity/pom.xml index e35fbad2d83ace16072ae617d3f0945c268dc382..09c89a7307e23aedc496ff254d19e94ab7e01da8 100644 --- a/o2server/x_general_core_entity/pom.xml +++ b/o2server/x_general_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_general_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_hotpic_assemble_control/pom.xml b/o2server/x_hotpic_assemble_control/pom.xml index 815294d477f29473c7654892d83dfa69008171b9..825e5213771de1cac0785fc279097cf46e52f5a3 100644 --- a/o2server/x_hotpic_assemble_control/pom.xml +++ b/o2server/x_hotpic_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_hotpic_assemble_control war diff --git a/o2server/x_hotpic_core_entity/pom.xml b/o2server/x_hotpic_core_entity/pom.xml index be1dee1ada634daf03dc6dc97ad1c0069a07b5cb..01112c604cad389808b1927690490d7ac4fcac77 100644 --- a/o2server/x_hotpic_core_entity/pom.xml +++ b/o2server/x_hotpic_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_hotpic_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_jpush_assemble_control/pom.xml b/o2server/x_jpush_assemble_control/pom.xml index 330cd91d7204846a80bcead3664e8576299e5871..f9a53098bdbd44c9f3d7869d376791d35db10c86 100644 --- a/o2server/x_jpush_assemble_control/pom.xml +++ b/o2server/x_jpush_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_jpush_assemble_control war diff --git a/o2server/x_jpush_core_entity/pom.xml b/o2server/x_jpush_core_entity/pom.xml index f617a8c1d280fe5b174676943d538ba49b8b43ba..8f1a0499b98bdc2a272cd6b3ac649d63884c2c27 100644 --- a/o2server/x_jpush_core_entity/pom.xml +++ b/o2server/x_jpush_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_jpush_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_meeting_assemble_control/pom.xml b/o2server/x_meeting_assemble_control/pom.xml index 7942bbf031af3c8084f56cd6499781c637cd8bb6..3b5158da5b4ce2f264938691ab8d31a44d5f11e4 100644 --- a/o2server/x_meeting_assemble_control/pom.xml +++ b/o2server/x_meeting_assemble_control/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_meeting_assemble_control war diff --git a/o2server/x_meeting_core_entity/pom.xml b/o2server/x_meeting_core_entity/pom.xml index 798cd0855b9aa55063d677bc930607d4d5d7618a..c440445f011d4539c5209c2e7b0ad987e0012148 100644 --- a/o2server/x_meeting_core_entity/pom.xml +++ b/o2server/x_meeting_core_entity/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_meeting_core_entity jar @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/o2server/x_message_assemble_communicate/pom.xml b/o2server/x_message_assemble_communicate/pom.xml index 847095397b49feb0fab8edf16d06210274d33d02..871a15a00468638d53188f22887f809502dc2f04 100644 --- a/o2server/x_message_assemble_communicate/pom.xml +++ b/o2server/x_message_assemble_communicate/pom.xml @@ -7,7 +7,7 @@ o2oa o2server - 5.3 + 5.4 x_message_assemble_communicate war @@ -28,23 +28,23 @@ o2oa x_message_core_entity - + org.apache.kafka kafka-clients 2.6.0 -