Browse Source

move ObjectUtils

sunyj 8 years ago
parent
commit
1fc79f49cd

+ 1 - 0
pom.xml

@@ -25,6 +25,7 @@
         <maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
         <project.version>0.0.1</project.version>
         <report.common.version>${project.version}</report.common.version>
+        <fastjson.version>1.2.15</fastjson.version>
     </properties>
 
     <distributionManagement>

+ 6 - 0
report-common/pom.xml

@@ -14,5 +14,11 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>

+ 0 - 0
report/src/main/java/com/uas/report/util/ObjectUtils.java → report-common/src/main/java/com/uas/report/util/ObjectUtils.java


+ 0 - 2
report/pom.xml

@@ -16,7 +16,6 @@
 		<jasperreports-functions.version>6.3.0</jasperreports-functions.version>
 		<poi.version>3.10.1</poi.version>
 		<commons.fileupload.version>1.3.2</commons.fileupload.version>
-		<fastjson.version>1.2.15</fastjson.version>
 		<axis.version>1.4</axis.version>
 		<commons.discovery.version>0.2</commons.discovery.version>
 		<javax.activation.version>1.1.1</javax.activation.version>
@@ -73,7 +72,6 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>${fastjson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.oracle</groupId>