From 3f6765dd6e9da120a4654d9a48206ebacd618904 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Tue, 2 Dec 2008 19:14:41 +0000 Subject: [PATCH] Updated release assemblies git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@722577 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 43 +++++++-- src/main/assembly/bin-with-deps-win.xml | 80 ---------------- ...n-with-deps-unix.xml => bin-with-deps.xml} | 35 +++---- src/main/assembly/{bin-unix.xml => bin.xml} | 35 +++---- src/main/assembly/build.xml | 20 ++++ .../assembly/{bin-win.xml => osgi-bin.xml} | 49 +++++----- src/main/assembly/src-unix.xml | 91 ------------------- src/main/assembly/src-win.xml | 91 ------------------- src/main/assembly/src.xml | 51 +++++++++++ 9 files changed, 167 insertions(+), 328 deletions(-) delete mode 100644 src/main/assembly/bin-with-deps-win.xml rename src/main/assembly/{bin-with-deps-unix.xml => bin-with-deps.xml} (76%) rename src/main/assembly/{bin-unix.xml => bin.xml} (77%) create mode 100644 src/main/assembly/build.xml rename src/main/assembly/{bin-win.xml => osgi-bin.xml} (71%) delete mode 100644 src/main/assembly/src-unix.xml delete mode 100644 src/main/assembly/src-win.xml create mode 100644 src/main/assembly/src.xml diff --git a/pom.xml b/pom.xml index 9d83edc9b..7ce982d3c 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,9 @@ maven-javadoc-plugin + + true + maven-site-plugin @@ -112,16 +115,42 @@ maven-assembly-plugin - src/main/assembly/bin-unix.xml - src/main/assembly/bin-win.xml - src/main/assembly/bin-with-deps-unix.xml - src/main/assembly/bin-with-deps-win.xml - src/main/assembly/src-unix.xml - src/main/assembly/src-win.xml + src/main/assembly/bin.xml + src/main/assembly/osgi-bin.xml + src/main/assembly/bin-with-deps.xml + src/main/assembly/src.xml + gnu + + + + maven-antrun-plugin + false + + + + + + + + + + + + + + + + + + + + + + + - maven-clover-plugin diff --git a/src/main/assembly/bin-with-deps-win.xml b/src/main/assembly/bin-with-deps-win.xml deleted file mode 100644 index e89bcb749..000000000 --- a/src/main/assembly/bin-with-deps-win.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - bin-with-dependencies-win - - zip - - - - - /lib - false - true - - - - - - - / - - *.txt - - crlf - - - - module-client/target/site/apidocs - javadoc/httpclient - - - module-client/src/examples/ - examples - crlf - - **/*.java - - - - - module-httpmime/target/site/apidocs - javadoc/httpmime - - - module-httpmime/src/examples/ - examples - crlf - - **/*.java - - - - diff --git a/src/main/assembly/bin-with-deps-unix.xml b/src/main/assembly/bin-with-deps.xml similarity index 76% rename from src/main/assembly/bin-with-deps-unix.xml rename to src/main/assembly/bin-with-deps.xml index 8c399051d..7be95a383 100644 --- a/src/main/assembly/bin-with-deps-unix.xml +++ b/src/main/assembly/bin-with-deps.xml @@ -1,7 +1,7 @@ - bin-with-dependencies-unix + bin-with-dependencies tar.gz + zip + + org.apache.httpcomponents:httpclient-osgi + + true /lib false - true @@ -46,32 +50,29 @@ / - *.txt + README.txt + LICENSE.txt + NOTICE.txt + RELEASE_NOTES.txt - lf + + + + target/site/apidocs + javadoc - - module-client/target/site/apidocs - javadoc/httpclient - module-client/src/examples/ examples - lf **/*.java - - module-httpmime/target/site/apidocs - javadoc/httpmime - module-httpmime/src/examples/ examples - lf **/*.java diff --git a/src/main/assembly/bin-unix.xml b/src/main/assembly/bin.xml similarity index 77% rename from src/main/assembly/bin-unix.xml rename to src/main/assembly/bin.xml index 988bde8fe..15455d125 100644 --- a/src/main/assembly/bin-unix.xml +++ b/src/main/assembly/bin.xml @@ -1,7 +1,7 @@ - bin-unix + bin tar.gz + zip + + org.apache.httpcomponents:httpclient-osgi + + false /lib false - false @@ -46,32 +50,29 @@ / - *.txt + README.txt + LICENSE.txt + NOTICE.txt + RELEASE_NOTES.txt - lf + + + + target/site/apidocs + javadoc - - module-client/target/site/apidocs - javadoc/httpclient - module-client/src/examples/ examples - lf **/*.java - - module-httpmime/target/site/apidocs - javadoc/httpmime - module-httpmime/src/examples/ examples - lf **/*.java diff --git a/src/main/assembly/build.xml b/src/main/assembly/build.xml new file mode 100644 index 000000000..ae545448d --- /dev/null +++ b/src/main/assembly/build.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/main/assembly/bin-win.xml b/src/main/assembly/osgi-bin.xml similarity index 71% rename from src/main/assembly/bin-win.xml rename to src/main/assembly/osgi-bin.xml index 3e8c0a24c..24449a3fd 100644 --- a/src/main/assembly/bin-win.xml +++ b/src/main/assembly/osgi-bin.xml @@ -1,7 +1,7 @@ - bin-win + osgi-bin + tar.gz zip - - - - /lib - false - false - - - + + module-osgi-bundle/target + / + + *.jar + + + *sources.jar + + / - *.txt + README.txt + LICENSE.txt + NOTICE.txt + RELEASE_NOTES.txt - crlf + + + + target/site/apidocs + javadoc - - module-client/target/site/apidocs - javadoc/httpclient - module-client/src/examples/ examples - crlf **/*.java - - module-httpmime/target/site/apidocs - javadoc/httpmime - module-httpmime/src/examples/ examples - crlf **/*.java diff --git a/src/main/assembly/src-unix.xml b/src/main/assembly/src-unix.xml deleted file mode 100644 index b0c61d6d8..000000000 --- a/src/main/assembly/src-unix.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - src-unix - - tar.gz - - - - - - / - - *.txt - - lf - - - - - / - - *.xml - - lf - - - - src - src - lf - - - - module-client/src - module-client/src - lf - - - - module-client - module-client - lf - - *.xml - - - - - module-httpmime/src - module-httpmime/src - lf - - - - module-httpmime - module-httpmime - lf - - *.xml - - - - diff --git a/src/main/assembly/src-win.xml b/src/main/assembly/src-win.xml deleted file mode 100644 index 46ebefee3..000000000 --- a/src/main/assembly/src-win.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - src-win - - zip - - - - - - / - - *.txt - - crlf - - - - - / - - *.xml - - crlf - - - - src - src - crlf - - - - module-client/src - module-client/src - crlf - - - - module-client - module-client - crlf - - *.xml - - - - - module-httpmime/src - module-httpmime/src - crlf - - - - module-httpmime - module-httpmime - crlf - - *.xml - - - - diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml new file mode 100644 index 000000000..b31dde69f --- /dev/null +++ b/src/main/assembly/src.xml @@ -0,0 +1,51 @@ + + + src + + tar.gz + zip + + + + + + / + + **/.* + **/.*/** + **/bin/** + **/target/** + **/local/** + **/lib/** + + + +