511226: Use native HttpClient SPNEGO/Kerberos support for Windows

Include sources in HttpClient wrapper site Bug: 511226 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511226
eclipse-mpc · Apr 19, 2017 · aa613bb · aa613bb
1 parent ead610d
commit aa613bb
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 16 deletions.
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/feature.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/feature.xml
@@ -13,7 +13,7 @@
       %copyright
    </copyright>
 
-   <license url="%licenseUrl">
+   <license>
       %license
    </license>
 

diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/pom.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.feature/pom.xml
@@ -12,4 +12,18 @@
    <name>HttpClient Wrapper Feature</name>
    <version>4.5.2-SNAPSHOT</version>
    <packaging>eclipse-feature</packaging>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-source-feature-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+         </plugin>
+      </plugins>
+   </build>
+
 </project>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/category.xml b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.site/category.xml
@@ -2,4 +2,6 @@
 <site>
    <feature id="org.eclipse.epp.mpc.apache.httpclient.feature" version="0.0.0">
    </feature>
+   <feature id="org.eclipse.epp.mpc.apache.httpclient.feature.source" version="0.0.0">
+   </feature>
 </site>
diff --git a/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/httpclient-target.target b/httpclient-target-site/org.eclipse.epp.mpc.apache.httpclient.target/httpclient-target.target
@@ -2,18 +2,19 @@
 <?pde version="3.8"?><target name="HttpClient Target Platform" sequenceNumber="7">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
 <unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20170210-0925"/>
 <unit id="org.apache.httpcomponents.httpclient.win" version="4.5.2.v20170410-1149"/>
+<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.2.v20170410-1149"/>
 <unit id="com.sun.jna" version="4.1.0.v20170410-1117"/>
+<unit id="com.sun.jna.source" version="4.1.0.v20170410-1117"/>
 <unit id="com.sun.jna.platform" version="4.1.0.v20170410-1117"/>
+<unit id="com.sun.jna.platform.source" version="4.1.0.v20170410-1117"/>
 <unit id="org.apache.commons.codec" version="0.0.0"/>
 <unit id="org.apache.commons.logging" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170411114559/repository/"/>
 </location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
 </locations>
 </target>
diff --git a/httpclient-target-site/pom.xml b/httpclient-target-site/pom.xml
@@ -89,19 +89,42 @@
                   </dependency>
                </dependencies>
             </plugin>
+            <plugin>
+               <groupId>org.eclipse.tycho.extras</groupId>
+               <artifactId>tycho-source-feature-plugin</artifactId>
+               <version>${tycho.version}</version>
+               <executions>
+                  <execution>
+                     <id>source-feature</id>
+                     <phase>package</phase>
+                     <goals>
+                        <goal>source-feature</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
             <plugin>
                <groupId>org.eclipse.tycho</groupId>
-               <artifactId>tycho-p2-repository-plugin</artifactId>
+               <artifactId>tycho-p2-plugin</artifactId>
                <version>${tycho.version}</version>
+               <executions>
+                 <execution>
+                   <id>attach-p2-metadata</id>
+                   <phase>package</phase>
+                   <goals>
+                     <goal>p2-metadata</goal>
+                   </goals>
+                 </execution>
+               </executions>
             </plugin>
             <plugin>
                <groupId>org.eclipse.tycho</groupId>
-               <artifactId>tycho-p2-director-plugin</artifactId>
+               <artifactId>tycho-p2-repository-plugin</artifactId>
                <version>${tycho.version}</version>
             </plugin>
             <plugin>
                <groupId>org.eclipse.tycho</groupId>
-               <artifactId>tycho-p2-plugin</artifactId>
+               <artifactId>tycho-p2-director-plugin</artifactId>
                <version>${tycho.version}</version>
             </plugin>
          </plugins>

diff --git a/org.eclipse.epp.mpc.feature/.cvsignore b/org.eclipse.epp.mpc.feature/.cvsignore