You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2017/05/09 20:03:31 UTC
[40/50] httpcomponents-core git commit: Removed maven assembly and
release plugin configuration; removed assembly definitions
Removed maven assembly and release plugin configuration; removed assembly definitions
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/branches/4.2.x@1503224 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/45567a4c
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/45567a4c
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/45567a4c
Branch: refs/heads/4.2.x
Commit: 45567a4cfac9987f59fca914c7e76fbc48ecd53e
Parents: 0bb1864
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Mon Jul 15 13:05:31 2013 +0000
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Mon Jul 15 13:05:31 2013 +0000
----------------------------------------------------------------------
pom.xml | 45 --------------------
src/main/assembly/bin.xml | 85 -------------------------------------
src/main/assembly/build.xml | 70 ------------------------------
src/main/assembly/osgi-bin.xml | 80 ----------------------------------
src/main/assembly/src.xml | 48 ---------------------
5 files changed, 328 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/45567a4c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9222c56..cd8bacc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,13 +152,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
- <id>javadoc-aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>pre-site</phase>
- </execution>
- <execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
@@ -178,37 +171,6 @@
<artifactId>maven-site-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <tasks>
- <ant antfile="src/main/assembly/build.xml">
- <property name="target" value="${project.build.directory}" />
- <property name="package.name" value="${project.artifactId}-${project.version}-bin" />
- </ant>
- <ant antfile="src/main/assembly/build.xml">
- <property name="target" value="${project.build.directory}" />
- <property name="package.name" value="${project.artifactId}-${project.version}-src" />
- </ant>
- <ant antfile="src/main/assembly/build.xml">
- <property name="target" value="${project.build.directory}" />
- <property name="package.name" value="${project.artifactId}-${project.version}-osgi-bin" />
- </ant>
- </tasks>
- </configuration>
- </plugin>
- <plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<dependencies>
@@ -281,13 +243,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/45567a4c/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
deleted file mode 100644
index bcc8e71..0000000
--- a/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
- $HeadURL$
- $Revision$
-
- ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-<assembly>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <moduleSets>
- <moduleSet>
- <excludes>
- <exclude>org.apache.httpcomponents:httpcore-osgi</exclude>
- </excludes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <outputDirectory>/lib</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
- <fileSets>
- <fileSet>
- <directory></directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README.txt</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>RELEASE_NOTES.txt</include>
- </includes>
- </fileSet>
- <!-- Javadocs -->
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>javadoc</outputDirectory>
- </fileSet>
- <!-- Tutorial -->
- <fileSet>
- <directory>target/site/tutorial</directory>
- <outputDirectory>tutorial</outputDirectory>
- </fileSet>
- <!-- Examples: base module -->
- <fileSet>
- <directory>httpcore/src/examples/</directory>
- <outputDirectory>examples</outputDirectory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <!-- Examples: NIO module -->
- <fileSet>
- <directory>httpcore-nio/src/examples/</directory>
- <outputDirectory>examples</outputDirectory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/45567a4c/src/main/assembly/build.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/build.xml b/src/main/assembly/build.xml
deleted file mode 100644
index 5aeddac..0000000
--- a/src/main/assembly/build.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
- ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-<project name="assembly-postprocess" default="fixarchives" basedir=".">
-
- <!-- Use property to define the source file types, as it is needed twice -->
- <property name="src.file.types"
- value="**/*.txt **/*.xml **/*.properties **/*.java **/*.html **/*.css **/*.apt **/*.xsl"/>
-
- <target name="fixarchives" depends="_eolcheck,fixzip,fixtgz">
- </target>
-
- <target name="fixzip" unless="native.crlf">
- <property name="tmp.dir" location="${target}/tmp"/>
- <property name="zip.file" location="${target}/${package.name}.zip"/>
- <delete dir="${tmp.dir}" />
- <unzip src="${zip.file}" dest="${tmp.dir}"/>
- <fixcrlf srcdir="${tmp.dir}" eol="crlf" eof="remove" fixlast="false"
- includes="${src.file.types}" />
- <zip destfile="${zip.file}" basedir="${tmp.dir}" duplicate="preserve" />
- <delete dir="${tmp.dir}" />
- </target>
-
- <target name="fixtgz" unless="native.lf">
- <property name="tmp.dir" location="${target}/tmp"/>
- <property name="gz.file" location="${target}/${package.name}.tar.gz"/>
- <property name="tar.file" location="${target}/${package.name}.tar"/>
- <delete dir="${tmp.dir}" />
- <gunzip src="${gz.file}" dest="${tar.file}"/>
- <untar src="${tar.file}" dest="${tmp.dir}"/>
- <fixcrlf srcdir="${tmp.dir}" eol="lf" eof="remove" fixlast="false"
- includes="${src.file.types}" />
- <tar destfile="${tar.file}" basedir="${tmp.dir}" longfile="gnu"/>
- <gzip src="${tar.file}" destfile="${gz.file}"/>
- <delete file="${tar.file}"/>
- <delete dir="${tmp.dir}"/>
- </target>
-
- <!-- Determine if the native format is CRLF or LF (or neither) -->
- <target name="_eolcheck">
- <condition property="native.lf">
- <os family="unix"/>
- </condition>
- <condition property="native.crlf">
- <os family="dos"/>
- </condition>
- </target>
-</project>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/45567a4c/src/main/assembly/osgi-bin.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/osgi-bin.xml b/src/main/assembly/osgi-bin.xml
deleted file mode 100644
index 755c267..0000000
--- a/src/main/assembly/osgi-bin.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
- ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-<assembly>
- <id>osgi-bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>httpcore-osgi/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory></directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README.txt</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>RELEASE_NOTES.txt</include>
- </includes>
- </fileSet>
- <!-- Javadocs -->
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>javadoc</outputDirectory>
- </fileSet>
- <!-- Tutorial -->
- <fileSet>
- <directory>target/site/tutorial</directory>
- <outputDirectory>tutorial</outputDirectory>
- </fileSet>
- <!-- Examples: base module -->
- <fileSet>
- <directory>httpcore/src/examples/</directory>
- <outputDirectory>examples</outputDirectory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <!-- Examples: NIO module -->
- <fileSet>
- <directory>httpcore-nio/src/examples/</directory>
- <outputDirectory>examples</outputDirectory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/45567a4c/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
deleted file mode 100644
index 3f949b7..0000000
--- a/src/main/assembly/src.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-<assembly>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <!-- Release materials -->
- <fileSet>
- <directory></directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/bin/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/local/**</exclude>
- <exclude>**/lib/**</exclude>
- <exclude>*.rdf</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>