You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2012/12/27 12:02:43 UTC

svn commit: r1426159 - in /turbine/fulcrum/trunk/parent: pom.xml xdocs/changes.xml

Author: tv
Date: Thu Dec 27 11:02:43 2012
New Revision: 1426159

URL: http://svn.apache.org/viewvc?rev=1426159&view=rev
Log:
Changed parent POM to the Turbine Parent POM and removed all duplicate definitions

Modified:
    turbine/fulcrum/trunk/parent/pom.xml
    turbine/fulcrum/trunk/parent/xdocs/changes.xml

Modified: turbine/fulcrum/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/pom.xml?rev=1426159&r1=1426158&r2=1426159&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parent/pom.xml (original)
+++ turbine/fulcrum/trunk/parent/pom.xml Thu Dec 27 11:02:43 2012
@@ -20,10 +20,9 @@
 <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>
   <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <!-- Version 10 is broken; see https://issues.apache.org/jira/browse/MPOM-32 -->
-    <version>9</version>
+    <groupId>org.apache.turbine</groupId>
+    <artifactId>turbine-parent</artifactId>
+    <version>2</version>
   </parent>
   <groupId>org.apache.fulcrum</groupId>
   <artifactId>fulcrum-parent</artifactId>
@@ -35,25 +34,6 @@
   <url>http://turbine.apache.org/fulcrum</url>
   <inceptionYear>2001</inceptionYear>
 
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/TRB</url>
-  </issueManagement>
-
-  <distributionManagement>
-    <!--
-      This POM's parent POM (the Apache root POM) provides repositories. Unfortunately,
-      this allows for accidental deployments. So we disable them here by providing
-      a dummy repository. Use "mvn -Prc deploy" (Apache snapshot repository) or
-      "mvn -Prelease deploy" (Apache release repository), if you really want to deploy.
-    -->
-    <repository>
-      <id>dummy</id>
-      <name>Dummy to avoid accidental deploys</name>
-      <url/>
-    </repository>
-  </distributionManagement>
-
   <!--
     This section *must* be overwritten by subprojects. It is only to allow
     a release of the fulcrum-parent POM.
@@ -64,592 +44,41 @@
     <url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/parent</url>
   </scm>
 
