Author: tv
Date: Sun Nov 18 16:51:09 2012
New Revision: 1410925
URL: http://svn.apache.org/viewvc?rev=1410925&view=rev
Log:
Use new parent POM and remove all settings defined by the parent
Modified:
turbine/core/trunk/pom.xml
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1410925&r1=1410924&r2=1410925&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Sun Nov 18 16:51:09 2012
@@ -20,13 +20,13 @@
<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>7</version>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-parent</artifactId>
+ <version>2</version>
</parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine</artifactId>
- <name>turbine-4</name>
+ <name>Apache Turbine</name>
<version>4.0-M2-SNAPSHOT</version>
<description>Turbine is a servlet based framework that allows experienced
Java
developers to quickly build secure web applications. Parts of Turbine
@@ -35,41 +35,8 @@
available for use in other applications.</description>
<url>http://turbine.apache.org/</url>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/TRB</url>
- </issueManagement>
-
<inceptionYear>2000</inceptionYear>
- <distributionManagement>
- <repository>
- <id>apache.dist</id>
- <name>Default Repository</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/www.apache.org/dist/turbine/releases/</url>
- </repository>
- <site>
- <id>apache.website</id>
- <name>Default Site</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org/turbine/development/turbine-4.0</url>
- </site>
- </distributionManagement>
-
- <mailingLists>
- <mailingList>
- <name>Turbine User List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/turbine-user/</archive>
- </mailingList>
- <mailingList>
- <name>Turbine Developer List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/turbine-dev/</archive>
- </mailingList>
- </mailingLists>
-
<developers>
<developer>
<id>brekke</id>
@@ -225,7 +192,7 @@
</roles>
<timezone>1</timezone>
</developer>
- <developer>
+ <developer>
<name>Georg Kallidis</name>
<id>gk</id>
<email>[email protected]</email>
@@ -538,102 +505,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- </configuration>
- </plugin>
-
- <!-- TODO: later use toolchain support to do compilation on an external
JDK 1.3+ compiler -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <encoding>${turbine.encoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <forkMode>perTest</forkMode>
- </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>
-
<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>
- <!-- generate the IntelliJ project files -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <version>2.2</version>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <jdkLevel>${maven.compile.source}</jdkLevel>
- <downloadSources>true</downloadSources>
+ <forkMode>perTest</forkMode>
</configuration>
- </plugin>
- <plugin>
- <!-- generate the Eclipse project files -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
- <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>
- <tasks>
- <copy todir="${project.build.directory}/site/apidocs/META-INF">
- <fileset dir="${basedir}">
- <include name="LICENSE.txt" />
- <include name="NOTICE" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
-
<plugin>
<groupId>org.apache.torque</groupId>
<artifactId>torque-maven-plugin</artifactId>
@@ -726,157 +602,18 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <!-- build the ssite during packaging -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>make-site</id>
- <phase>package</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <!-- build the source and binary distribution packages -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/binaries.xml</descriptor>
- <descriptor>src/assembly/source.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
-
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <aggregate>false</aggregate>
- <source>${maven.compile.source}</source>
- <encoding>${turbine.encoding}</encoding>
- <docEncoding>${turbine.docEncoding}</docEncoding>
- <linksource>true</linksource>
- <links>
- <link>http://java.sun.com/javase/6/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
<configuration>
<aggregate>false</aggregate>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-1</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>
- <!-- get test coverage for regression tests -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <!-- generate the changes report from changes.xml -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.4</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <!-- generate the PMD reports -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</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>
- <!-- generate the tag list report -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.1</version>
- </plugin>
</plugins>
</reporting>
@@ -945,13 +682,13 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<type>jar</type>
</dependency>
<dependency>
@@ -1117,7 +854,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-upload</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -1137,130 +874,38 @@
<profiles>
<profile>
- <id>release</id>
- <distributionManagement>
- <repository>
- <id>apache.releases</id>
- <name>Apache Release Distribution Repository</name>
-
<url>${turbine.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>
- <version>1.2</version>
- <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>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>rc</id>
- <distributionManagement>
- <repository>
- <id>apache.releases</id>
- <name>Apache Turbine Release Candidate Staging Repository</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/turbine/core/${turbine.release.version}/${turbine.rc.version}/staged</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- <site>
- <id>apache.website</id>
- <name>Apache Turbine Release Candidate Staging Site</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/turbine/core/${turbine.release.version}/${turbine.rc.version}/site</url>
- </site>
- </distributionManagement>
- <build>
- <plugins>
- <!-- We want to sign the artifact, the POM, and all attached
artifacts -->
- <plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.2</version>
+ <!-- build the source and binary distribution packages -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
+ <id>turbine-source-release-assembly</id>
+ <phase>package</phase>
<goals>
- <goal>sign</goal>
+ <goal>single</goal>
</goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptors>
+ <descriptor>src/assembly/binaries.xml</descriptor>
+ <descriptor>src/assembly/source.xml</descriptor>
+ </descriptors>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
</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>-Prc</arguments>
- </configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
<properties>
-
- <!-- Default configuration for compiler source and target JVM -->
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
-
- <!-- Default values for the download-page generation by
commons-build-plugin -->
- <!--
commons.release.name>${project.artifactId}-${turbine.release.version}</commons.release.name
-->
- <!-- commons.binary.suffix>-bin</commons.binary.suffix -->
-
- <!-- The RC version used in the staging repository URL. -->
- <turbine.release.version>${project.version}</turbine.release.version>
- <turbine.rc.version>RC3</turbine.rc.version>
-
- <!--
- Make the deployment protocol pluggable. This allows to switch to
- other protocols like scpexe, which some users prefer over scp.
- -->
- <turbine.deployment.protocol>scpexe</turbine.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.
- -->
- <turbine.encoding>utf-8</turbine.encoding>
- <turbine.docEncoding>${turbine.encoding}</turbine.docEncoding>
-
- <!-- maven-surefire-plugin -->
- <test>**/*Test</test>
+ <sourceReleaseAssemblyDescriptor>source</sourceReleaseAssemblyDescriptor>
</properties>
</project>
