diff options
| author | Renanse <[email protected]> | 2013-03-14 22:05:44 -0500 |
|---|---|---|
| committer | Renanse <[email protected]> | 2013-03-14 22:05:44 -0500 |
| commit | e4b91fa96b41364e78aa6516c0b0cb2487f4a7cf (patch) | |
| tree | c0f8c08db3352b50343915a0e23e29399c50d539 /ardor3d-collada | |
| parent | 19bd8d8e1e5de5d31fab60bf2a3dedc9778782d0 (diff) | |
fix regression in pom
Diffstat (limited to 'ardor3d-collada')
| -rw-r--r-- | ardor3d-collada/pom.xml | 94 | ||||
| -rw-r--r-- | ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java | 4 |
2 files changed, 48 insertions, 50 deletions
diff --git a/ardor3d-collada/pom.xml b/ardor3d-collada/pom.xml index e70deea..e6ca675 100644 --- a/ardor3d-collada/pom.xml +++ b/ardor3d-collada/pom.xml @@ -1,49 +1,47 @@ -<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>
+<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>
- <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>
- </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>jdom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>saxpath</artifactId>
- </dependency>
- </dependencies>
- </project>
+ <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>
+</project>
diff --git a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java index 880a0cd..9e7b4a6 100644 --- a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java +++ b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map;
import java.util.regex.Pattern;
-import org.jdom.Element;
-import org.jdom.xpath.XPath;
+import org.jdom2.Element;
+import org.jdom2.xpath.XPath;
import com.ardor3d.extension.animation.skeletal.AttachmentPoint;
import com.ardor3d.extension.animation.skeletal.Joint;
|