Skip to content
This repository has been archived by the owner on Dec 1, 2024. It is now read-only.

Commit

Permalink
Made the project work with Maven 3 and made site generation work some…
Browse files Browse the repository at this point in the history 
…what.
  • Loading branch information
Gabriel Falkenberg authored and Gabriel Falkenberg committed Oct 30, 2010
1 parent a05ae7e commit 2555a3f
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 74 deletions.
141 changes: 69 additions & 72 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<modelVersion>4.0.0</modelVersion>

<groupId>se.valtech.maven-template</groupId>
<groupId>com.example.minimal-multi-module-site</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
Expand Down Expand Up @@ -34,40 +34,94 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.2</version>
<configuration>
<version>2.4.3</version>
<!--configuration>
<encoding>utf-8</encoding>
</configuration>
</configuration-->
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.1</version>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<encoding>utf-8</encoding>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>

<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.2</version>
</plugin>

<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>

<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.1</version>
<configuration>
</configuration>
<version>3.0-beta-3</version>
<!--configuration>
<reportPlugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<report>dependencies</report>
<report>project-team</report>
<report>scm</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
</plugin>
</reportPlugins>
</configuration-->
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
<version>2.6</version>
<configuration>
<forkMode>none</forkMode>
</configuration>
Expand All @@ -76,69 +130,12 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>7.0.1.v20091125</version>
<version>8.0.0.M1</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
<excludeDefaults>true</excludeDefaults>

<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1.2</version>
<reportSets>
<reportSet>
<reports>
<!--report>dependencies</report-->
<report>project-team</report>
<report>scm</report>
</reports>
</reportSet>
</reportSets>
</plugin>

<!--plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.5</version>
</plugin-->

<!--plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
</plugin-->
</plugins>
</reporting>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -181,7 +178,7 @@
</scm>

<prerequisites>
<maven>2.2.1</maven>
<maven>3.0</maven>
</prerequisites>

</project>
2 changes: 1 addition & 1 deletion server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.example.minimal-multi-module-site</groupId>
<artifactId>parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.example.minimal-multi-module-site</groupId>
<artifactId>parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>webapp</artifactId>
Expand Down

0 comments on commit 2555a3f

Please sign in to comment.