Skip to main content

[jsr236-spec commits] [concurrency-ee-spec~source-code-repository:28] Fixed OSGi bundle attributes values

  • From:
  • To:
  • Subject: [jsr236-spec commits] [concurrency-ee-spec~source-code-repository:28] Fixed OSGi bundle attributes values
  • Date: Tue, 19 Feb 2013 23:25:05 +0000

Project:    concurrency-ee-spec
Repository: source-code-repository
Revision:   28
Author:     anthony.lai
Date:       2013-02-19 23:25:03 UTC
Link:       

Log Message:
------------
Fixed OSGi bundle attributes values


Revisions:
----------
28


Modified Paths:
---------------
trunk/api/pom.xml


Diffs:
------
Index: trunk/api/osgi.bundle
===================================================================
--- trunk/api/osgi.bundle       (revision 27)
+++ trunk/api/osgi.bundle       (revision 28)
@@ -1,41 +0,0 @@
-<!--
-  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-  ~
-  ~ Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
-  ~
-  ~ The contents of this file are subject to the terms of either the GNU
-  ~ General Public License Version 2 only ("GPL") or the Common Development
-  ~ and Distribution License("CDDL") (collectively, the "License").  You
-  ~ may not use this file except in compliance with the License.  You can
-  ~ obtain a copy of the License at
-  ~ https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-  ~ or packager/legal/LICENSE.txt.  See the License for the specific
-  ~ language governing permissions and limitations under the License.
-  ~
-  ~ When distributing the software, include this License Header Notice in 
each
-  ~ file and include the License file at packager/legal/LICENSE.txt.
-  ~
-  ~ GPL Classpath Exception:
-  ~ Oracle designates this particular file as subject to the "Classpath"
-  ~ exception as provided by Oracle in the GPL Version 2 section of the 
License
-  ~ file that accompanied this code.
-  ~
-  ~ Modifications:
-  ~ If applicable, add the following below the License Header, with the 
fields
-  ~ enclosed by brackets [] replaced by your own identifying information:
-  ~ "Portions Copyright [year] [name of copyright owner]"
-  ~
-  ~ Contributor(s):
-  ~ If you wish your version of this file to be governed by only the CDDL or
-  ~ only the GPL Version 2, indicate your decision by adding "[Contributor]
-  ~ elects to include this software in this distribution under the [CDDL or 
GPL
-  ~ Version 2] license."  If you don't indicate a single choice of license, a
-  ~ recipient has the option to distribute your version of this file under
-  ~ either the CDDL, the GPL Version 2 or to extend the choice of license to
-  ~ its licensees as provided above.  However, if you add GPL Version 2 code
-  ~ and therefore, elected the GPL Version 2 license, then the option applies
-  ~ only if the new code is made subject to such option by the copyright
-  ~ holder.
-  -->
--exportcontents: \
-                        javax.enterprise.concurrent; version=1.0
Index: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml   (revision 27)
+++ trunk/api/pom.xml   (revision 28)
@@ -52,8 +52,8 @@
 
     <groupId>javax.enterprise.concurrent</groupId>
     <artifactId>javax.enterprise.concurrent-api</artifactId>
-    <version>1.0-b03-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <version>${apijar.maven.version}</version>
+    <packaging>bundle</packaging>
     <name>javax.enterprise.concurrent-api</name>
     <description>JSR 236:Concurrency Utilities for Java EE</description>
     <url>http://concurrency-ee-spec.java.net</url>
@@ -87,6 +87,22 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <api_package>javax.enterprise.concurrent</api_package>
+        <spec_version>0.0</spec_version>
+        <new_spec_version>1.0</new_spec_version>
+        <build_number>03</build_number>
+        <spec_impl_version>1.0</spec_impl_version>
+
+        <apijar.extensionName>${api_package}</apijar.extensionName>
+        
<apijar.bundle.symbolicName>${api_package}-api</apijar.bundle.symbolicName>
+        <!-- Non Final properties API and impl jar-->
+        
<apijar.maven.version>${new_spec_version}-b${build_number}</apijar.maven.version>
+        
<apijar.bundle.specversion>${spec_version}.99.b${build_number}</apijar.bundle.specversion>
+        
<apijar.bundle.version>${spec_version}.99.b${build_number}</apijar.bundle.version>
+        
<apijar.spec.version>${spec_version}.99.${build_number}</apijar.spec.version>
+        
<apijar.spec.impl.version>${new_spec_version}-b${build_number}</apijar.spec.impl.version>
+        <packages.export>javax.enterprise.concurrent.*; 
version=${apijar.bundle.version}</packages.export>
     </properties>
 
     <organization>
@@ -157,15 +173,34 @@
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>2.6</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.4</version>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
+            <!--
+              This plugin is reponsible for packaging artifacts
+              as OSGi bundles.  Please refer to
+              
http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
+              for more information about how to use this plugin.
+            -->
             <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        
<Bundle-Version>${apijar.bundle.version}</Bundle-Version>
+                        
<specversion>${apijar.bundle.specversion}</specversion>
+                        
<Bundle-SymbolicName>${apijar.bundle.symbolicName}</Bundle-SymbolicName>
+                        <Export-Package>${packages.export}</Export-Package>
+                        
<Specification-Version>${apijar.spec.version}</Specification-Version>
+                        
<Implementation-Version>${apijar.spec.impl.version}</Implementation-Version>
+                        
<Extension-Name>${apijar.extensionName}</Extension-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -282,27 +317,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <!-- By default, we don't export anything.
-                    -->
-                    <Export-Package />
-                    <instructions>
-                        <_include>-${basedir}/osgi.bundle</_include>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 





[jsr236-spec commits] [concurrency-ee-spec~source-code-repository:28] Fixed OSGi bundle attributes values

anthony . lai 02/19/2013
 
 
Close
loading
Please Confirm
Close