r110149 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110148‎ | r110149 | r110150 >
Date:17:16, 27 January 2012
Author:oren
Status:ok
Tags:
Comment:
Antlr support and more comments
Modified paths:
  • /trunk/lucene-search-3/pom.xml (modified) (history)

Diff [purge]

Index: trunk/lucene-search-3/pom.xml
@@ -14,6 +14,7 @@
1515 <description>A search engine extension for MediaWiki</description>
1616 <inceptionYear>18/1/2012</inceptionYear>
1717 <url>http://www.mediawiki.org/wiki/User:OrenBochman/Search</url>
 18+
1819 <scm>
1920 <developerConnection>oren</developerConnection>
2021 <url>http://svn.wikimedia.org/svnroot/mediawiki/trunk/lucene-search-3</url>
@@ -24,12 +25,12 @@
2526 <system>jenkins</system>
2627 <url>https://integration.mediawiki.org/ci/</url>
2728 </ciManagement>
 29+
2830 <issueManagement>
2931 <url>https://bugzilla.wikimedia.org</url>
3032 <system>bugzilla</system>
3133 </issueManagement>
3234
33 -
3435 <properties>
3536 <!-- libraries versions -->
3637
@@ -40,23 +41,22 @@
4142 -->
4243 <junit.version>4.10</junit.version>
4344 <lucene.version>2.4.1</lucene.version>
 45+ <antlr.version>3.4</antlr.version>
4446
45 -
4647 <!-- misc project properties -->
4748 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4849 <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
4950 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
50 - <!-- >javac.src.version>1.6</javac.src.version>
51 - <javac.target.version>1.6</javac.target.version -->
 51+ <javac.src.version>javac.src.version>1.6</javac.src.version>
 52+ <javac.target.version>1.6</javac.target.version>
5253 <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
5354 <implementation.build>${maven.build.timestamp}</implementation.build>
5455 </properties>
5556
 57+ <build> <defaultGoal>install</defaultGoal>
 58+
 59+ <pluginManagement>
5660
57 -
58 - <build>
59 -
60 - <pluginManagement>
6161 <plugins>
6262 <plugin>
6363 <groupId>org.apache.maven.plugins</groupId>
@@ -85,15 +85,28 @@
8686 <show>protected</show>
8787 <linksource>true</linksource>
8888 </configuration>
89 - </plugin>
 89+ </plugin>
9090
9191
 92+ <plugin>
 93+
 94+ <groupId>org.antlr</groupId>
 95+ <artifactId>antlr3-maven-plugin</artifactId>
 96+ <version>${antlr.version}</version>
 97+ <executions>
 98+ <execution>
 99+ <goals>
 100+ <goal>antlr</goal>
 101+ </goals>
 102+ </execution>
 103+ </executions>
 104+
 105+ </plugin>
92106
93107 </plugins>
94108
95109
96110
97 -
98111 </pluginManagement>
99112
100113 <plugins>
@@ -102,10 +115,11 @@
103116 <artifactId>maven-javadoc-plugin</artifactId>
104117
105118 <configuration>
 119+ <!-- javadocs against which to link our own javadoc -->
106120 <links>
107121 <link>http://commons.apache.org/lang/api</link>
108122 <link>http://lucene.apache.org/java/3_5_0/api</link>
109 - <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
 123+ <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
110124 </links>
111125 <show>protected</show>
112126 <linksource>true</linksource>
@@ -115,6 +129,9 @@
116130 </build>
117131
118132 <dependencies>
 133+
 134+<!-- JUnit for Unit Testing -->
 135+
119136 <dependency>
120137 <groupId>junit</groupId>
121138 <artifactId>junit</artifactId>
@@ -122,23 +139,36 @@
123140 <scope>test</scope>
124141 </dependency>
125142
 143+<!-- Hamcrest for assertThat testing format-->
 144+
 145+ <dependency>
 146+ <groupId>org.hamcrest</groupId>
 147+ <artifactId>hamcrest-all</artifactId>
 148+ <version>1.1</version>
 149+ </dependency>
 150+
 151+<!-- log4j since java servers should not write to the console -->
 152+
126153 <dependency>
127154 <groupId>log4j</groupId>
128155 <artifactId>log4j</artifactId>
129156 <version>1.2.9</version>
130157 </dependency>
 158+
 159+<!-- Lucene provides search capabilities -->
131160
132161 <dependency>
133162 <groupId>org.apache.lucene</groupId>
134 - <artifactId>lucene-analyzers</artifactId>
 163+ <artifactId>lucene-core</artifactId>
135164 <version>${lucene.version}</version>
136165 </dependency>
137 -
 166+
138167 <dependency>
139168 <groupId>org.apache.lucene</groupId>
140 - <artifactId>lucene-core</artifactId>
 169+ <artifactId>lucene-analyzers</artifactId>
141170 <version>${lucene.version}</version>
142171 </dependency>
 172+
143173
144174 <dependency>
145175 <groupId>org.apache.lucene</groupId>
@@ -146,6 +176,7 @@
147177 <version>${lucene.version}</version>
148178 </dependency>
149179
 180+<!-- Lucene integration of Snowball Stemmers -->
150181 <dependency>
151182 <groupId>org.apache.lucene</groupId>
152183 <artifactId>lucene-snowball</artifactId>
@@ -170,6 +201,7 @@
171202 <version>3.0</version>
172203 </dependency>
173204
 205+ <!-- web services
174206 <dependency>
175207 <groupId>ws-commons-util</groupId>
176208 <artifactId>ws-commons-util</artifactId>
@@ -179,12 +211,11 @@
180212 <dependency>
181213 <groupId>mysql</groupId>
182214 <artifactId>mysql-connector-java</artifactId>
183 - <!--
 215+
184216 <version>5.1.18</version>
185 - -->
186 - <version>3.1.11</version>
 217+
187218 </dependency>
188 -
 219+ -->
189220
190221
191222 <dependency>
@@ -194,9 +225,15 @@
195226 <scope>system</scope>
196227 <systemPath>${project.basedir}/lib/mwdumper.jar</systemPath>
197228 </dependency>
198 -
199 -
200 - </dependencies>
 229+
 230+ <!-- We need to have the ANTLR runtime jar when running and compiling. -->
 231+ <dependency>
 232+ <groupId>org.antlr</groupId>
 233+ <artifactId>antlr-runtime</artifactId>
 234+ <version>${antlr.version}</version>
 235+ <scope>compile</scope>
 236+ </dependency>
 237+ </dependencies>
201238
202239 <reporting>
203240 <plugins>

Status & tagging log