-  <mailingLists>
-    <mailingList>
-      <name>Turbine Dev List</name>
-      <subscribe>dev-subscribe@turbine.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@turbine.apache.org</unsubscribe>
-      <post>dev@turbine.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/turbine-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Turbine User List</name>
-      <subscribe>user-subscribe@turbine.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@turbine.apache.org</unsubscribe>
-      <post>user@turbine.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/turbine-user/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <pluginManagement>
-      <plugins>
-        <!-- org.apache.maven.plugins, alpha order by artifact id -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.6</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-            <source>${maven.compile.source}</source>
-            <target>${maven.compile.target}</target>
-            <encoding>${fulcrum.encoding}</encoding>
-            <fork>${fulcrum.compiler.fork}</fork>
-            <compilerVersion>${fulcrum.compiler.compilerVersion}</compilerVersion>
-            <executable>${fulcrum.compiler.javac}</executable>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>        
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.3.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${fulcrum.javadoc.version}</version>
-          <configuration>
-            <!-- keep only errors and warnings -->
-            <quiet>true</quiet>
-            <encoding>${fulcrum.encoding}</encoding>
-            <docEncoding>${fulcrum.docEncoding}</docEncoding>
-            <links>
-              <link>${fulcrum.javadoc.java.link}</link>
-              <link>${fulcrum.javadoc.javaee.link}</link>
-            </links>
-            <archive>
-              <manifest>
-                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              </manifest>
-            </archive>
-        </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.2.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.5</version>
-          <configuration>
-            <encoding>${fulcrum.resourceEncoding}</encoding>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.2</version>
-          <configuration>
-            <archive>
-              <manifest>
-                  <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                  <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              </manifest>
-            </archive>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${fulcrum.surefire.version}</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <!-- org.apache.maven.plugins, alpha order by artifact id -->
-      <plugin>
-        <!--
-          - Copy LICENSE.txt and NOTICE.txt so that they are included
-          - in the -javadoc jar file for the component.
-          -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>javadoc.resources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy todir="${project.build.directory}/apidocs/META-INF">
-                  <fileset dir="${basedir}">
-                    <include name="LICENSE.txt"/>
-                    <include name="NOTICE.txt"/>
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <!-- generate the Eclipse project files -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <downloadSources>true</downloadSources>
-          <downloadJavadocs>false</downloadJavadocs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- generate the IntelliJ project files -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-idea-plugin</artifactId>
-        <configuration>
-          <jdkLevel>${maven.compile.source}</jdkLevel>
-          <downloadSources>true</downloadSources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Specification-Title>${project.name}</Specification-Title>
-              <Specification-Version>${project.version}</Specification-Version>
-              <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-              <Implementation-Title>${project.name}</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-              <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <Implementation-Build>${implementation.build}</Implementation-Build>              
-              <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-              <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <jvm>${fulcrum.surefire.java}</jvm>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- attach the source code fulcrum.n building a jar -->
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-source-jar</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <phase>package</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!-- build the source and binary distribution packages -->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>bin</descriptorRef>
-            <descriptorRef>project</descriptorRef>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <!-- N.B. plugins defined here in the <reporting> section ignore what's defined in <pluginManagement>
-         in the <build> section above, so we have to define the versions here. -->
-    <plugins>
-      <!-- org.apache.maven.plugins, alpha order by artifact id -->
-      <plugin>
-        <!-- generate the changes report from changes.xml -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>2.0-beta-3</version>
-        <configuration>
-          <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>changes-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <threshold>Normal</threshold>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${fulcrum.javadoc.version}</version>
-        <configuration>
-          <!-- keep only errors and warnings -->
-          <quiet>true</quiet>
-          <source>${maven.compile.source}</source>
-          <encoding>${fulcrum.encoding}</encoding>
-          <docEncoding>${fulcrum.docEncoding}</docEncoding>
-          <linksource>true</linksource>
-          <links>
-            <link>${fulcrum.javadoc.java.link}</link>
-            <link>${fulcrum.javadoc.javaee.link}</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>${fulcrum.jxr.version}</version>
-      </plugin>
-      <plugin>
-        <!-- generate the PMD reports -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <minimumTokens>200</minimumTokens>
-          <targetJdk>${maven.compile.source}</targetJdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/finalizers.xml</ruleset>
-            <ruleset>/rulesets/imports.xml</ruleset>
-            <ruleset>/rulesets/unusedcode.xml</ruleset>
-          </rulesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${fulcrum.project-info.version}</version>
-        <configuration>
-          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.0</version>
-        <configuration>
-          <!-- Exclude the navigation file for Maven 1 sites
-                   and the changes file used by the changes-plugin,
-                   as they interfere with the site generation. -->
-          <moduleExcludes>
-            <xdoc>navigation.xml,changes.xml</xdoc>
-          </moduleExcludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>${fulcrum.surefire.version}</version>
-      </plugin>
-      <plugin>
-        <!-- get test coverage for regression tests -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jdepend-maven-plugin</artifactId>
-        <version>2.0-beta-2</version>
-      </plugin>
-      <plugin>
-        <!-- check the Apache Licence in all source files -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-      </plugin>
-      <plugin>
-        <!-- generate the tag list report -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <profiles>
     <profile>
-      <id>ci</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-
-    <profile>
-      <id>release</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.releases</id>
-          <name>Apache Release Distribution Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-        </repository>
-      </distributionManagement>
+      <id>apache-release</id>
       <build>
         <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
-            <artifactId>maven-install-plugin</artifactId>
-            <configuration>
-              <createChecksum>true</createChecksum>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-release-plugin</artifactId>
-            <configuration>
-              <!-- Pass these arguments to the deploy plugin. -->
-              <arguments>-Prelease</arguments>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
+            <!-- build the source and binary distribution packages -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
             <executions>
               <execution>
-                <id>create-javadoc-jar</id>
+                <id>fulcrum-source-release-assembly</id>
+                <phase>package</phase>
                 <goals>
-                  <goal>jar</goal>
+                  <goal>single</goal>
                 </goals>
-                <phase>package</phase>
                 <configuration>
-                  <source>${maven.compile.source}</source>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <descriptorRefs>
+                    <descriptorRef>bin</descriptorRef>
+                    <descriptorRef>project</descriptorRef>
+                    <descriptorRef>src</descriptorRef>
+                  </descriptorRefs>
+                  <tarLongFileFormat>gnu</tarLongFileFormat>
                 </configuration>
               </execution>
             </executions>
-          </plugin>
+          </plugin>      
         </plugins>
       </build>
