fix maven config

medcl · Feb 26, 2014 · 76214d5 · 76214d5
1 parent 22775c5
commit 76214d5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/lib/fastjson-1.1.14.jar b/lib/fastjson-1.1.14.jar
diff --git a/pom.xml b/pom.xml
@@ -75,14 +75,13 @@
             <version>1.3.RC2</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.1.14</version>
-            <scope>provided</scope>
+            <systemPath>${basedir}/lib/fastjson-1.1.14.jar</systemPath>
+            <scope>system</scope>
         </dependency>
-
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
@@ -114,24 +113,24 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <outputDirectory>${project.build.directory}/releases/</outputDirectory>
-                    <descriptors>
-                        <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.3</version>
+            <configuration>
+                <appendAssemblyId>false</appendAssemblyId>
+                <outputDirectory>${project.build.directory}/releases/</outputDirectory>
+                <descriptors>
+                    <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>
+                </descriptors>
+            </configuration>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>single</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
         </plugins>
     </build>
 

diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
@@ -15,4 +15,10 @@
             </excludes>
         </dependencySet>
     </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/lib/</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+    </fileSets>
 </assembly>