From be30e17e3c7685a54f761bf3a03487308c939270 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期三, 05 三月 2025 18:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 196 +++++++++++++++++++++++++-----------------------
1 files changed, 102 insertions(+), 94 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 76c2d09..698c2fe 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-service</artifactId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -17,49 +17,85 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- <axis2.version>1.7.9</axis2.version>
+ <!-- 鎸夊悇妯″潡瀹為檯鐩綍灞傛瀹氫箟鐩稿鏁版嵁锛屼娇鎵�鏈夋湇鍔℃ā鍧楄緭鍑鸿祫婧愭眹鑱氬埌鐩稿悓鐩綍 -->
+ <boot-jar-output>../devops</boot-jar-output>
</properties>
<dependencies>
<dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-web</artifactId>
- <version>2022.1-SNAPSHOT</version>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-code-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-ddl</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-core-boot</artifactId>
<exclusions>
<exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- </exclusion>
-<!-- <exclusion>-->
-<!-- <groupId>com.vci</groupId>-->
-<!-- <artifactId>vci-starter-corba</artifactId>-->
-<!-- </exclusion>-->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-mybatis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-webservice</artifactId>
- <version>2022.1-SNAPSHOT</version>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-swagger</artifactId>
</dependency>
-
<dependency>
- <groupId>com.vci.mdm</groupId>
- <artifactId>vci-mdm-wrj-webducking</artifactId>
- <version>2022.1-SNAPSHOT</version>
+ <groupId>cn.easyproject</groupId>
+ <artifactId>orai18n</artifactId>
+ <version>${orai18n.version}</version>
</dependency>
-
<dependency>
- <groupId>de.odysseus.staxon</groupId>
- <artifactId>staxon</artifactId>
- <version>1.3</version>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join-boot-starter</artifactId>
+ <version>${mybatisplus.join.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+ <version>3.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-user-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-system-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
<!--axis2 begin -->
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -68,19 +104,8 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${axis2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax-servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -89,80 +114,63 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
+ <artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <!--<exclusion>
+ <artifactId>commons-io</artifactId>
+ <groupId>commons-io</groupId>
+ </exclusion>-->
+ <exclusion>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!--axis2 end -->
-
- <!--webservice鐨勫唴瀹�-->
<dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-webservice</artifactId>
- <version>2022.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.springblade</groupId>
- <artifactId>ubcs-code-api</artifactId>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-flow-api</artifactId>
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
-
+ <!--axis2 end -->
<dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc8</artifactId>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-file-api</artifactId>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
- <artifactId>blade-core-boot</artifactId>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-applyjtcodeservice-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
</dependency>
-
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- <excludeGroupIds>com.vci.platform</excludeGroupIds>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- </manifest>
- </archive>
- <excludes>
- <exclude>application-dev.yml</exclude>
- <exclude>application-prod.yml</exclude>
- <exclude>application.yml</exclude>
- <exclude>properties/conf.properties</exclude>
- <exclude>properties/eventConf.properties</exclude>
- <exclude>lib/*</exclude>
- </excludes>
- </configuration>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3