From 731603b4893ad36fad2ea5088b1f1d927d0f7d19 Mon Sep 17 00:00:00 2001
From: parrt <parrt@cs.usfca.edu>
Date: Sat, 10 Dec 2016 17:31:03 -0800
Subject: [PATCH] maven shade and bundle don't work together so i dropped
 bundle for main complete jar.

---
 runtime/Java/pom.xml |  4 ----
 tool/pom.xml         | 42 ++++++++++++++++++------------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index fb89a58bc..a4e6f6d8e 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -46,10 +46,6 @@
             <configuration>
               <instructions>
                 <Bundle-SymbolicName>org.antlr.antlr4-runtime-osgi</Bundle-SymbolicName>
-                <Implementation-Title>ANTLR 4 Runtime</Implementation-Title>
-                <Implementation-Vendor>ANTLR</Implementation-Vendor>
-                <Implementation-Vendor-Id>org.antlr</Implementation-Vendor-Id>
-                <Implementation-Version>${project.version}</Implementation-Version>
               </instructions>
             </configuration>
             <goals>
diff --git a/tool/pom.xml b/tool/pom.xml
index 975e769eb..8645a283d 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -52,13 +52,30 @@
       </testResource>
     </testResources>
     <plugins>
-      <plugin>
+      <plugin> <!-- this makes a fat jar with all dependencies -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <configuration>
+              <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+            </configuration>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin> <!-- this just jars up tool stuff and sets main class -->
         <artifactId>maven-jar-plugin</artifactId>
         <version>3.0.0</version>
         <configuration>
           <archive>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <mainClass>org.antlr.v4.Tool</mainClass>
             </manifest>
           </archive>
         </configuration>
@@ -79,29 +96,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <configuration>
-              <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <manifestEntries>
-                    <Main-Class>org.antlr.v4.Tool</Main-Class>
-                  </manifestEntries>
-                </transformer>
-              </transformers>
-            </configuration>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>