Commit c30aa3d6 by QIANGLU

fix 依赖

parent 0529a43a
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>common-util</artifactId> <artifactId>common-util</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -29,21 +31,7 @@ ...@@ -29,21 +31,7 @@
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
</dependency> </dependency>
<!-- <dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.7</version>
</dependency>-->
</dependencies> </dependencies>
......
package com.secoo.mall.common.util.bean; package com.secoo.mall.common.util.bean;
import com.secoo.mall.common.core.errorcode.CommonErrorCode;
import com.secoo.mall.common.core.exception.BusinessException;
import com.secoo.mall.common.util.json.FastJsonUtil; import com.secoo.mall.common.util.json.FastJsonUtil;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
......
...@@ -28,121 +28,67 @@ ...@@ -28,121 +28,67 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.4.RELEASE</version> <version>2.1.4.RELEASE</version>
<relativePath />
</parent> </parent>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<dubbo.version>2.7.1</dubbo.version> <dubbo.version>2.7.1</dubbo.version>
<matrix.version>0.1-DEV-SNAPSHOT</matrix.version>
</properties> </properties>
<profiles>
<profile>
<id>dev</id>
<properties>
<ver_type>-DEV-SNAPSHOT</ver_type>
<repo_id>secoo-dev</repo_id>
<repo_name>secoo-dev-repository</repo_name>
<repo_url>nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-dev/</repo_url>
</properties>
<distributionManagement>
<repository>
<id>${repo_id}</id>
<name>${repo_name}</name>
<url>http://secoo-dev:secoo-dev@${repo_url}</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>test</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<ver_type>-SNAPSHOT</ver_type>
<repo_id>secoo-test</repo_id>
<repo_name>secoo-test-repository</repo_name>
<repo_url>nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-test/</repo_url>
</properties>
<distributionManagement>
<repository>
<id>${repo_id}</id>
<name>${repo_name}</name>
<url>http://secoo-test:secoo-test@${repo_url}</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>pro</id>
<properties>
<ver_type>.RELEASE</ver_type>
<repo_id>secoo-pro</repo_id>
<repo_name>secoo-pro-repository</repo_name>
<repo_url>nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-pro/</repo_url>
</properties>
<distributionManagement>
<repository>
<id>${repo_id}</id>
<name>${repo_name}</name>
<url>http://secoo-pro:secoo-PRO@${repo_url}</url>
</repository>
</distributionManagement>
</profile>
</profiles>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>common-util</artifactId> <artifactId>common-util</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>redis-starter</artifactId> <artifactId>redis-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>mybatis-starter</artifactId> <artifactId>mybatis-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>mongodb-starter</artifactId> <artifactId>mongodb-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>elasticsearch-starter</artifactId> <artifactId>elasticsearch-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>dubbo-starter</artifactId> <artifactId>dubbo-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>web-starter</artifactId> <artifactId>web-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>rocketmq-starter</artifactId> <artifactId>rocketmq-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.matrix</groupId> <groupId>com.secoo.matrix</groupId>
<artifactId>openfeign-starter</artifactId> <artifactId>openfeign-starter</artifactId>
<version>${matrix.version}</version> <version>0.1-DEV-SNAPSHOT</version>
</dependency> </dependency>
<!--spring cloud--> <!--spring cloud-->
<dependency> <dependency>
...@@ -270,57 +216,12 @@ ...@@ -270,57 +216,12 @@
</dependencyManagement> </dependencyManagement>
<build> <build>
<finalName>${project.artifactId}-${matrix.version}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
<mainClass>com.secoo.matrix.Application</mainClass>
<profiles>
<profile>local</profile>
<profile>dev</profile>
<profile>test</profile>
<profile>prod</profile>
</profiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<resources> <resources>
<resource> <resource>
<directory>${project.basedir}/boot</directory> <directory>src/main/resources</directory>
<targetPath>..</targetPath>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource> </resource>
<resource> <resource>
<directory>${project.basedir}/src/main/resources</directory> <directory>src/main/scripts</directory>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>
......
...@@ -24,22 +24,6 @@ ...@@ -24,22 +24,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
</dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>swagger-dubbo</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment