Skip to content

Commit

Permalink
Migrated from Ant to Maven
Browse files Browse the repository at this point in the history
Removed lib folder, with maven it is unnecessary. Replaced the Ant
script with a pom.xml file for Maven with similar targets.

Eclipse integration and proper changes to the .project and .classpath
remain to be done.

Signed-off-by: Maxime Petazzoni <[email protected]>
  • Loading branch information
Dmitriy Dumanskiy authored and Maxime Petazzoni committed Apr 11, 2012
1 parent f15a540 commit 6b5c5ac
Show file tree
Hide file tree
Showing 36 changed files with 96 additions and 98 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Ignore build output
/build/*
/*.jar
/target/*

# Ignore Javadoc output
/doc/*
Expand Down
15 changes: 2 additions & 13 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,8 @@ Building the distribution JAR

Simply execute the following command:

$ ant dist
$ mvn package

To build the library's JAR file (in the dist/ directory). You can then import
To build the library's JAR file (in the target/ directory). You can then import
this JAR file into your Java project and start using the Java BitTorrent
library.


Building the documentation
--------------------------

You can build the library's Javadoc with the following command:

$ ant doc

This will build the Javadoc in the doc/ directory. Make sure Javadoc is
installed on your system first.
84 changes: 0 additions & 84 deletions build.xml

This file was deleted.

Binary file removed lib/commons-io-2.0.1.jar
Binary file not shown.
Binary file removed lib/log4j-1.2.16.jar
Binary file not shown.
Binary file removed lib/simple-4.1.21.jar
Binary file not shown.
Binary file removed lib/slf4j-api-1.6.4.jar
Binary file not shown.
Binary file removed lib/slf4j-log4j12-1.6.4.jar
Binary file not shown.
93 changes: 93 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.turn.ttorrent</groupId>
<artifactId>ttorrent</artifactId>
<packaging>jar</packaging>
<version>1.1.2</version>
<name>Java BitTorrent library</name>
<url>http://turn.github.com/ttorrent/</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.1</version>
</dependency>

<dependency>
<groupId>org.simpleframework</groupId>
<artifactId>simple</artifactId>
<version>4.1.21</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.4</version>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.1.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<includes>
<include>**</include>
</includes>
</configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<mainClass>com.turn.ttorrent.client.Client</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-my-jar-with-dependencies</id>
<phase>package</phase>
<goals>
<!--change assembly to single if you don't want include dependencies in jar-->
<goal>assembly</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 6b5c5ac

Please sign in to comment.