Replace obsolete ${pom.*} with ${project.*}
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@936249 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ad7d78d0da
commit
8d89fa2657
|
@ -52,7 +52,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
<version>${pom.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
<version>${pom.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-codec</groupId>
|
<groupId>commons-codec</groupId>
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpmime</artifactId>
|
<artifactId>httpmime</artifactId>
|
||||||
<version>${pom.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.james</groupId>
|
<groupId>org.apache.james</groupId>
|
||||||
|
@ -87,8 +87,8 @@
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<instructions>
|
<instructions>
|
||||||
<Bundle-Name>Apache ${pom.name}</Bundle-Name>
|
<Bundle-Name>Apache ${project.name}</Bundle-Name>
|
||||||
<Bundle-SymbolicName>${pom.groupId}.httpclient</Bundle-SymbolicName>
|
<Bundle-SymbolicName>${project.groupId}.httpclient</Bundle-SymbolicName>
|
||||||
<_exportcontents>
|
<_exportcontents>
|
||||||
org.apache.http.auth.*;version=${project.version},
|
org.apache.http.auth.*;version=${project.version},
|
||||||
org.apache.http.cookie.*;version=${project.version},
|
org.apache.http.cookie.*;version=${project.version},
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
<finalName>org.apache.httpcomponents.httpclient_${pom.version}</finalName>
|
<finalName>org.apache.httpcomponents.httpclient_${project.version}</finalName>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -133,13 +133,13 @@
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Specification-Title>HttpComponents HttpClient</Specification-Title>
|
<Specification-Title>HttpComponents HttpClient</Specification-Title>
|
||||||
<Specification-Version>${pom.version}</Specification-Version>
|
<Specification-Version>${project.version}</Specification-Version>
|
||||||
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
|
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
|
||||||
<Implementation-Title>HttpComponents HttpClient</Implementation-Title>
|
<Implementation-Title>HttpComponents HttpClient</Implementation-Title>
|
||||||
<Implementation-Version>${pom.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
|
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
|
||||||
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
|
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
|
||||||
<url>${pom.url}</url>
|
<url>${project.url}</url>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -128,13 +128,13 @@
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Specification-Title>HttpComponents HttpMime</Specification-Title>
|
<Specification-Title>HttpComponents HttpMime</Specification-Title>
|
||||||
<Specification-Version>${pom.version}</Specification-Version>
|
<Specification-Version>${project.version}</Specification-Version>
|
||||||
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
|
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
|
||||||
<Implementation-Title>HttpComponents HttpMime</Implementation-Title>
|
<Implementation-Title>HttpComponents HttpMime</Implementation-Title>
|
||||||
<Implementation-Version>${pom.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
|
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
|
||||||
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
|
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
|
||||||
<url>${pom.url}</url>
|
<url>${project.url}</url>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
10
pom.xml
10
pom.xml
|
@ -133,19 +133,19 @@
|
||||||
<tasks>
|
<tasks>
|
||||||
<ant antfile="src/main/assembly/build.xml">
|
<ant antfile="src/main/assembly/build.xml">
|
||||||
<property name="target" value="${project.build.directory}" />
|
<property name="target" value="${project.build.directory}" />
|
||||||
<property name="package.name" value="${pom.artifactId}-${pom.version}-bin" />
|
<property name="package.name" value="${project.artifactId}-${project.version}-bin" />
|
||||||
</ant>
|
</ant>
|
||||||
<ant antfile="src/main/assembly/build.xml">
|
<ant antfile="src/main/assembly/build.xml">
|
||||||
<property name="target" value="${project.build.directory}" />
|
<property name="target" value="${project.build.directory}" />
|
||||||
<property name="package.name" value="${pom.artifactId}-${pom.version}-bin-with-dependencies" />
|
<property name="package.name" value="${project.artifactId}-${project.version}-bin-with-dependencies" />
|
||||||
</ant>
|
</ant>
|
||||||
<ant antfile="src/main/assembly/build.xml">
|
<ant antfile="src/main/assembly/build.xml">
|
||||||
<property name="target" value="${project.build.directory}" />
|
<property name="target" value="${project.build.directory}" />
|
||||||
<property name="package.name" value="${pom.artifactId}-${pom.version}-osgi-bin" />
|
<property name="package.name" value="${project.artifactId}-${project.version}-osgi-bin" />
|
||||||
</ant>
|
</ant>
|
||||||
<ant antfile="src/main/assembly/build.xml">
|
<ant antfile="src/main/assembly/build.xml">
|
||||||
<property name="target" value="${project.build.directory}" />
|
<property name="target" value="${project.build.directory}" />
|
||||||
<property name="package.name" value="${pom.artifactId}-${pom.version}-src" />
|
<property name="package.name" value="${project.artifactId}-${project.version}-src" />
|
||||||
</ant>
|
</ant>
|
||||||
</tasks>
|
</tasks>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -171,7 +171,7 @@
|
||||||
<entities>
|
<entities>
|
||||||
<entity>
|
<entity>
|
||||||
<name>version</name>
|
<name>version</name>
|
||||||
<value>${pom.version}</value>
|
<value>${project.version}</value>
|
||||||
</entity>
|
</entity>
|
||||||
</entities>
|
</entities>
|
||||||
<postProcess>
|
<postProcess>
|
||||||
|
|
Loading…
Reference in New Issue