From d5c1d63a3097d3db2f41ae247b8ca94627fcfad3 Mon Sep 17 00:00:00 2001 From: JeremyMcCormick <jermccormick@gmail.com> Date: Mon, 26 Jun 2017 18:34:58 -0700 Subject: [PATCH] move parent pom config into top-level pom --- aida/pom.xml | 2 +- analysis/pom.xml | 2 +- cal-calib/pom.xml | 2 +- cal-recon/pom.xml | 2 +- conditions/pom.xml | 2 +- detector-data/pom.xml | 2 +- detector-framework/pom.xml | 2 +- distribution/pom.xml | 2 +- event-heprep/pom.xml | 2 +- event-model/pom.xml | 2 +- event-processing/pom.xml | 2 +- integration-tests/pom.xml | 2 +- job-manager/pom.xml | 2 +- math/pom.xml | 2 +- mc/pom.xml | 2 +- parent/pom.xml | 522 ------------------------------------- parent/src/site/site.xml | 24 -- plugin/pom.xml | 8 +- recon-drivers/pom.xml | 2 +- steering-files/pom.xml | 2 +- tracking/pom.xml | 2 +- trf/pom.xml | 2 +- users/pom.xml | 2 +- util/pom.xml | 2 +- vertexing/pom.xml | 2 +- 25 files changed, 23 insertions(+), 575 deletions(-) delete mode 100644 parent/pom.xml delete mode 100644 parent/src/site/site.xml diff --git a/aida/pom.xml b/aida/pom.xml index 15cbb73..bf5b303 100644 --- a/aida/pom.xml +++ b/aida/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/analysis/pom.xml b/analysis/pom.xml index 126a83e..ceaa8d2 100644 --- a/analysis/pom.xml +++ b/analysis/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>4.0-SNAPSHOT</version> </parent> diff --git a/cal-calib/pom.xml b/cal-calib/pom.xml index 07b8042..be9435e 100644 --- a/cal-calib/pom.xml +++ b/cal-calib/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>4.0-SNAPSHOT</version> </parent> diff --git a/cal-recon/pom.xml b/cal-recon/pom.xml index 9310f51..3ca6af1 100644 --- a/cal-recon/pom.xml +++ b/cal-recon/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>4.0-SNAPSHOT</version> </parent> diff --git a/conditions/pom.xml b/conditions/pom.xml index 3ac6026..c4de062 100644 --- a/conditions/pom.xml +++ b/conditions/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/detector-data/pom.xml b/detector-data/pom.xml index 48a2fb6..3bf562f 100644 --- a/detector-data/pom.xml +++ b/detector-data/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>4.0-SNAPSHOT</version> </parent> diff --git a/detector-framework/pom.xml b/detector-framework/pom.xml index a1d5614..396e5ae 100644 --- a/detector-framework/pom.xml +++ b/detector-framework/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <build> diff --git a/distribution/pom.xml b/distribution/pom.xml index dac24de..64169ac 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <build> diff --git a/event-heprep/pom.xml b/event-heprep/pom.xml index f845140..868ade4 100644 --- a/event-heprep/pom.xml +++ b/event-heprep/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/event-model/pom.xml b/event-model/pom.xml index ef60905..61d00e1 100644 --- a/event-model/pom.xml +++ b/event-model/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/event-processing/pom.xml b/event-processing/pom.xml index 68fd21e..70a2104 100644 --- a/event-processing/pom.xml +++ b/event-processing/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index b179c98..606205d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>3.0.4-SNAPSHOT</version> </parent> diff --git a/job-manager/pom.xml b/job-manager/pom.xml index 7dc2d32..10f1c9d 100644 --- a/job-manager/pom.xml +++ b/job-manager/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/math/pom.xml b/math/pom.xml index 2dd95eb..0147018 100644 --- a/math/pom.xml +++ b/math/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/mc/pom.xml b/mc/pom.xml index 370a3b5..d618fff 100644 --- a/mc/pom.xml +++ b/mc/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index f1ce592..0000000 --- a/parent/pom.xml +++ /dev/null @@ -1,522 +0,0 @@ -<?xml version="1.0"?> -<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"> - - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <modelVersion>4.0.0</modelVersion> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-parent</artifactId> - <packaging>pom</packaging> - <name>parent</name> - <description>parent POM file for lcsim modules</description> - <version>4.0-SNAPSHOT</version> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <org.lcsim.cacheDir>${user.home}</org.lcsim.cacheDir> - </properties> - - <repositories> - <repository> - <id>freehep-repo-public</id> - <name>FreeHEP Maven Public</name> - <url>http://srs.slac.stanford.edu/nexus/content/groups/freehep-maven2-public/</url> - </repository> - <repository> - <id>lcsim-repo-public</id> - <name>LCSIM Public Maven Repository</name> - <url>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</url> - </repository> - <repository> - <id>maven-central-repo</id> - <name>Maven repository</name> - <url>http://repo1.maven.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>freehep-maven-plugin-repo</id> - <name>Freehep Plugin Repository</name> - <url>http://srs.slac.stanford.edu/nexus/content/groups/freehep-maven2-public/</url> - </pluginRepository> - </pluginRepositories> - <distributionManagement> - <repository> - <id>lcsim-repo-releases</id> - <name>LCSIM Releases maven repository</name> - <url>http://srs.slac.stanford.edu/nexus/content/repositories/lcsim-maven2-releases/</url> - </repository> - <snapshotRepository> - <id>lcsim-repo-snapshots</id> - <name>LCSIM Snapshots maven repository</name> - <url>http://srs.slac.stanford.edu/nexus/content/repositories/lcsim-maven2-snapshot/</url> - </snapshotRepository> - <site> - <id>lcsim-site</id> - <url>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/lcsim/</url> - </site> - </distributionManagement> - - <dependencyManagement> - <dependencies> - <!-- Do not edit org.lcsim dependencies manually. - They are updated automatically when releases are performed. --> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-vertexing</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-event-heprep</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-recon-drivers</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-event-processing</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-trf</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-event-model</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-aida</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-util</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-tracking</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-cal-recon</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-cal-calib</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-detector-framework</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-detector-data</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-conditions</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-analysis</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-math</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-job-manager</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-plugin</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-users</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-distribution</artifactId> - <version>4.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-steering-files</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-mc</artifactId> - <version>4.0-SNAPSHOT</version> - </dependency> - <!-- End org.lcsim dependencies. --> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-record</artifactId> - <version>3.0.8</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-physics</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.3</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - - <build> - <defaultGoal>install</defaultGoal> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.3</version> - </extension> - </extensions> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-plugin</artifactId> - <version>1.9</version> - <configuration> - <connectionType>connection</connectionType> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <encoding>UTF-8</encoding> - <showWarnings>true</showWarnings> - <showDeprecation>true</showDeprecation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.18.1</version> - <configuration> - <argLine>-Xmx1024m</argLine> - <forkCount>4</forkCount> - <reuseForks>true</reuseForks> - <!-- This allows the cacheDir to be overridden by - settings.xml, e.g. for Hudson builds. --> - <systemProperties> - <property> - <name>org.lcsim.cacheDir</name> - <value>${org.lcsim.cacheDir}</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.4.2</version> - <configuration> - <releaseProfiles>skipTests</releaseProfiles> - <tagBase>svn://svn.freehep.org/lcdet/projects/lcsim/tags</tagBase> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <skip>true</skip> - <skipDeploy>true</skipDeploy> - <generateReports>false</generateReports> - </configuration> - <executions> - <execution> - <id>attach-descriptor</id> - <goals> - <goal>attach-descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- This fixes the lifecycle not covered by plugin execution error in Eclipse. --> - <!-- - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <versionRange>[1.7,)</versionRange> - <goals> - <goal>run</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - </execute> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - --> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> - <inherited>true</inherited> - <configuration> - <chmod>false</chmod> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - <reportSets> - <reportSet> - <id>non-aggregate</id> - <reports> - <report>dependencies</report> - <report>index</report> - <report>scm</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> - <configuration> - <source>1.7</source> - <show>private</show> - <detectJavaApiLink>true</detectJavaApiLink> - <links> - <link>http://aida.freehep.org/doc/v3.3.0/api/index.htm</link> - <link>http://java.freehep.org/freehep-physics/apidocs/</link> - <link>http://java.freehep.org/freehep-application/apidocs/index.html</link> - <link>http://java.freehep.org/freehep-sio/apidocs/index.html</link> - <link>http://java.freehep.org/freehep-stdhep/</link> - <link>http://java.freehep.org/heprep/apidocs/</link> - <link>http://www.jdom.org/docs/apidocs/</link> - <link>http://www.gnu.org/software/jel/api/</link> - <link>http://commons.apache.org/proper/commons-cli/apidocs/index.html</link> - <link>http://commons.apache.org/proper/commons-math/javadocs/api-2.2/index.html</link> - </links> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.16</version> - </plugin> - </plugins> - </reporting> - - <profiles> - <profile> - <id>skipTests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <developers> - <developer> - <name>Jeremy McCormick</name> - <email>jeremym@slac.stanford.edu</email> - <organization>SLAC</organization> - <organizationUrl>http://www.slac.stanford.edu/</organizationUrl> - <roles> - <role>developer</role> - <role>release manager</role> - </roles> - <timezone>-8</timezone> - <properties> - <aim>jeremyslac</aim> - <gtalk>jermccormick@gmail.com</gtalk> - </properties> - </developer> - <developer> - <name>Tony Johnson</name> - <email>tony_johnson@slac.stanford.edu</email> - <organization>SLAC</organization> - <organizationUrl>http://www.slac.stanford.edu/</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>-8</timezone> - </developer> - <developer> - <name>Norman Graf</name> - <email>ngraf@slac.stanford.edu</email> - <organization>SLAC</organization> - <organizationUrl>http://www.slac.stanford.edu/</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>-8</timezone> - </developer> - <developer> - <name>Rich Partridge</name> - <email>richp@slac.stanford.edu</email> - <organization>SLAC</organization> - <organizationUrl>http://www.slac.stanford.edu</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>-8</timezone> - </developer> - <developer> - <name>Tim Nelson</name> - <email>tknelson@slac.stanford.edu</email> - <organization>SLAC</organization> - <organizationUrl>http://www.slac.stanford.edu</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>-8</timezone> - </developer> - <developer> - <name>Pelle Hansson</name> - <email>phansson@slac.stanford.edu</email> - <organization>SLAC</organization> - <organizationUrl>http://www.slac.stanford.edu</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>-8</timezone> - </developer> - <developer> - <name>Jan Strube</name> - <email>jan.strube@cern.ch</email> - <organization>CERN</organization> - <organizationUrl>http://cern.ch</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>1</timezone> - </developer> - <developer> - <name>Christian Grefe</name> - <email>christian.grefe@cern.ch</email> - <organization>CERN</organization> - <organizationUrl>http://cern.ch</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>1</timezone> - </developer> - </developers> - - <organization> - <name>Linear Collider Detector (LCD)</name> - <url>http://www.lcsim.org/</url> - </organization> - - <ciManagement> - <system>Jenkins</system> - <url>http://srs.slac.stanford.edu/hudson/view/lcsim/</url> - </ciManagement> - - <issueManagement> - <system>JIRA</system> - <url>https://jira.slac.stanford.edu/browse/LCSIM</url> - </issueManagement> - - <mailingLists> - <mailingList> - <name>lcd-dev</name> - <subscribe>Email listserv@slac.stanford.edu with message: subscribe lcd-dev</subscribe> - <unsubscribe>Email listserv@slac.stanford.edu with message: unsubscribe lcd-dev</unsubscribe> - <post>lcd-dev@slac.stanford.edu</post> - <archive>https://listserv.slac.stanford.edu/cgi-bin/wa?A0=LCD-DEV</archive> - </mailingList> - </mailingLists> - -</project> diff --git a/parent/src/site/site.xml b/parent/src/site/site.xml deleted file mode 100644 index d4dd7fb..0000000 --- a/parent/src/site/site.xml +++ /dev/null @@ -1,24 +0,0 @@ -<project> - - <body> - - <menu name="Navigation" inherit="top"> - <item name="LCSim Home" href="index.html"/> - </menu> - -<!-- - <menu name="Module" inherit="top"> - <item name="Summary" href="./project-summary.html"/> - <item name="Source Repository" href="./source-repository.html"/> - <item name="Source Xref" href="./xref/index.html"/> - <item name="JavaDocs" href="./apidocs/index.html"/> - <item name="Dependencies" href="./dependencies.html"/> - <item name="Surefire Tests Report" href="./surefire-report.html"/> - </menu> ---> - - <menu name="Module" ref="reports" inherit="top" /> - - </body> - -</project> diff --git a/plugin/pom.xml b/plugin/pom.xml index 8306866..7c2b8fe 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -10,15 +10,9 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> - <scm> - <url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk/plugin/</url> - <connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/plugin/</connection> - <developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/plugin/</developerConnection> - </scm> - <dependencies> <dependency> <groupId>org.lcsim</groupId> diff --git a/recon-drivers/pom.xml b/recon-drivers/pom.xml index fe272d4..5ed777d 100644 --- a/recon-drivers/pom.xml +++ b/recon-drivers/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/steering-files/pom.xml b/steering-files/pom.xml index 06758ee..211d8d2 100644 --- a/steering-files/pom.xml +++ b/steering-files/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>4.0-SNAPSHOT</version> </parent> diff --git a/tracking/pom.xml b/tracking/pom.xml index 90a5206..567d266 100644 --- a/tracking/pom.xml +++ b/tracking/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/trf/pom.xml b/trf/pom.xml index da7b817..f8dc203 100644 --- a/trf/pom.xml +++ b/trf/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>4.0-SNAPSHOT</version> </parent> diff --git a/users/pom.xml b/users/pom.xml index db7c8f1..9ec3da7 100644 --- a/users/pom.xml +++ b/users/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> <version>4.0-SNAPSHOT</version> </parent> diff --git a/util/pom.xml b/util/pom.xml index 606351a..7969035 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -11,7 +11,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/vertexing/pom.xml b/vertexing/pom.xml index 17438d3..2fa751d 100644 --- a/vertexing/pom.xml +++ b/vertexing/pom.xml @@ -10,7 +10,7 @@ <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>4.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <dependencies> -- GitLab