https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110560
Revision: 110560
Author: oren
Date: 2012-02-02 11:15:10 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
ensuring compilation to 1.6 JRE (maven default to 1.5, confusing eclipse ...)
Modified Paths:
--------------
trunk/lucene-search-3/pom.xml
Modified: trunk/lucene-search-3/pom.xml
===================================================================
--- trunk/lucene-search-3/pom.xml 2012-02-02 11:14:26 UTC (rev 110559)
+++ trunk/lucene-search-3/pom.xml 2012-02-02 11:15:10 UTC (rev 110560)
@@ -34,11 +34,10 @@
<properties>
<!-- libraries versions -->
- <!--
+
<tomcat.version>6.0.29</tomcat.version>
<solr.version>1.4.1</solr.version>
- <lucene.version>2.3.0</lucene.version>
- -->
+ <lucene.version>2.3.0</lucene.version>
<junit.version>4.10</junit.version>
<lucene.version>2.4.1</lucene.version>
<antlr.version>3.4</antlr.version>
@@ -47,7 +46,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <javac.src.version>javac.src.version>1.6</javac.src.version>
+ <javac.src.version>1.6</javac.src.version>
<javac.target.version>1.6</javac.target.version>
<maven.build.timestamp.format>yyyy-MM-dd
HH:mm:ssZ</maven.build.timestamp.format>
<implementation.build>${maven.build.timestamp}</implementation.build>
@@ -58,6 +57,20 @@
<pluginManagement>
<plugins>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <source>${javac.src.version}</source>
+ <target>${javac.target.version}</target>
+ </configuration>
+ </plugin>
+
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -66,30 +79,8 @@
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
-
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <doctitle>API for ${project.name}
${project.version}</doctitle> <!-- Used by javadoc:javadoc goal -->
- <windowtitle>API for ${project.name}
${project.version}</windowtitle> <!-- Used by javadoc:javadoc goal -->
- <testDoctitle>Test API for ${project.name}
${project.version}</testDoctitle> <!-- Used by javadoc:test-javadoc goal -->
- <testWindowtitle>Test API for ${project.name}
${project.version}</testWindowtitle> <!-- Used by javadoc:test-javadoc goal -->
- <links>
-
<link>http://commons.apache.org/lang/api</link>
-
<link>http://lucene.apache.org/java/3_5_0/api</link>
-
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- </links>
- <show>protected</show>
- <linksource>true</linksource>
- </configuration>
- </plugin>
-
-
- <plugin>
-
+
+ <plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>${antlr.version}</version>
@@ -100,31 +91,24 @@
</goals>
</execution>
</executions>
-
- </plugin>
-
- </plugins>
-
-
-
+ </plugin>
+ </plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
-
- <configuration>
- <!-- javadocs against which to link our own javadoc -->
- <links>
- <link>http://commons.apache.org/lang/api</link>
-
<link>http://lucene.apache.org/java/3_5_0/api</link>
-
<link>http://java.sun.com/j2se/1.6.0/docs/api</link>
- </links>
- <show>protected</show>
- <linksource>true</linksource>
- </configuration>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
</plugins>
</build>
@@ -244,14 +228,11 @@
<version>2.1.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.1</version>
</plugin>
@@ -261,6 +242,25 @@
<version>2.6</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <configuration>
+ <doctitle>API for ${project.name}
${project.version}</doctitle> <!-- Used by javadoc:javadoc goal -->
+ <windowtitle>API for ${project.name}
${project.version}</windowtitle> <!-- Used by javadoc:javadoc goal -->
+ <testDoctitle>Test API for ${project.name}
${project.version}</testDoctitle> <!-- Used by javadoc:test-javadoc goal -->
+ <testWindowtitle>Test API for ${project.name}
${project.version}</testWindowtitle> <!-- Used by javadoc:test-javadoc goal -->
+ <links>
+
<link>http://commons.apache.org/lang/api</link>
+
<link>http://lucene.apache.org/java/3_5_0/api</link>
+
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ </links>
+ <show>protected</show>
+ <linksource>true</linksource>
+ </configuration>
+
+ </plugin>
</plugins>
</reporting>
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
