Merge remote-tracking branch 'origin/master'

# Conflicts:
#	panda-aop/src/test/java/org/panda/aop/util/InterfaceProxyFactoryUtilTest.java
#	panda-jdbc/src/test/java/org/panda/jdbc/JdbcUtilsTest.java
master
星期八 5 years ago
commit 369967e74b
  1. 2
      panda-all/pom.xml
  2. 2
      panda-aop/pom.xml
  3. 2
      panda-beans/pom.xml
  4. 2
      panda-code/pom.xml
  5. 2
      panda-jdbc/pom.xml
  6. 2
      panda-web/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>panda</artifactId>
<groupId>org.panda</groupId>
<version>1.0-SNAPSHOT</version>
<version>2.0</version>
</parent>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>panda</artifactId>
<groupId>org.panda</groupId>
<version>1.0-SNAPSHOT</version>
<version>2.0</version>
</parent>
<version>${project.version}</version>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>panda</artifactId>
<groupId>org.panda</groupId>
<version>1.0-SNAPSHOT</version>
<version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>panda</artifactId>
<groupId>org.panda</groupId>
<version>1.0-SNAPSHOT</version>
<version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>panda-code</artifactId>

@ -5,7 +5,7 @@
<parent>
<artifactId>panda</artifactId>
<groupId>org.panda</groupId>
<version>1.0-SNAPSHOT</version>
<version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>panda</artifactId>
<groupId>org.panda</groupId>
<version>1.0-SNAPSHOT</version>
<version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Loading…
Cancel
Save