You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/10/03 18:49:45 UTC
svn commit: r1393607 - /directmemory/parent/trunk/pom.xml
Author: olamy
Date: Wed Oct 3 16:49:45 2012
New Revision: 1393607
URL: http://svn.apache.org/viewvc?rev=1393607&view=rev
Log:
some cleanup
Modified:
directmemory/parent/trunk/pom.xml
Modified: directmemory/parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directmemory/parent/trunk/pom.xml?rev=1393607&r1=1393606&r2=1393607&view=diff
==============================================================================
--- directmemory/parent/trunk/pom.xml (original)
+++ directmemory/parent/trunk/pom.xml Wed Oct 3 16:49:45 2012
@@ -210,12 +210,6 @@ under the License.
<system>Jenkins</system>
<url>https://builds.apache.org/view/A-F/view/Directmemory/</url>
</ciManagement>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>${siteUrlDeployment}</url>
- </site>
- </distributionManagement>
<properties>
<!-- issue with apache parent 11 -->
@@ -226,10 +220,7 @@ under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
<implementation.build>${scmBranch}@r${buildNumber}; ${maven.build.timestamp}</implementation.build>
- <directmemory.siteFilePath>${user.home}/directmemory-site-deploy</directmemory.siteFilePath>
- <siteUrlDeployment>file://${directmemory.siteFilePath}</siteUrlDeployment>
- <directmemory.scmPubCheckoutDirectory>${user.home}/directmemory-site-content</directmemory.scmPubCheckoutDirectory>
- <scmSkipDeletedFiles>false</scmSkipDeletedFiles>
+
<sonar.host.url>https://analysis.apache.org/</sonar.host.url>
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
@@ -280,7 +271,7 @@ under the License.
<checkstyle-plugin.version>2.9.1</checkstyle-plugin.version>
<site-plugin.version>3.1</site-plugin.version>
<source-plugin.version>2.1.2</source-plugin.version>
- <asfTomcatMavenPluginVersion>2.0-beta-1</asfTomcatMavenPluginVersion>
+ <asfTomcatMavenPluginVersion>2.0</asfTomcatMavenPluginVersion>
<maven-scm-provider-svnjava.version>2.0.5</maven-scm-provider-svnjava.version>
<svnkit.version>1.7.5-v1</svnkit.version>
@@ -312,9 +303,7 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${site-plugin.version}</version>
- <configuration>
- <stagingSiteURL>${siteUrlDeployment}</stagingSiteURL>
- </configuration>
+
<dependencies>
<dependency>
@@ -359,14 +348,7 @@ under the License.
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0</version>
<configuration>
- <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/directmemory/site-content/</pubScmUrl>
- <content>${directmemory.siteFilePath}</content>
- <checkoutDirectory>${directmemory.scmPubCheckoutDirectory}</checkoutDirectory>
<tryUpdate>true</tryUpdate>
- <skipDeletedFiles>${scmSkipDeletedFiles}</skipDeletedFiles>
- <ignorePathsToDelete>
- <ignorePathToDelete>lightning**</ignorePathToDelete>
- </ignorePathsToDelete>
<providerImplementations>
<svn>javasvn</svn>
</providerImplementations>
@@ -502,38 +484,8 @@ under the License.
</archive>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionnalDependencies>
- <additionnalDependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc4</version>
- </additionnalDependency>
- </additionnalDependencies>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>javadoc</goal>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc4</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
<reporting>
<plugins>
@@ -583,14 +535,6 @@ under the License.
| Apple's JVM sometimes requires more memory
-->
<additionalJOption>-J-Xmx1024m</additionalJOption>
- <additionnalDependencies>
- <!-- prevent doclava to fail -->
- <additionnalDependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc4</version>
- </additionnalDependency>
- </additionnalDependencies>
</configuration>
</plugin>
<plugin>
@@ -629,39 +573,6 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat-plugin.version}</version>
- <executions>
- <execution>
- <id>rat-verify</id>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>.gitignore</exclude>
- <exclude>DEPENDENCIES</exclude>
- <exclude>README.txt</exclude>
- <exclude>*.sh</exclude>
- <exclude>.git/**</exclude>
- <exclude>.idea/**</exclude>
- <exclude>*.bat</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>.repository/**</exclude>
- <exclude>ajcore**</exclude>
- <exclude>init-git-svn.sh</exclude>
- <exclude>src/main/webapp/js/jquery*.js</exclude>
- <exclude>src/main/resources/archetype-resources/src/main/webapp/js/jquery*.js</exclude>
- <exclude>src/test/resources/projects/basic/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${source-plugin.version}</version>
@@ -739,6 +650,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
<dependencies>
<dependency>
<groupId>org.apache.apache.resources</groupId>