Index: examples/test-webapp/pom.xml =================================================================== --- examples/test-webapp/pom.xml (revision 4810) +++ examples/test-webapp/pom.xml (working copy) @@ -69,39 +69,6 @@ - - org.mortbay.jetty - maven-jetty-plugin - ${project.version} - - 8087 - foo - 1 - - - - fooprop - 222 - - - - /test - ${project.build.directory}/work - - - ${basedir}/target/sessions - - - - - - - Test Realm - ../../etc/realm.properties - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - maven-assembly-plugin - 2.2-beta-3 - - - src/main/assembly/assembly.xml - - - - - package - - single - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - Index: modules/jetty/pom.xml =================================================================== --- modules/jetty/pom.xml (revision 4810) +++ modules/jetty/pom.xml (working copy) @@ -92,53 +92,6 @@ - - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin-version} - true - - - - manifest - - - - org.mortbay.jetty.server - J2SE-1.4 - http://jetty.mortbay.org - !org.mortbay.jetty.*,!org.mortbay.xml.*,!org.mortbay.resource.*,!org.mortbay.io.*,!org.mortbay.servlet.jetty.*,javax.servlet.resources;resolution:=optional,javax.servlet.jsp;resolution:=optional,org.apache.jasper.servlet;resolution:=optional,org.mortbay.jetty.handler.management;resolution:=optional,* - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - Index: modules/jsp-2.1/pom.xml =================================================================== --- modules/jsp-2.1/pom.xml (revision 4810) +++ modules/jsp-2.1/pom.xml (working copy) @@ -76,25 +76,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.1 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources - - - - - maven-antrun-plugin @@ -124,36 +105,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - J2SE-1.5 - !com.sun.appserv.*,!com.sun.common.util.*,!com.sun.el.*,!com.sun.enterprise.web.*,!com.sun.org.apache.commons.*,!org.apache.jasper.*,* - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - Index: modules/naming/pom.xml =================================================================== --- modules/naming/pom.xml (revision 4810) +++ modules/naming/pom.xml (working copy) @@ -43,41 +43,8 @@ - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin-version} - true - - - - manifest - - - - J2SE-1.4 - !org.mortbay.naming.*,* - org.mortbay.naming - http://jetty.mortbay.org - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.codehaus.mojo - dependency-maven-plugin + maven-dependency-plugin copy-deps @@ -133,8 +100,8 @@ - org.codehaus.mojo - dependency-maven-plugin + org.apache.maven.plugins + maven-dependency-plugin copy-deps-below1.6 Index: modules/plus/pom.xml =================================================================== --- modules/plus/pom.xml (revision 4810) +++ modules/plus/pom.xml (working copy) @@ -45,65 +45,10 @@ - - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin-version} - true - - - - manifest - - - - J2SE-1.4 - org.mortbay.jetty.plus - !org.mortbay.jetty.plus.*,* - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - org.apache.derby - derby - 10.1.1.0 - test - - - junit - junit - test - - - org.codehaus.plexus - plexus-apacheds - 1.0-alpha-1 - test - - - org.codehaus.plexus - plexus-container-default - 1.0-alpha-20 - test - - geronimo-spec geronimo-spec-jta Index: modules/util5/pom.xml =================================================================== --- modules/util5/pom.xml (revision 4810) +++ modules/util5/pom.xml (working copy) @@ -60,39 +60,6 @@ - - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin-version} - true - - - - manifest - - - - org.mortbay.jetty.util5 - J2SE-1.5 - !org.mortbay.*,org.slf4j;resolution:=optional,* - http://jetty.mortbay.org - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - Index: modules/util/pom.xml =================================================================== --- modules/util/pom.xml (revision 4810) +++ modules/util/pom.xml (working copy) @@ -55,39 +55,6 @@ - - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin-version} - true - - - - manifest - - - - org.mortbay.jetty.util - J2SE-1.4 - !org.mortbay.*,org.slf4j;resolution:=optional,* - http://jetty.mortbay.org - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - Index: pom.xml =================================================================== --- pom.xml (revision 5169) +++ pom.xml (working copy) @@ -1,10 +1,5 @@ 4.0.0 - - org.mortbay.jetty - jetty-parent - 8 - org.mortbay.jetty project pom @@ -33,28 +28,6 @@ install - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - 2.0.6 - - - [1.4,) - - - - - - - maven-compiler-plugin 1.4 @@ -62,12 +35,6 @@ - maven-release-plugin - - https://svn.codehaus.org/jetty/jetty/tags - - - org.apache.maven.plugins maven-jar-plugin 2.1 @@ -76,25 +43,11 @@ development ${pom.url} - ${pom.version} org.mortbay - - true - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - @@ -111,43 +64,21 @@ modules/util5 modules/jetty modules/jsp-2.1 - modules/jsp-api-2.0 - modules/jsp-2.0 - modules/management modules/start - modules/maven-plugin - modules/jspc-maven-plugin modules/naming modules/plus modules/html - modules/annotations extras/servlet-tester - extras/xbean - extras/spring extras/sslengine extras/ajp - extras/win32service - - extras/threadpool extras/client examples/test-webapp - examples/test-jaas-webapp - examples/test-jndi-webapp - examples/embedded - examples/tests - contrib/cometd - contrib/jetty-ant contrib/jetty-rewrite-handler - - - contrib/terracotta - - extras/setuid @@ -218,22 +149,13 @@ - org.apache.maven.plugins - maven-remote-resources-plugin - - - org.mortbay.jetty:jetty-build-resources:1.0.1 - - - - org.apache.maven.plugins maven-javadoc-plugin org.apache.*:ebay.*:javax.*:com.sun.*:com.google.*:dojox.*:com.acme.* true false - ${project.build.directory}/maven-shared-archive-resources/org/mortbay/jetty/build/resources/javadoc.css + ${basedir}/javadoc.css http://java.sun.com/javaee/5/docs/api http://java.sun.com/j2se/1.5.0/docs/api @@ -256,13 +178,4 @@ - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.0 - - -