From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 204 ++++++++++++++++++++-------------------------------
1 files changed, 80 insertions(+), 124 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 76c2d09..4151ee5 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>
@@ -16,98 +16,18 @@
<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>
- </properties>
-
<dependencies>
<dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-web</artifactId>
- <version>2022.1-SNAPSHOT</version>
- <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>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-webservice</artifactId>
- <version>2022.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>com.vci.mdm</groupId>
- <artifactId>vci-mdm-wrj-webducking</artifactId>
- <version>2022.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>de.odysseus.staxon</groupId>
- <artifactId>staxon</artifactId>
- <version>1.3</version>
- </dependency>
-
- <!--axis2 begin -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
- </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>
- <artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>${axis2.version}</version>
- </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>
+ <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>
@@ -115,54 +35,90 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-mybatis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-swagger</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>cn.easyproject</groupId>
+ <artifactId>orai18n</artifactId>
+ <version>${orai18n.version}</version>
+ </dependency>
+ <dependency>
+ <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>
+ <!--<dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-webservice</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </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>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <configuration>
+ <username>${docker.username}</username>
+ <password>${docker.password}</password>
+ <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+ <tag>${project.version}</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ <buildArgs>
+ <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ <skip>false</skip>
+ </configuration>
</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-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3