Merge pull request alibaba#11 from fushun1990/master

fix: 使用中遇到的几个问题，修复方便后边人使用
afayo · Jan 28, 2019 · 51a6e81 · 51a6e81
2 parents 1331ddf + d975c18
commit 51a6e81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/cola-archetype/src/main/resources/archetype-resources/pom.xml b/cola-archetype/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,7 @@
         <pandora-boot.version>2017-10-stable</pandora-boot.version>
         <spring-test.version>4.3.2.RELEASE</spring-test.version>
         <junit.version>4.12</junit.version>
-        <logback.version>1.2.3.5-struct</logback.version>
+        <logback.version>1.2.3</logback.version>
         <slf4j.version>1.7.22</slf4j.version>
         <cola.framework.version>1.0.0-SNAPSHOT</cola.framework.version>
     </properties>
@@ -84,13 +84,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.taobao.pandora</groupId>
-                <artifactId>pandora-boot-starter-bom</artifactId>
-                <version>${pandora-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
                 <artifactId>mybatis-spring-boot-starter</artifactId>

diff --git a/cola-archetype/src/main/resources/archetype-resources/start/src/test/java/TestConfig.java b/cola-archetype/src/main/resources/archetype-resources/start/src/test/java/TestConfig.java
@@ -15,7 +15,7 @@
  * @date 2018-08-08 12:33 PM
  */
 @Configuration
-@ComponentScan(basePackages = {"com.alibaba.cola", "com.alibaba.demo"})
+@ComponentScan(basePackages = {"com.alibaba.cola", "${package}"})
 public class TestConfig {
 
     public TestConfig() {