All of our depends now come from Maven.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1078 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-19 00:11:43 +00:00
parent 2ae0c8f7b1
commit f7ae2407f2
8 changed files with 73 additions and 53 deletions
@@ -45,6 +45,14 @@
      <id>lwjgl-repo</id>
      <url>http://lwjgl-maven.googlecode.com/svn/trunk/repository</url>
    </repository>
+    <repository>
+      <id>javazoom-repo</id>
+      <url>http://ppnetmedia.com/repository</url>
+    </repository>
+    <repository>
+      <id>jcraft-repo</id>
+      <url>file://lib</url>
+    </repository>
    <repository>
      <id>ooo-repo</id>
      <url>http://build.earth.threerings.net/maven-repository</url>
@@ -91,6 +99,27 @@
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
+    <dependency>
+      <groupId>net.javazoom</groupId>
+      <artifactId>jlayer</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jorbis</artifactId>
+      <version>0.0.15</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jogg</artifactId>
+      <version>0.0.7</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
    <dependency>
      <groupId>javassist</groupId>
      <artifactId>javassist</artifactId>
@@ -140,18 +169,12 @@
          <!-- yes, those quoted spaces are a workaround sanctioned by the Maven idiocracy -->
          <compilerArgument>-Xlint" "-Xlint:-serial" "-Xlint:-path</compilerArgument>
          <excludes>
-            <!-- TODO: need LWJGL in Maven -->
-            <exclude>com/threerings/openal/**</exclude>
            <!-- TODO: should these just be deleted? -->
            <exclude>**/OggPlayer.java</exclude>
            <exclude>**/ModPlayer.java</exclude>
            <exclude>**/MidiPlayer.java</exclude>
            <exclude>**/Mp3Player.java</exclude>
          </excludes>
-          <testExcludes>
-            <!-- TODO: need LWJGL in Maven -->
-            <exclude>com/threerings/openal/**</exclude>
-          </testExcludes>
        </configuration>
      </plugin>
      <plugin>