github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-13 09:19:53 -09:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
It shouldn't be necessary anyway.
This commit is contained in:
emerald000 2016-04-17 19:23:38 -04:00
parent a4af95d775
commit b9ab16d945
3 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/src/main/java/mage/server/record/TableRecord.java
View file

@ -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")

2
Mage.Server/src/main/java/mage/server/record/UserStats.java
View file

@ -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")

22
Mage/pom.xml
View file

@ -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>