-    </profile>
-
-    <profile>
-      <id>rc</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/turbine/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/staged</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-      </distributionManagement>
-      <build>
-        <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.4</version>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-install-plugin</artifactId>
-            <configuration>
-              <createChecksum>true</createChecksum>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>site</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-release-plugin</artifactId>
-            <configuration>
-              <!-- Pass these arguments to the deploy plugin. -->
-              <arguments>-Prc</arguments>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>create-javadoc-jar</id>
-                <goals>
-                  <goal>javadoc</goal>
-                  <goal>jar</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-            <configuration>
-              <source>${maven.compile.source}</source>
-             </configuration>            
-          </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>attached</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
+    </profile>    
   </profiles>
 
   <properties>
-    <!-- configuration bits for cutting a release candidate, must be overridden by components -->
-    <!-- must agree with project.version above -->
-    <fulcrum.release.version>2</fulcrum.release.version>
-    <fulcrum.rc.version>RC1</fulcrum.rc.version>
-
-    <!-- Default configuration for compiler source and target JVM -->
-    <maven.compile.source>1.6</maven.compile.source>
-    <maven.compile.target>1.6</maven.compile.target>
-
-    <!-- Compiler and surefire plugin settings for "java" profiles -->
-    <fulcrum.compiler.fork>false</fulcrum.compiler.fork>
-    <fulcrum.compiler.compilerVersion>1.6</fulcrum.compiler.compilerVersion>
-    <fulcrum.compiler.javac>${JAVA_HOME}/bin/javac</fulcrum.compiler.javac>
-    <fulcrum.surefire.java>${JAVA_HOME}/bin/java</fulcrum.surefire.java>
-
-    <!-- Plugin versions (allows same value in reporting and build sections) -->
-    <fulcrum.surefire.version>2.9</fulcrum.surefire.version>
-    <fulcrum.surefire-report.version>2.9</fulcrum.surefire-report.version>
-    <fulcrum.javadoc.version>2.8</fulcrum.javadoc.version>
-    <fulcrum.changes.version>2.6</fulcrum.changes.version>   
-    <fulcrum.jxr.version>2.3</fulcrum.jxr.version>
-    <fulcrum.project-info.version>2.4</fulcrum.project-info.version>
-
-    <!-- Fulcrum Component Id -->
-    <fulcrum.componentid>${project.artifactId}</fulcrum.componentid>
-
-    <!--
-      Make the deployment protocol pluggable. This allows to switch to
-      other protocols like scpexe, fulcrum.ch some users prefer over scp.
-    -->
-    <fulcrum.deployment.protocol>scp</fulcrum.deployment.protocol>
-
-    <!--
-      Encoding of Java source files: Make sure, that the compiler and
-      the javadoc generator use the right encoding. Subprojects may
-      overwrite this, if they are using another encoding.
-    -->
-    <fulcrum.encoding>UTF-8</fulcrum.encoding>
-    <fulcrum.docEncoding>${fulcrum.encoding}</fulcrum.docEncoding>
-    <fulcrum.resourceEncoding>${fulcrum.encoding}</fulcrum.resourceEncoding>
-
-    <!-- Define encoding for filtering -->
-    <project.build.sourceEncoding>${fulcrum.encoding}</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>${fulcrum.encoding}</project.reporting.outputEncoding>
-
-    <!-- Javadoc link to Java API.  Default is Java 1.6; components can override to other versions -->
-    <fulcrum.javadoc.java.link>http://download.oracle.com/javase/6/docs/api/</fulcrum.javadoc.java.link>
-    <fulcrum.javadoc.javaee.link>http://download.oracle.com/javaee/6/api/</fulcrum.javadoc.javaee.link>
-
-    <!-- build meta inf -->
-    <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
-    <implementation.build>${scmBranch}@r${buildNumber};${maven.build.timestamp}</implementation.build>
-
-    <!-- maven-surefire-plugin -->
-    <test>**/*Test</test>
-
+    <turbine.surefire.version>2.12.4</turbine.surefire.version>
+    <turbine.surefire-report.version>2.12.4</turbine.surefire-report.version>
   </properties>
-
 </project>

Modified: turbine/fulcrum/trunk/parent/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/xdocs/changes.xml?rev=1426159&r1=1426158&r2=1426159&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parent/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/parent/xdocs/changes.xml Thu Dec 27 11:02:43 2012
@@ -25,6 +25,9 @@
 
   <body>
     <release version="2-SNAPSHOT" date="as in SVN">
+      <action dev="tv" type="update">
+        Changed parent POM to the Turbine Parent POM and removed all duplicate definitions
+      </action>
       <action dev="sgoeschl" type="update">
         Changed the deployment protocol from "scp" to "scpexe"
       </action>