hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1721013 - in /httpcomponents/httpcore/trunk: httpcore-ab/pom.xml httpcore-osgi/pom.xml httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java pom.xml
Date Sun, 20 Dec 2015 11:36:24 GMT
Author: olegk
Date: Sun Dec 20 11:36:24 2015
New Revision: 1721013

URL: http://svn.apache.org/viewvc?rev=1721013&view=rev
Log:
Fixed dependency declarations for httpcore-ab and httpcore-osgi modules

Modified:
    httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
    httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
    httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
    httpcomponents/httpcore/trunk/pom.xml

Modified: httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/pom.xml?rev=1721013&r1=1721012&r2=1721013&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/pom.xml Sun Dec 20 11:36:24 2015
@@ -40,8 +40,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
@@ -61,19 +61,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>Apache ${project.name}</Bundle-Name>
-            <Bundle-SymbolicName>${project.groupId}.httpcore</Bundle-SymbolicName>
-            <_exportcontents>org.apache.hc.core5.http.*;version=${project.version}</_exportcontents>
-            <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <executions>

Modified: httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml?rev=1721013&r1=1721012&r2=1721013&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml Sun Dec 20 11:36:24 2015
@@ -46,13 +46,13 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
@@ -148,7 +148,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>Apache ${project.name}</Bundle-Name>
-            <Bundle-SymbolicName>${project.groupId}.httpcore</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.httpcore5</Bundle-SymbolicName>
             <_exportcontents>org.apache.hc.core5.*;version=${project.version}</_exportcontents>
             <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
           </instructions>

Modified: httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java?rev=1721013&r1=1721012&r2=1721013&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
Sun Dec 20 11:36:24 2015
@@ -80,8 +80,8 @@ public class Common {
                 bundle(String.format("file:%s/org.apache.httpcomponents.httpcore_%s.jar",
                         buildDir,
                         projectVersion)),
-                wrappedBundle(mavenBundle().groupId("org.apache.httpcomponents")
-                        .artifactId("httpcore")
+                wrappedBundle(mavenBundle().groupId("org.apache.httpcomponents.core5")
+                        .artifactId("httpcore5")
                         .version(projectVersion)
                         .classifier("tests"))
                 .exports("org.apache.hc.core5.http.integration")

Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=1721013&r1=1721012&r2=1721013&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Sun Dec 20 11:36:24 2015
@@ -66,9 +66,7 @@
 
   <modules>
     <module>httpcore</module>
-    <!--
     <module>httpcore-osgi</module>
-    -->
     <module>httpcore-ab</module>
   </modules>
 



Mime
View raw message