 |
 |
| Commit in projects/lcsim/trunk on MAIN | |||
| detector-data/pom.xml | +9 | 2997 -> 2998 | |
| distribution/pom.xml | +7 | 2997 -> 2998 | |
| parent/pom.xml | -2 | 2997 -> 2998 | |
| pom.xml | +109 | -5 | 2997 -> 2998 |
| site/pom.xml | -150 | 2997 removed | |
| /rebuild.sh | -7 | 2997 removed | |
| +125 | -164 | ||
Move site configuration to reactor pom and remove site/pom.xml, and also skip site plugin execution for modules that should not be included.
--- projects/lcsim/trunk/detector-data/pom.xml 2014-02-14 18:41:56 UTC (rev 2997) +++ projects/lcsim/trunk/detector-data/pom.xml 2014-02-14 20:56:09 UTC (rev 2998) @@ -30,6 +30,15 @@
</excludes>
</resource>
</resources>
+ <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins>
</build>
</project>
--- projects/lcsim/trunk/distribution/pom.xml 2014-02-14 18:41:56 UTC (rev 2997) +++ projects/lcsim/trunk/distribution/pom.xml 2014-02-14 20:56:09 UTC (rev 2998) @@ -43,6 +43,13 @@
</execution>
</executions>
</plugin>
+ <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin>
</plugins>
</build>
--- projects/lcsim/trunk/parent/pom.xml 2014-02-14 18:41:56 UTC (rev 2997) +++ projects/lcsim/trunk/parent/pom.xml 2014-02-14 20:56:09 UTC (rev 2998) @@ -292,9 +292,7 @@
<artifactId>maven-site-plugin</artifactId>
<inherited>false</inherited>
<configuration>
- <generateReports>false</generateReports>
<skip>true</skip>
- <skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
--- projects/lcsim/trunk/pom.xml 2014-02-14 18:41:56 UTC (rev 2997) +++ projects/lcsim/trunk/pom.xml 2014-02-14 20:56:09 UTC (rev 2998) @@ -1,4 +1,5 @@
-<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">
+<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>
<groupId>org.lcsim</groupId>
@@ -6,20 +7,21 @@
<packaging>pom</packaging>
<name>lcsim</name>
<description>org.lcsim Java framework</description>
-
+ <url>http://www.lcsim.org/sites/lcsim/</url> +
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
<relativePath>./parent/pom.xml</relativePath>
<version>3.0.4-SNAPSHOT</version>
</parent>
-
+
<scm>
<url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk/</url>
<connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/</developerConnection>
</scm>
-
+
<modules>
<module>parent</module>
<module>util</module>
@@ -42,5 +44,107 @@
<module>distribution</module>
<module>plugin</module>
</modules>
-
+
+ <distributionManagement>
+ <site>
+ <id>lcsim-site</id>
+ <url>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/lcsim/</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>
--- projects/lcsim/trunk/site/pom.xml 2014-02-14 18:41:56 UTC (rev 2997) +++ projects/lcsim/trunk/site/pom.xml 2014-02-14 20:56:09 UTC (rev 2998) @@ -1,150 +0,0 @@
-<?xml version="1.0"?> -<project> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-site</artifactId> - <packaging>pom</packaging> - <name>LCSim Project</name> - <description>Physics Event Reconstruction and Analysis in Java</description> - <url>http://www.lcsim.org/sites/lcsim/</url> - - <scm> - <connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/site/</connection> - <developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/site/</developerConnection> - <url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk/site/</url> - </scm> - - <parent> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-parent</artifactId> - <version>3.0.4-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <modules> - <!-- Selection of modules for the website. The modules detector-data, distribution, and parent are not included. --> - <module>../aida</module> - <module>../analysis</module> - <module>../cal-calib</module> - <module>../cal-recon</module> - <module>../conditions</module> - <module>../detector-framework</module> - <module>../event-heprep</module> - <module>../event-model</module> - <module>../event-processing</module> - <module>../job-manager</module> - <module>../math</module> - <module>../plugin</module> - <module>../recon-drivers</module> - <module>../tracking</module> - <module>../trf</module> - <module>../vertexing</module> - <module>../util</module> - </modules> - - <distributionManagement> - <site> - <id>lcsim-site</id> - <url>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/lcsim</url> - </site> - </distributionManagement> - - <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>
--- projects/lcsim/trunk/site/rebuild.sh 2014-02-14 18:41:56 UTC (rev 2997) +++ projects/lcsim/trunk/site/rebuild.sh 2014-02-14 20:56:09 UTC (rev 2998) @@ -1,7 +0,0 @@
-#!/bin/sh -rm -rf /scratch/lcsim_site/ -#mvn site:site site:stage --non-recursive -DstagingDirectory=/scratch/staging/site/ -#mvn site:site site:deploy -#mvn site:site site:stage -Djava.awt.headless=true -DstagingDirectory=/work/scratch/site -#mvn site:site site:stage -Djava.awt.headless=true -DtopSiteURL=. -DstagingDirectory=/scratch/staging/site -mvn site:site site:stage -Djava.awt.headless=true -DstagingDirectory=/scratch/lcsim_site/
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1