diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 38 |
1 files changed, 37 insertions, 1 deletions
@@ -83,6 +83,41 @@ </resource> </resources> +<<<<<<< HEAD + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <excludeArtifactIds>junit</excludeArtifactIds> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <archive> + <manifest> + <mainClass>org.traccar.Main</mainClass> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> +======= <plugins> <plugin> <artifactId>maven-dependency-plugin</artifactId> @@ -117,6 +152,7 @@ </configuration> </plugin> </plugins> +>>>>>>> df91992080ee4db293e6f81882e95e72600d9bd8 </build> -</project>
\ No newline at end of file +</project> |