Remove use of maven-shade-plugin causing some Netbeans bug.

It shouldn't be necessary anyway.
Marco-Marin · Apr 17, 2016 · b9ab16d · b9ab16d
1 parent a4af95d
commit b9ab16d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/Mage.Server/src/main/java/mage/server/record/TableRecord.java b/Mage.Server/src/main/java/mage/server/record/TableRecord.java
@@ -1,10 +1,10 @@
 package mage.server.record;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import mage.game.result.ResultProtos.TableProto;
-import org.mage.mage.shaded.protobuf.InvalidProtocolBufferException;
 import org.apache.log4j.Logger;
 
 @DatabaseTable(tableName = "table_history")

diff --git a/Mage.Server/src/main/java/mage/server/record/UserStats.java b/Mage.Server/src/main/java/mage/server/record/UserStats.java
@@ -1,10 +1,10 @@
 package mage.server.record;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import mage.game.result.ResultProtos.UserStatsProto;
-import org.mage.mage.shaded.protobuf.InvalidProtocolBufferException;
 import org.apache.log4j.Logger;
 
 @DatabaseTable(tableName = "user_stats")

diff --git a/Mage/pom.xml b/Mage/pom.xml
@@ -141,28 +141,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--  shade protobuf to avoid version conflicts -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>${maven-shade-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.google.protobuf</pattern>
-                                    <shadedPattern>${project.groupId}.${project.artifactId}.shaded.protobuf</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
 
         <finalName>mage</finalName>