Merge pull request antlr#22 from sharwell/update-metadata

Updated OSGi metadata for runtime bundles

pom.xml

@@ -17,8 +17,12 @@
     <url>http://www.antlr.org</url>
     <inceptionYear>1992</inceptionYear>
     <organization>
-        <name>ANTLR</name>
-        <url>http://www.antlr.org</url>
+        <!--
+          The organization name is used in the manifests of the Jar files. Set to Tunnel Vision Labs for this custom
+          build.
+        -->
+        <name>Tunnel Vision Laboratories, LLC</name>
+        <url>http://tunnelvisionlabs.com</url>
     </organization>
 
     <licenses>
@@ -134,6 +138,40 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>jdk6-bnd</id>
+            <activation>
+                <jdk>1.6</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>maven-bundle-plugin</artifactId>
+                        <version>2.5.4</version>
+                        <extensions>true</extensions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>jdk7plus-bnd</id>
+            <activation>
+                <jdk>!1.6</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>maven-bundle-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <extensions>true</extensions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>

runtime/Java/pom.xml

@@ -11,8 +11,9 @@
 
     <artifactId>antlr4-runtime</artifactId>
 
-    <name>ANTLR 4 Runtime</name>
-    <description>The ANTLR 4 Runtime</description>
+    <name>ANTLR 4 Runtime (Optimized)</name>
+    <description>The ANTLR 4 Runtime (Optimized)</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <!-- Assumes dot is in the system path, or specified for the build. -->
@@ -124,40 +125,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.4</version>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <configuration>
-                            <instructions>
-                                <Bundle-SymbolicName>com.tunnelvisionlabs.antlr4-runtime-osgi</Bundle-SymbolicName>
-                                <Implementation-Title>ANTLR 4 Runtime (Optimized)</Implementation-Title>
-                                <Implementation-Vendor>Tunnel Vision Laboratories, LLC</Implementation-Vendor>
-                                <Implementation-Vendor-Id>com.tunnelvisionlabs</Implementation-Vendor-Id>
-                                <Implementation-Version>${project.version}</Implementation-Version>
-                            </instructions>
-                        </configuration>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

runtime/JavaAnnotations/pom.xml

@@ -13,6 +13,7 @@
 
     <name>ANTLR 4 Runtime Annotations</name>
     <description>A set of annotations used within the ANTLR 4 Runtime</description>
+    <packaging>bundle</packaging>
 
     <build>
         <sourceDirectory>src</sourceDirectory>