httpcore5-parent 5.0-alpha1 RC1 tag

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/tags/5.0-alpha1-RC1@1721016 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 20, 2015 · 027c097 · 027c097
2 parents 5212d77 + 99c7bb8
commit 027c097
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 25 deletions.
diff --git a/httpcore-ab/pom.xml b/httpcore-ab/pom.xml
@@ -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>
@@ -60,19 +60,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>

diff --git a/httpcore-osgi/pom.xml b/httpcore-osgi/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents.core5</groupId>
     <artifactId>httpcore5-parent</artifactId>
-    <version>5.0-alpha1-SNAPSHOT</version>
+    <version>5.0-alpha1</version>
   </parent>
   <artifactId>httpcore5-osgi</artifactId>
   <name>Apache HttpComponents Core OSGi bundle</name>
@@ -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>

diff --git a/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java b/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
@@ -80,8 +80,8 @@ public static Option[] config() {
                 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")

diff --git a/pom.xml b/pom.xml
@@ -66,9 +66,7 @@
 
   <modules>
     <module>httpcore</module>
-    <!--
     <module>httpcore-osgi</module>
-    -->
     <module>httpcore-ab</module>
   </modules>