diff -u -r1.123 -r1.124
--- pom.xml	15 Apr 2013 21:20:35 -0000	1.123
+++ pom.xml	16 Apr 2013 17:25:51 -0000	1.124
@@ -4,27 +4,29 @@

     <name>GeomConverter</name>
     <version>2.6-SNAPSHOT</version>
     <description>LCSim Geometry and Detector Description Project</description>

-<!--
-    <scm>
-        <connection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:GeomConverter</connection>
-        <developerConnection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:GeomConverter</developerConnection>
-        <url>http://source.freehep.org/jcvsweb/ilc/GeomConverter/list/GeomConverter</url>
-    </scm>    
--->
-

+    <parent>
+        <groupId>org.lcsim</groupId>
+        <artifactId>lcsim-parent</artifactId>
+        <version>2.8-SNAPSHOT</version>
+    </parent>

     <scm>
       <connection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:${project.artifactId}</connection>
       <developerConnection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:${project.artifactId}</developerConnection>
       <url>lcsimCvsRepo</url>
     </scm>
     <build>

-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-                <version>2.2</version>
-            </extension>
-        </extensions>

+        <sourceDirectory>src</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>resources</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>test</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>testResources</directory>
+            </testResource>
+        </testResources>

         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

@@ -38,30 +40,6 @@

                     </excludes>
                 </configuration>
             </plugin>

-<!--
-            Assembly plugin config kept here for reference.
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
-                            </descriptors>
-                            <archive>
-                                <manifest>
-                                    <mainClass>org.lcsim.geometry.compact.converter.Main</mainClass>
-                                </manifest>
-                            </archive>                            
-                        </configuration>
-                         <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
--->

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

@@ -121,11 +99,6 @@

             <url>http://lcsim.org/maven2</url>
         </repository>
     </repositories>

-    <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>2.8-SNAPSHOT</version>
-    </parent>

     <dependencies>
         <dependency>
             <groupId>org.jdom</groupId>

@@ -133,19 +106,25 @@

             <version>1.1</version>
         </dependency>
         <dependency>

+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.7.1</version>
+        </dependency>
+        <dependency>

             <groupId>org.gnu</groupId>
             <artifactId>jel</artifactId>
             <version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.freehep</groupId>

-            <artifactId>freehep-physics</artifactId>
-            <version>2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.freehep</groupId>

             <artifactId>freehep-jheprep</artifactId>
             <version>2.0.5</version>

+            <exclusions>
+                <exclusion>                
+                    <groupId>hep.aida</groupId>
+                    <artifactId>aida</artifactId>
+                </exclusion>
+            </exclusions>                    

         </dependency>
         <dependency>
             <groupId>org.lcsim</groupId>

@@ -162,9 +141,6 @@

         <site>
             <id>GeomConverter</id>
             <name>GeomConverter</name>

-<!--
-            <url>${org.lcsim.site}/geomconverter/${project.version}</url>
--->

             <url>file:///nfs/slac/g/lcd/mc/prj/www/lcsim/software/${project.artifactId}/${project.version}</url>
         </site>
         <snapshotRepository>