diff --git a/fluent-hc/pom.xml b/fluent-hc/pom.xml index 6074286ff..cb5a153d3 100644 --- a/fluent-hc/pom.xml +++ b/fluent-hc/pom.xml @@ -83,21 +83,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compile.source} - ${maven.compile.target} - ${maven.compile.optimize} - ${maven.compile.deprecation} - - - - maven-surefire-plugin - - @@ -127,12 +112,12 @@ maven-jxr-plugin - ${hc.jxr.version} + ${hc.jxr.version} maven-surefire-report-plugin - ${hc.surefire-report.version} + ${hc.surefire-report.version} diff --git a/httpclient-cache/pom.xml b/httpclient-cache/pom.xml index 10456facd..6342f6f2d 100644 --- a/httpclient-cache/pom.xml +++ b/httpclient-cache/pom.xml @@ -118,20 +118,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compile.source} - ${maven.compile.target} - ${maven.compile.optimize} - ${maven.compile.deprecation} - - org.apache.maven.plugins maven-jar-plugin - 2.2 @@ -170,12 +159,12 @@ maven-jxr-plugin - ${hc.jxr.version} + ${hc.jxr.version} maven-surefire-report-plugin - ${hc.surefire-report.version} + ${hc.surefire-report.version} diff --git a/httpclient-osgi/pom.xml b/httpclient-osgi/pom.xml index 0e2564d1b..6e7a5a908 100644 --- a/httpclient-osgi/pom.xml +++ b/httpclient-osgi/pom.xml @@ -157,13 +157,6 @@ - - com.atlassian.maven.plugins - maven-clover2-plugin - - true - - org.codehaus.mojo clirr-maven-plugin @@ -175,23 +168,4 @@ org.apache.httpcomponents.httpclient_${project.version} - - - - com.atlassian.maven.plugins - maven-clover2-plugin - - true - - - - org.codehaus.mojo - clirr-maven-plugin - ${hc.clirr.version} - - true - - - - diff --git a/httpclient/pom.xml b/httpclient/pom.xml index d92debede..e0d9e29ee 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -98,16 +98,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compile.source} - ${maven.compile.target} - ${maven.compile.optimize} - ${maven.compile.deprecation} - - maven-jar-plugin @@ -147,12 +137,12 @@ maven-jxr-plugin - ${hc.jxr.version} + ${hc.jxr.version} maven-surefire-report-plugin - ${hc.surefire-report.version} + ${hc.surefire-report.version} diff --git a/httpmime/pom.xml b/httpmime/pom.xml index 5cb645e5c..577ad1085 100644 --- a/httpmime/pom.xml +++ b/httpmime/pom.xml @@ -91,16 +91,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compile.source} - ${maven.compile.target} - ${maven.compile.optimize} - ${maven.compile.deprecation} - - diff --git a/pom.xml b/pom.xml index 9cdeda0de..92e634464 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ project org.apache.httpcomponents - 6 + 7 ../project/pom.xml 4.0.0 @@ -74,6 +74,7 @@ 4.9 2.5.2 1.8.5 + 1 4.2 @@ -217,25 +218,18 @@ maven-javadoc-plugin - - - javadoc-aggregate - - aggregate - - pre-site - - - attach-javadocs - - jar - - - + + + attach-javadocs + + jar + + + true - ${maven.compile.source} + ${maven.compiler.source} http://download.oracle.com/javase/1.5.0/docs/api/ http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/ @@ -245,37 +239,6 @@ maven-site-plugin - - maven-assembly-plugin - - - src/main/assembly/bin.xml - src/main/assembly/osgi-bin.xml - src/main/assembly/src.xml - - gnu - - - - maven-antrun-plugin - false - - - - - - - - - - - - - - - - - com.agilejava.docbkx docbkx-maven-plugin @@ -371,7 +334,7 @@ org.apache.httpcomponents hc-stylecheck - 1 + ${hc.stylecheck.version} @@ -458,48 +421,4 @@ - - - clover - - - - com.atlassian.maven.plugins - maven-clover2-plugin - 3.1.10.1 - - threaded - 100 - 50% - - - - site - pre-site - - instrument - - - - - - - - - - - com.atlassian.maven.plugins - maven-clover2-plugin - 3.1.10.1 - - 1.5 - - - - - - - - -