Maven cleanup to enable warningless build on fresh machine with Maven2.2.0:

* engine/pom.xml
    restore a reference to a (new version of a) necessary servlet library
* pom.xml
    remove deprecated {pom.artifactId}; add needed javadoc module version decl
* .classpath
    update ref to currently-used servlet jar
This commit is contained in:
gojomo
2010-03-23 22:57:27 +00:00
parent 9f77412581
commit 37c32b4e5c
3 changed files with 7 additions and 9 deletions
+1 -2
View File
@@ -21,7 +21,6 @@
<classpathentry kind="var" path="M2_REPO/com/anotherbigidea/javaswf/CVS-SNAPSHOT-1/javaswf-CVS-SNAPSHOT-1.jar"/>
<classpathentry kind="var" path="M2_REPO/it/unimi/dsi/mg4j/1.0.1/mg4j-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/fastutil/fastutil/5.0.7/fastutil-5.0.7.jar">
<attributes>
<attribute name="javadoc_location" value="jar:file://Users/pjack/.m2/repository/fastutil/fastutil/5.0.7/fastutil-5.0.7-javadoc.jar!/"/>
@@ -43,7 +42,7 @@
<classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-ajp/6.1.11/jetty-ajp-6.1.11.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-sslengine/6.1.14/jetty-sslengine-6.1.14.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.14/servlet-api-2.5-6.1.14.jar"/>
<classpathentry kind="var" path="M2_REPO/org/restlet/org.restlet/1.1.6/org.restlet-1.1.6.jar" sourcepath="/M2_REPO/org/restlet/org.restlet/1.1.6/org.restlet-1.1.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.1.6/com.noelios.restlet-1.1.6.jar" sourcepath="/M2SRC/restlet-1.1.1/src/com.noelios.restlet"/>
<classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.jetty/1.1.6/com.noelios.restlet.ext.jetty-1.1.6.jar"/>
+4 -6
View File
@@ -96,14 +96,12 @@
<version>6.1.14</version>
<scope>compile</scope>
</dependency>
<!--
<dependency>
<groupId>tomcat</groupId>
<artifactId>servlet</artifactId>
<version>4.1.34</version>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>6.1.14</version>
<scope>compile</scope>
</dependency>
-->
</dependency>
<dependency>
<groupId>org.restlet</groupId>
<artifactId>org.restlet</artifactId>
+2 -1
View File
@@ -154,7 +154,7 @@ Heritrix is the Internet Archive's open-source, extensible, web-scale,
<id>website</id>
<name>Website</name>
<!--Pass as command-line system property to maven-->
<url>${website.url}/projects/${pom.artifactId}</url>
<url>${website.url}/projects/${project.artifactId}</url>
</site>
</distributionManagement>
@@ -346,6 +346,7 @@ Heritrix is the Internet Archive's open-source, extensible, web-scale,
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
<configuration>
<source>
${basedir}/src/java