Print

Print


Commit in lcsim on MAIN
pom.xml+17-411.222 -> 1.223
more updates to lcsim pom

lcsim
pom.xml 1.222 -> 1.223
diff -u -r1.222 -r1.223
--- pom.xml	15 Apr 2013 22:42:33 -0000	1.222
+++ pom.xml	16 Apr 2013 17:25:16 -0000	1.223
@@ -5,13 +5,11 @@
     <name>org.lcsim</name>
     <version>2.8-SNAPSHOT</version>
     <description>A Java reconstruction and analysis framework for LCD studies.</description>
-    <!--
-  <scm>
-    <connection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:lcsim</connection>
-    <developerConnection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:lcsim</developerConnection>
-    <url>http://source.freehep.org/jcvsweb/ilc/LCSIM/list/lcsim</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>
@@ -31,11 +29,6 @@
             <url>http://lcsim.org/maven2</url>
         </pluginRepository>
     </pluginRepositories>
-    <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>2.8-SNAPSHOT</version>
-    </parent>
     <distributionManagement>
         <snapshotRepository>
             <id>lcsim-maven</id>
@@ -94,6 +87,13 @@
         <filters>
             <filter>${lcsim.filterfile}</filter>
         </filters>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>testResources</directory>
+            </testResource>
+        </testResources>       
         <resources>
             <resource>
                 <directory>resources</directory>
@@ -121,7 +121,7 @@
                     <exclude>**/*.bat</exclude>
                 </excludes>
             </resource>
-        </resources>
+        </resources>                
         <plugins>
             <plugin>
                 <groupId>org.freehep</groupId>
@@ -149,9 +149,9 @@
                         <include>org.lcsim:trf</include>
                         <include>xerces:xercesImpl</include>
                         <include>commons-math:commons-math</include>
-<!--                        <include>org.freehep:freehep-jaida</include>-->
-<!--                        <include>org.freehep:freehep-jaida-root</include> -->
-                        <include>org.freehep:freehep-rootio-output</include>
+<!--                    <include>org.freehep:freehep-jaida</include> 
+                        <include>org.freehep:freehep-jaida-root</include> 
+                        <include>org.freehep:freehep-rootio-output</include> -->
                     </includes>
                 </configuration>
             </plugin>
@@ -189,31 +189,7 @@
                         <exclude>org/lcsim/TestFastMCGenerator.java</exclude>
                     </excludes>
                 </configuration>
-            </plugin>
-            <!--
-            Old assembly target 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.job.JobControlManager</mainClass>
-                                </manifest>
-                            </archive>                            
-                        </configuration>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
--->
+            </plugin>         
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1