Commit in java/trunk on MAIN
detector-data/pom.xml+10246 -> 247
distribution/pom.xml+8246 -> 247
parent/pom.xml+15-2246 -> 247
pom.xml+103246 -> 247
site/pom.xml-135246 removed
+136-137
1 removed + 4 modified, total 5 files
New configuration of HPS Java website to integrate into reactor build.  Still a work in progress.

java/trunk/detector-data
pom.xml 246 -> 247
--- java/trunk/detector-data/pom.xml	2014-02-20 18:11:24 UTC (rev 246)
+++ java/trunk/detector-data/pom.xml	2014-02-20 21:04:10 UTC (rev 247)
@@ -30,6 +30,16 @@
                 </excludes>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
     
 </project>

java/trunk/distribution
pom.xml 246 -> 247
--- java/trunk/distribution/pom.xml	2014-02-20 18:11:24 UTC (rev 246)
+++ java/trunk/distribution/pom.xml	2014-02-20 21:04:10 UTC (rev 247)
@@ -61,6 +61,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

java/trunk/parent
pom.xml 246 -> 247
--- java/trunk/parent/pom.xml	2014-02-20 18:11:24 UTC (rev 246)
+++ java/trunk/parent/pom.xml	2014-02-20 21:04:10 UTC (rev 247)
@@ -186,6 +186,18 @@
                 <version>2.3</version>
             </extension>
         </extensions>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.3</version>
+                    <configuration>
+                        <chmod>false</chmod>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -233,9 +245,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
+                <inherited>false</inherited>
                 <configuration>
-                    <chmod>false</chmod>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
                 </configuration>
             </plugin>
             <plugin>

java/trunk
pom.xml 246 -> 247
--- java/trunk/pom.xml	2014-02-20 18:11:24 UTC (rev 246)
+++ java/trunk/pom.xml	2014-02-20 21:04:10 UTC (rev 247)
@@ -6,6 +6,7 @@
     <packaging>pom</packaging>
     <name>modules</name>
     <description>HPS module build</description>
+    <url>http://www.lcsim.org/sites/hps/</url>
 
     <parent>
         <groupId>org.hps</groupId>
@@ -35,4 +36,106 @@
         <module>plugin</module>
     </modules>
 
+    <distributionManagement>
+        <site>
+            <id>lcsim-site</id>
+            <url>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/hps/</url>
+        </site>
+    </distributionManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <configuration>
+                        <siteDirectory>${basedir}/site/src/site/</siteDirectory>
+                        <outputDirectory>${basedir}/site/target/</outputDirectory>
+                        <chmod>false</chmod>
+                        <generateReports>true</generateReports>
+                        <generateSitemap>true</generateSitemap>
+                        <generateProjectInfo>true</generateProjectInfo>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.7</version>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>cim</report>
+                            <report>dependency-convergence</report>
+                            <report>index</report>
+                            <report>issue-tracking</report>
+                            <report>mailing-list</report>
+                            <report>modules</report>
+                            <report>plugin-management</report>
+                            <report>plugins</report>
+                            <report>project-team</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.16</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-changes-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix
+                        Version,Created</columnNames>
+                    <sortColumnNames>Type,Key DESC</sortColumnNames>
+                    <statusIds>Resolved, Closed</statusIds>
+                    <maxEntries>9999</maxEntries>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>jira-report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>aggregate</report>
+                            <report>test-aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <linkJavadoc>true</linkJavadoc>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
 </project>

java/trunk/site
pom.xml removed after 246
--- java/trunk/site/pom.xml	2014-02-20 18:11:24 UTC (rev 246)
+++ java/trunk/site/pom.xml	2014-02-20 21:04:10 UTC (rev 247)
@@ -1,135 +0,0 @@
-<project>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.hps</groupId>
-    <artifactId>hps-site</artifactId>
-    <packaging>pom</packaging>
-    <name>HPS Java</name>
-    <description>HPS Java Software Project</description>
-    <url>http://www.lcsim.org/sites/hps/</url>
-
-    <parent>
-        <groupId>org.hps</groupId>
-        <artifactId>hps-parent</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <scm>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/site/</url>
-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/site/</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/site/</developerConnection>
-    </scm>
-
-    <distributionManagement>
-        <site>
-            <id>lcsim-site</id>
-            <url>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/hps/</url>
-        </site>
-    </distributionManagement>
-
-    <modules>
-        <module>../hps-java</module>
-        <module>../users</module>
-        <module>../monitoring-app</module>
-        <module>../conditions</module>
-        <module>../jevio</module>
-        <module>../et</module>
-        <module>../util</module>
-        <module>../monitoring-drivers</module>
-    </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                        <chmod>false</chmod>
-                        <generateReports>true</generateReports>
-                        <generateSitemap>true</generateSitemap>
-                        <generateProjectInfo>true</generateProjectInfo>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.7</version>
-                <reportSets>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <reports>
-                            <report>cim</report>
-                            <report>dependency-convergence</report>
-                            <report>index</report>
-                            <report>issue-tracking</report>
-                            <report>mailing-list</report>
-                            <report>modules</report>
-                            <report>plugin-management</report>
-                            <report>plugins</report>
-                            <report>project-team</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.16</version>
-                <configuration>
-                    <aggregate>true</aggregate>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-changes-plugin</artifactId>
-                <version>2.9</version>
-                <configuration>
-                    <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix
-                        Version,Created</columnNames>
-                    <sortColumnNames>Type,Key DESC</sortColumnNames>
-                    <statusIds>Resolved, Closed</statusIds>
-                    <maxEntries>9999</maxEntries>
-                </configuration>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>jira-report</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
-                <reportSets>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <reports>
-                            <report>aggregate</report>
-                            <report>test-aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <aggregate>true</aggregate>
-                    <linkJavadoc>true</linkJavadoc>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-</project>
SVNspam 0.1