diff options
| -rw-r--r-- | ardor3d-animation/pom.xml | 48 | ||||
| -rw-r--r-- | ardor3d-awt/pom.xml | 54 | ||||
| -rw-r--r-- | ardor3d-collada/pom.xml | 77 | ||||
| -rw-r--r-- | ardor3d-core/pom.xml | 60 | ||||
| -rw-r--r-- | ardor3d-distribution/pom.xml | 165 | ||||
| -rw-r--r-- | ardor3d-effects/pom.xml | 46 | ||||
| -rw-r--r-- | ardor3d-examples/pom.xml | 61 | ||||
| -rw-r--r-- | ardor3d-extras/pom.xml | 46 | ||||
| -rw-r--r-- | ardor3d-jogl/pom.xml | 88 | ||||
| -rw-r--r-- | ardor3d-lwjgl/pom.xml | 18 | ||||
| -rw-r--r-- | ardor3d-math/pom.xml | 50 | ||||
| -rw-r--r-- | ardor3d-savable/pom.xml | 40 | ||||
| -rw-r--r-- | ardor3d-swt/pom.xml | 23 | ||||
| -rw-r--r-- | ardor3d-terrain/pom.xml | 58 | ||||
| -rw-r--r-- | ardor3d-ui/pom.xml | 46 | ||||
| -rw-r--r-- | pom.xml | 349 |
16 files changed, 546 insertions, 683 deletions
diff --git a/ardor3d-animation/pom.xml b/ardor3d-animation/pom.xml index c252714..8a7cf43 100644 --- a/ardor3d-animation/pom.xml +++ b/ardor3d-animation/pom.xml @@ -1,32 +1,22 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-animation</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Skinning and Animation System</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <artifactId>ardor3d-animation</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Skinning and Animation System</name> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </project> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + +</project> diff --git a/ardor3d-awt/pom.xml b/ardor3d-awt/pom.xml index 176dfbd..de302bd 100644 --- a/ardor3d-awt/pom.xml +++ b/ardor3d-awt/pom.xml @@ -1,40 +1,22 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-awt</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D AWT</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - </build> + <artifactId>ardor3d-awt</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D AWT</name> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - </dependency> - </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </project> diff --git a/ardor3d-collada/pom.xml b/ardor3d-collada/pom.xml index 6ca19c6..069126d 100644 --- a/ardor3d-collada/pom.xml +++ b/ardor3d-collada/pom.xml @@ -1,47 +1,36 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-collada</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Collada Importer</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-animation</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom2</artifactId> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </dependency> - </dependencies> + <artifactId>ardor3d-collada</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Collada Importer</name> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-animation</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + </dependency> + </dependencies> + </project> diff --git a/ardor3d-core/pom.xml b/ardor3d-core/pom.xml index 212dd0d..be17df2 100644 --- a/ardor3d-core/pom.xml +++ b/ardor3d-core/pom.xml @@ -1,54 +1,28 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-core</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Core</name> - <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> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - </build> + <artifactId>ardor3d-core</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Core</name> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> <artifactId>ardor3d-math</artifactId> <version>${project.version}</version> </dependency> + <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - </dependency> - </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + </dependencies> + </project> diff --git a/ardor3d-distribution/pom.xml b/ardor3d-distribution/pom.xml index 0c69160..c5eb44c 100644 --- a/ardor3d-distribution/pom.xml +++ b/ardor3d-distribution/pom.xml @@ -1,87 +1,88 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>distribution</artifactId> - <packaging>pom</packaging> - <name>Distribution</name> + <artifactId>distribution</artifactId> + <packaging>pom</packaging> + <name>Distribution</name> - <dependencies> - <!-- NOTE: This dependency is only required to sort this project to the - end of the line in the multimodule build. --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-examples</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <!-- TODO adapt when switching to Sonatype OSS - - When switching to Sonatype OSS, the parent pom will use Sonatype OSS repos - in its distributionManagement block. As the zips of this module shouldn't be deployed to - Sonatype/Central but rather to Ardor3D's own repo, the repos have to be overridden here: - - <distributionManagement> - <repository> - <id>Ardor3D-releases</id> - <name>Ardor3D releases</name> - <url>http://ardor3d.com:8081/nexus/content/repositories/releases</url> - </repository> - <snapshotRepository> - <id>Ardor3D-snapshots</id> - <name>Ardor3D snapshots</name> - <url>http://ardor3d.com:8081/nexus/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> - --> + <dependencies> + <!-- NOTE: This dependency is only required to sort this project to the + end of the line in the multimodule build. --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-examples</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <!-- TODO adapt when switching to Sonatype OSS + When switching to Sonatype OSS, the parent pom will use Sonatype OSS repos + in its distributionManagement block. As the zips of this module shouldn't be deployed to + Sonatype/Central but rather to Ardor3D's own repo, the repos have to be overridden here: --> + <!--distributionManagement> + <repository> + <id>Ardor3D-releases</id> + <name>Ardor3D releases</name> + <url>http://ardor3d.com:8081/nexus/content/repositories/releases</url> + </repository> + <snapshotRepository> + <id>Ardor3D-snapshots</id> + <name>Ardor3D snapshots</name> + <url>http://ardor3d.com:8081/nexus/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement--> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>assembly-all.xml</descriptor> - <descriptor>assembly-jogl.xml</descriptor> - <descriptor>assembly-lwjgl.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.googlecode.mavennatives</groupId> - <artifactId>maven-nativedependencies-plugin</artifactId> - <version>0.0.7</version> - <executions> - <execution> - <id>unpacknatives</id> - <goals> - <goal>copy</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>assembly-all.xml</descriptor> + <descriptor>assembly-jogl.xml</descriptor> + <descriptor>assembly-lwjgl.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>com.googlecode.mavennatives</groupId> + <artifactId>maven-nativedependencies-plugin</artifactId> + <executions> + <execution> + <id>unpacknatives</id> + <goals> + <goal>copy</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/ardor3d-effects/pom.xml b/ardor3d-effects/pom.xml index ee8b241..e3fe48b 100644 --- a/ardor3d-effects/pom.xml +++ b/ardor3d-effects/pom.xml @@ -1,32 +1,22 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-effects</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Effects</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <artifactId>ardor3d-effects</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Effects</name> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </project> diff --git a/ardor3d-examples/pom.xml b/ardor3d-examples/pom.xml index 121e85d..10dd043 100644 --- a/ardor3d-examples/pom.xml +++ b/ardor3d-examples/pom.xml @@ -21,7 +21,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <archive> <manifest> @@ -32,7 +31,9 @@ </archive> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -49,14 +50,14 @@ </execution> </executions> </plugin> - <!-- Run example executable with goal exec:java and add - "-Djava.library.path=target/natives" to the VM arguments. - You probably have to execute the package goal once to generate the - target/natives folder. --> + + <!-- Run example executable with goal exec:java and add + "-Djava.library.path=target/natives" to the VM arguments. + You probably have to execute the package goal once to generate the + target/natives folder. --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> <executions> <execution> <goals> @@ -67,40 +68,32 @@ <configuration> <systemProperties> <systemProperty> - <!-- - Doesn't work, as this property can only be given when a new - jvm is forked. Instead, run goal "exec:java" with the vm arguments: - "-Djava.library.path=target/natives" --> - <key>java.library.path</key> - <value>target/natives</value> + <!-- + Doesn't work, as this property can only be given when a new + jvm is forked. Instead, run goal "exec:java" with the vm arguments: + "-Djava.library.path=target/natives" --> + <key>java.library.path</key> + <value>target/natives</value> </systemProperty> </systemProperties> <!-- TODO Using ExampleRunner results in some resources problems --> <mainClass>com.ardor3d.example.basic.BoxExample</mainClass> </configuration> </plugin> + <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <groupId>com.googlecode.mavennatives</groupId> + <artifactId>maven-nativedependencies-plugin</artifactId> + <executions> + <execution> + <id>unpacknatives</id> + <phase>generate-resources</phase> + <goals> + <goal>copy</goal> + </goals> + </execution> + </executions> </plugin> - <plugin> - <groupId>com.googlecode.mavennatives</groupId> - <artifactId>maven-nativedependencies-plugin</artifactId> - <version>0.0.7</version> - <executions> - <execution> - <id>unpacknatives</id> - <phase>generate-resources</phase> - <goals> - <goal>copy</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -112,8 +105,8 @@ </dependency> <!-- because we use org.lwjgl.LWJGLException in LwjglSwtExample --> <dependency> - <groupId>org.lwjgl.lwjgl</groupId> - <artifactId>lwjgl</artifactId> + <groupId>org.lwjgl.lwjgl</groupId> + <artifactId>lwjgl</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/ardor3d-extras/pom.xml b/ardor3d-extras/pom.xml index d85defc..165f5fd 100644 --- a/ardor3d-extras/pom.xml +++ b/ardor3d-extras/pom.xml @@ -1,32 +1,22 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-extras</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Extras Package</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <artifactId>ardor3d-extras</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Extras Package</name> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </project> diff --git a/ardor3d-jogl/pom.xml b/ardor3d-jogl/pom.xml index 68116fb..610202c 100644 --- a/ardor3d-jogl/pom.xml +++ b/ardor3d-jogl/pom.xml @@ -1,57 +1,45 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <relativePath>../pom.xml</relativePath> - <version>0.9-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <relativePath>../pom.xml</relativePath> + <version>0.9-SNAPSHOT</version> + </parent> - <artifactId>ardor3d-jogl</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D JOGL</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jogamp.gluegen</groupId> - <artifactId>gluegen-rt-main</artifactId> - </dependency> - <dependency> - <groupId>org.jogamp.jogl</groupId> - <artifactId>jogl-all-main</artifactId> - </dependency> - <!-- - <dependency> - <groupId>org.jogamp.joal</groupId> - <artifactId>joal-main</artifactId> - <version>2.0-rc11</version> - </dependency> - <dependency> - <groupId>org.jogamp.jocl</groupId> - <artifactId>jocl-main</artifactId> - <version>2.0-rc11</version> - </dependency> --> - </dependencies> - <repositories> + <artifactId>ardor3d-jogl</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D JOGL</name> + + <repositories> <repository> <id>jogamp</id> <url>http://jogamp.org/deployment/maven</url> </repository> </repositories> -</project>
\ No newline at end of file + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jogamp.gluegen</groupId> + <artifactId>gluegen-rt-main</artifactId> + </dependency> + <dependency> + <groupId>org.jogamp.jogl</groupId> + <artifactId>jogl-all-main</artifactId> + </dependency> + <!--dependency> + <groupId>org.jogamp.joal</groupId> + <artifactId>joal-main</artifactId> + </dependency> + <dependency> + <groupId>org.jogamp.jocl</groupId> + <artifactId>jocl-main</artifactId> + </dependency--> + </dependencies> + +</project> diff --git a/ardor3d-lwjgl/pom.xml b/ardor3d-lwjgl/pom.xml index ec2684a..3b67867 100644 --- a/ardor3d-lwjgl/pom.xml +++ b/ardor3d-lwjgl/pom.xml @@ -10,18 +10,7 @@ <artifactId>ardor3d-lwjgl</artifactId> <packaging>bundle</packaging> <name>Ardor 3D LWJGL</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -29,12 +18,13 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.lwjgl.lwjgl</groupId> - <artifactId>lwjgl</artifactId> + <groupId>org.lwjgl.lwjgl</groupId> + <artifactId>lwjgl</artifactId> </dependency> <dependency> <groupId>org.lwjgl.lwjgl</groupId> <artifactId>lwjgl_util</artifactId> </dependency> </dependencies> + </project> diff --git a/ardor3d-math/pom.xml b/ardor3d-math/pom.xml index 7fe1b23..e57f84c 100644 --- a/ardor3d-math/pom.xml +++ b/ardor3d-math/pom.xml @@ -1,47 +1,23 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-math</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Math</name> - <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> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - </build> + <artifactId>ardor3d-math</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Math</name> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> <artifactId>ardor3d-savable</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + </dependencies> + </project> diff --git a/ardor3d-savable/pom.xml b/ardor3d-savable/pom.xml index 0718194..b5acdd6 100644 --- a/ardor3d-savable/pom.xml +++ b/ardor3d-savable/pom.xml @@ -1,33 +1,15 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-savable</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Savable</name> - <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> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <artifactId>ardor3d-savable</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Savable</name> + </project> diff --git a/ardor3d-swt/pom.xml b/ardor3d-swt/pom.xml index 1252ca3..f051ef3 100644 --- a/ardor3d-swt/pom.xml +++ b/ardor3d-swt/pom.xml @@ -11,18 +11,7 @@ <artifactId>ardor3d-swt</artifactId> <packaging>bundle</packaging> <name>Ardor 3D SWT</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -42,7 +31,7 @@ <repositories> - <!-- The current version of swt isn't on central yet. --> + <!-- The current version of swt isn't on central yet. --> <repository> <id>ardor3d</id> <url>http://ardor3d.com:8081/nexus/content/groups/public</url> @@ -65,6 +54,7 @@ <swt.classifier>linux-x86</swt.classifier> </properties> </profile> + <profile> <id>linux-x86_64</id> <activation> @@ -77,6 +67,7 @@ <swt.classifier>linux-x86_64</swt.classifier> </properties> </profile> + <profile> <id>solaris-sparc</id> <activation> @@ -89,6 +80,7 @@ <swt.classifier>solaris-sparc</swt.classifier> </properties> </profile> + <profile> <id>solaris-x86</id> <activation> @@ -101,6 +93,7 @@ <swt.classifier>solaris-x86</swt.classifier> </properties> </profile> + <profile> <id>macosx-cocoa-64</id> <activation> @@ -113,6 +106,7 @@ <swt.classifier>mac-x86_64</swt.classifier> </properties> </profile> + <profile> <id>macosx-cocoa</id> <activation> @@ -125,6 +119,7 @@ <swt.classifier>mac-x86</swt.classifier> </properties> </profile> + <profile> <id>win32</id> <activation> @@ -137,6 +132,7 @@ <swt.classifier>win32-x86</swt.classifier> </properties> </profile> + <profile> <id>win64</id> <activation> @@ -150,4 +146,5 @@ </properties> </profile> </profiles> + </project> diff --git a/ardor3d-terrain/pom.xml b/ardor3d-terrain/pom.xml index e8aacd3..f772a59 100644 --- a/ardor3d-terrain/pom.xml +++ b/ardor3d-terrain/pom.xml @@ -1,37 +1,27 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-terrain</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D Terrain</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-awt</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>ardor3d-terrain</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D Terrain</name> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-awt</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </project> diff --git a/ardor3d-ui/pom.xml b/ardor3d-ui/pom.xml index 80f9609..825aa87 100644 --- a/ardor3d-ui/pom.xml +++ b/ardor3d-ui/pom.xml @@ -1,32 +1,22 @@ <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> - <parent> - <groupId>com.ardor3d</groupId> - <artifactId>ardor3d</artifactId> - <version>0.9-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.ardor3d</groupId> + <artifactId>ardor3d</artifactId> + <version>0.9-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>ardor3d-ui</artifactId> - <packaging>bundle</packaging> - <name>Ardor 3D UI</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <artifactId>ardor3d-ui</artifactId> + <packaging>bundle</packaging> + <name>Ardor 3D UI</name> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ardor3d-core</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ardor3d-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </project> @@ -1,4 +1,3 @@ - <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.ardor3d</groupId> @@ -29,13 +28,49 @@ <connection>scm:git:https://github.com/Renanse/Ardor3D.git</connection> </scm> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <threshold>Normal</threshold> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.5.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9</version> + </plugin> + </plugins> + </reporting> + + <distributionManagement> + <repository> + <id>Ardor3D-releases</id> + <name>Ardor3D releases</name> + <url>http://ardor3d.com:8081/nexus/content/repositories/releases</url> + </repository> + <snapshotRepository> + <id>Ardor3D-snapshots</id> + <name>Ardor3D snapshots</name> + <url>http://ardor3d.com:8081/nexus/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> + <version>3.0</version> <configuration> <source>1.6</source> <target>1.6</target> @@ -43,6 +78,12 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> <configuration> @@ -50,37 +91,56 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.4</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.2</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.6</version> + <version>2.14</version> <configuration> <argLine>-Xmx512m</argLine> </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> </plugin> <plugin> - <artifactId>maven-install-plugin</artifactId> - <version>2.4</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.5.2</version> </plugin> <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.0</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.5.2</version> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + </plugin> + <plugin> + <groupId>com.googlecode.mavennatives</groupId> + <artifactId>maven-nativedependencies-plugin</artifactId> + <version>0.0.7</version> </plugin> </plugins> </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -90,97 +150,109 @@ <target>1.6</target> </configuration> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/classes/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - </instructions> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <manifestLocation>target/classes/META-INF</manifestLocation> + <instructions> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> + </instructions> + </configuration> + </plugin> </plugins> </build> - <!-- these properties help simplify specifying some commonly occurring variables --> + <!-- these properties help simplify specifying some commonly occurring variables --> <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <jogamp.version>2.0.2-rc20130404</jogamp.version> <lwjgl.version>2.8.4</lwjgl.version> - <jogl.version>2.0-rc11post06</jogl.version> <swt.version>3650</swt.version> <osgi.project.version>0.9_SNAPSHOT</osgi.project.version> </properties> - <!-- The dependencyManagement section should specify all versions of artifacts used in sub --> - <!-- modules. This only specifies version, and doesn't mean that modules actually use them --> - <!-- To inherit actual usage of artifacts, use the dependencies section below. --> + <!-- The dependencyManagement section should specify all versions of artifacts used in sub --> + <!-- modules. This only specifies version, and doesn't mean that modules actually use them --> + <!-- To inherit actual usage of artifacts, use the dependencies section below. --> <dependencyManagement> <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>14.0.1</version> - </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>14.0.1</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.10</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymockclassextension</artifactId> <version>2.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jogamp.gluegen</groupId> + <artifactId>gluegen-rt-main</artifactId> + <version>${jogamp.version}</version> + </dependency> + <dependency> + <groupId>org.jogamp.jogl</groupId> + <artifactId>jogl-all-main</artifactId> + <version>${jogamp.version}</version> + </dependency> + <dependency> + <groupId>org.jogamp.joal</groupId> + <artifactId>joal-main</artifactId> + <version>${jogamp.version}</version> + </dependency> + <dependency> + <groupId>org.jogamp.jocl</groupId> + <artifactId>jocl-main</artifactId> + <version>${jogamp.version}</version> + </dependency> + <dependency> + <groupId>org.lwjgl.lwjgl</groupId> + <artifactId>lwjgl</artifactId> + <version>${lwjgl.version}</version> + </dependency> + <dependency> + <groupId>org.lwjgl.lwjgl</groupId> + <artifactId>lwjgl_util</artifactId> + <version>${lwjgl.version}</version> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> + <version>2.0.4</version> </dependency> - <dependency> - <groupId>org.jogamp.gluegen</groupId> - <artifactId>gluegen-rt-main</artifactId> - <version>${jogl.version}</version> - </dependency> - <dependency> - <groupId>org.jogamp.jogl</groupId> - <artifactId>jogl-all-main</artifactId> - <version>${jogl.version}</version> - </dependency> <dependency> - <groupId>org.lwjgl.lwjgl</groupId> - <artifactId>lwjgl</artifactId> - <version>${lwjgl.version}</version> - </dependency> - <dependency> - <groupId>org.lwjgl.lwjgl</groupId> - <artifactId>lwjgl_util</artifactId> - <version>${lwjgl.version}</version> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom2</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.4</version> - </dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.4</version> + </dependency> <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>swt</artifactId> <version>${swt.version}</version> <classifier>${swt.classifier}</classifier> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>1.0.0</version> - </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>1.0.0</version> + </dependency> </dependencies> </dependencyManagement> <profiles> - <!-- This profile activated by specifying -Phudson on command line --> + <!-- This profile activated by specifying -Phudson on command line --> <profile> <id>hudson</id> <build> @@ -211,14 +283,14 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9</version> <executions> <execution> <phase>package</phase> <goals> <goal>jar</goal> - <goal>aggregate</goal> + <goal>aggregate</goal> </goals> <configuration> <bottom><![CDATA[<i>Copyright © {inceptionYear}-{currentYear} Ardor Labs. All Rights Reserved.</i>]]> @@ -236,8 +308,8 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.2</version> <executions> <execution> <phase>package</phase> @@ -247,94 +319,63 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/classes/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- http://mojo.codehaus.org/findbugs-maven-plugin/usage.html --> - - <!-- It would be great to execute the check goal as part of the hudson build, but it is --> - <!-- only available via a snapshot version, so I don't want to use that. / Petter 090211 --> - <!-- plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <executions> - <execution> - <id>findbugs-check</id> - <phase>package</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - - <configuration> - <threshold>Normal</threshold> - </configuration> - </plugin --> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <manifestLocation>target/classes/META-INF</manifestLocation> + <instructions> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- http://mojo.codehaus.org/findbugs-maven-plugin/usage.html --> + <!-- It would be great to execute the check goal as part of the hudson build, but it is --> + <!-- only available via a snapshot version, so I don't want to use that. / Petter 090211 --> + <!-- plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <executions> + <execution> + <id>findbugs-check</id> + <phase>package</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <threshold>Normal</threshold> + </configuration> + </plugin --> </plugins> </build> </profile> </profiles> - - <!-- this section specifies dependencies that are inherited by all sub-modules --> + <!-- this section specifies dependencies that are inherited by all sub-modules --> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + </dependency> </dependencies> - <distributionManagement> - <repository> - <id>Ardor3D-releases</id> - <name>Ardor3D releases</name> - <url>http://ardor3d.com:8081/nexus/content/repositories/releases</url> - </repository> - <snapshotRepository> - <id>Ardor3D-snapshots</id> - <name>Ardor3D snapshots</name> - <url>http://ardor3d.com:8081/nexus/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <threshold>Normal</threshold> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9</version> - </plugin> - </plugins> - </reporting> </project> |