Index: trunk/lucene-search-3/pom.xml |
— | — | @@ -34,11 +34,10 @@ |
35 | 35 | <properties> |
36 | 36 | <!-- libraries versions --> |
37 | 37 | |
38 | | - <!-- |
| 38 | + |
39 | 39 | <tomcat.version>6.0.29</tomcat.version> |
40 | 40 | <solr.version>1.4.1</solr.version> |
41 | | - <lucene.version>2.3.0</lucene.version> |
42 | | - --> |
| 41 | + <lucene.version>2.3.0</lucene.version> |
43 | 42 | <junit.version>4.10</junit.version> |
44 | 43 | <lucene.version>2.4.1</lucene.version> |
45 | 44 | <antlr.version>3.4</antlr.version> |
— | — | @@ -47,7 +46,7 @@ |
48 | 47 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
49 | 48 | <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding> |
50 | 49 | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
51 | | - <javac.src.version>javac.src.version>1.6</javac.src.version> |
| 50 | + <javac.src.version>1.6</javac.src.version> |
52 | 51 | <javac.target.version>1.6</javac.target.version> |
53 | 52 | <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format> |
54 | 53 | <implementation.build>${maven.build.timestamp}</implementation.build> |
— | — | @@ -58,6 +57,20 @@ |
59 | 58 | <pluginManagement> |
60 | 59 | |
61 | 60 | <plugins> |
| 61 | + |
| 62 | + |
| 63 | + <plugin> |
| 64 | + <groupId>org.apache.maven.plugins</groupId> |
| 65 | + <artifactId>maven-compiler-plugin</artifactId> |
| 66 | + <version>2.3.2</version> |
| 67 | + <configuration> |
| 68 | + <encoding>UTF-8</encoding> |
| 69 | + <source>${javac.src.version}</source> |
| 70 | + <target>${javac.target.version}</target> |
| 71 | + </configuration> |
| 72 | + </plugin> |
| 73 | + |
| 74 | + |
62 | 75 | <plugin> |
63 | 76 | <groupId>org.apache.maven.plugins</groupId> |
64 | 77 | <artifactId>maven-surefire-plugin</artifactId> |
— | — | @@ -66,30 +79,8 @@ |
67 | 80 | <testFailureIgnore>true</testFailureIgnore> |
68 | 81 | </configuration> |
69 | 82 | </plugin> |
70 | | - |
71 | | - |
72 | | - <plugin> |
73 | | - <groupId>org.apache.maven.plugins</groupId> |
74 | | - <artifactId>maven-javadoc-plugin</artifactId> |
75 | | - <version>2.8</version> |
76 | | - <configuration> |
77 | | - <doctitle>API for ${project.name} ${project.version}</doctitle> <!-- Used by javadoc:javadoc goal --> |
78 | | - <windowtitle>API for ${project.name} ${project.version}</windowtitle> <!-- Used by javadoc:javadoc goal --> |
79 | | - <testDoctitle>Test API for ${project.name} ${project.version}</testDoctitle> <!-- Used by javadoc:test-javadoc goal --> |
80 | | - <testWindowtitle>Test API for ${project.name} ${project.version}</testWindowtitle> <!-- Used by javadoc:test-javadoc goal --> |
81 | | - <links> |
82 | | - <link>http://commons.apache.org/lang/api</link> |
83 | | - <link>http://lucene.apache.org/java/3_5_0/api</link> |
84 | | - <link>http://java.sun.com/j2se/1.5.0/docs/api</link> |
85 | | - </links> |
86 | | - <show>protected</show> |
87 | | - <linksource>true</linksource> |
88 | | - </configuration> |
89 | | - </plugin> |
90 | | - |
91 | | - |
92 | | - <plugin> |
93 | | - |
| 83 | + |
| 84 | + <plugin> |
94 | 85 | <groupId>org.antlr</groupId> |
95 | 86 | <artifactId>antlr3-maven-plugin</artifactId> |
96 | 87 | <version>${antlr.version}</version> |
— | — | @@ -100,31 +91,24 @@ |
101 | 92 | </goals> |
102 | 93 | </execution> |
103 | 94 | </executions> |
104 | | - |
105 | | - </plugin> |
106 | | - |
107 | | - </plugins> |
108 | | - |
109 | | - |
110 | | - |
| 95 | + </plugin> |
| 96 | + </plugins> |
111 | 97 | </pluginManagement> |
112 | 98 | |
113 | | - <plugins> |
114 | | - <plugin> |
115 | | - <groupId>org.apache.maven.plugins</groupId> |
116 | | - <artifactId>maven-javadoc-plugin</artifactId> |
117 | | - |
118 | | - <configuration> |
119 | | - <!-- javadocs against which to link our own javadoc --> |
120 | | - <links> |
121 | | - <link>http://commons.apache.org/lang/api</link> |
122 | | - <link>http://lucene.apache.org/java/3_5_0/api</link> |
123 | | - <link>http://java.sun.com/j2se/1.6.0/docs/api</link> |
124 | | - </links> |
125 | | - <show>protected</show> |
126 | | - <linksource>true</linksource> |
127 | | - </configuration> |
128 | | - </plugin> |
| 99 | + <plugins> |
| 100 | + <plugin> |
| 101 | + <groupId>org.apache.maven.plugins</groupId> |
| 102 | + <artifactId>maven-site-plugin</artifactId> |
| 103 | + <executions> |
| 104 | + <execution> |
| 105 | + <id>attach-descriptor</id> |
| 106 | + <goals> |
| 107 | + <goal>attach-descriptor</goal> |
| 108 | + </goals> |
| 109 | + </execution> |
| 110 | + </executions> |
| 111 | + |
| 112 | + </plugin> |
129 | 113 | </plugins> |
130 | 114 | </build> |
131 | 115 | |
— | — | @@ -244,14 +228,11 @@ |
245 | 229 | <version>2.1.1</version> |
246 | 230 | </plugin> |
247 | 231 | |
248 | | - <plugin> |
249 | | - <groupId>org.apache.maven.plugins</groupId> |
250 | | - <artifactId>maven-javadoc-plugin</artifactId> |
251 | | - </plugin> |
252 | 232 | |
| 233 | + |
253 | 234 | <plugin> |
254 | | - <groupId>org.codehaus.mojo</groupId> |
255 | | - <artifactId>cobertura-maven-plugin</artifactId> |
| 235 | + <groupId>org.codehaus.mojo</groupId> |
| 236 | + <artifactId>cobertura-maven-plugin</artifactId> |
256 | 237 | <version>2.5.1</version> |
257 | 238 | </plugin> |
258 | 239 | |
— | — | @@ -261,6 +242,25 @@ |
262 | 243 | <version>2.6</version> |
263 | 244 | </plugin> |
264 | 245 | |
| 246 | + <plugin> |
| 247 | + <groupId>org.apache.maven.plugins</groupId> |
| 248 | + <artifactId>maven-javadoc-plugin</artifactId> |
| 249 | + <version>2.8.1</version> |
| 250 | + <configuration> |
| 251 | + <doctitle>API for ${project.name} ${project.version}</doctitle> <!-- Used by javadoc:javadoc goal --> |
| 252 | + <windowtitle>API for ${project.name} ${project.version}</windowtitle> <!-- Used by javadoc:javadoc goal --> |
| 253 | + <testDoctitle>Test API for ${project.name} ${project.version}</testDoctitle> <!-- Used by javadoc:test-javadoc goal --> |
| 254 | + <testWindowtitle>Test API for ${project.name} ${project.version}</testWindowtitle> <!-- Used by javadoc:test-javadoc goal --> |
| 255 | + <links> |
| 256 | + <link>http://commons.apache.org/lang/api</link> |
| 257 | + <link>http://lucene.apache.org/java/3_5_0/api</link> |
| 258 | + <link>http://java.sun.com/j2se/1.5.0/docs/api</link> |
| 259 | + </links> |
| 260 | + <show>protected</show> |
| 261 | + <linksource>true</linksource> |
| 262 | + </configuration> |
| 263 | + |
| 264 | + </plugin> |
265 | 265 | |
266 | 266 | </plugins> |
267 | 267 | </reporting> |