Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove legacy build, users are confused by the 2 different jar files

Browse Source
This commit is contained in:
Gabriele C 2017-06-22 23:23:11 +02:00
parent 886e3b2f1e
commit e8b3bb5d9d
2 changed files with 53 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
circle.yml
View File

@ -8,9 +8,8 @@ test:
override: override:
- mvn clean install -B - mvn clean install -B
post: post:
- cp ./target/AuthMe-*-spigot.jar $CIRCLE_ARTIFACTS - cp ./target/AuthMe-*.jar $CIRCLE_ARTIFACTS
- cp ./target/AuthMe-*-legacy.jar $CIRCLE_ARTIFACTS - cp ./target/AuthMe-*.jar $CIRCLE_ARTIFACTS/AuthMe.jar
- cp ./target/AuthMe-*-spigot.jar $CIRCLE_ARTIFACTS/AuthMe.jar
- mkdir -p $CIRCLE_TEST_REPORTS/junit/ - mkdir -p $CIRCLE_TEST_REPORTS/junit/
- find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
notify: notify:

78
pom.xml
View File

@ -53,7 +53,6 @@
<project.buildNumber>CUSTOM</project.buildNumber> <project.buildNumber>CUSTOM</project.buildNumber>
<project.skipExtendedHashTests>false</project.skipExtendedHashTests> <project.skipExtendedHashTests>false</project.skipExtendedHashTests>
<project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode> <project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode>
<project.finalName>${project.outputName}-${project.version}</project.finalName>
<!-- BukkitPlugin properties --> <!-- BukkitPlugin properties -->
<bukkitplugin.name>${project.outputName}</bukkitplugin.name> <bukkitplugin.name>${project.outputName}</bukkitplugin.name>
@ -62,7 +61,7 @@
<bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008</bukkitplugin.authors> <bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008</bukkitplugin.authors>
<!-- Change Bukkit Version HERE! --> <!-- Change Bukkit Version HERE! -->
<bukkit.version>1.11-R0.1-SNAPSHOT</bukkit.version> <bukkit.version>1.12-R0.1-SNAPSHOT</bukkit.version>
</properties> </properties>
<!-- Jenkins profile --> <!-- Jenkins profile -->
@ -161,8 +160,7 @@
</profiles> </profiles>
<build> <build>
<!-- Name of the unshaded jar (no shaded/relocated libraries) --> <finalName>${project.outputName}-${project.version}</finalName>
<finalName>${project.finalName}-noshade</finalName>
<resources> <resources>
<resource> <resource>
@ -211,80 +209,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version> <version>3.0.0</version>
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
<!-- <!--
Relocate all lib we use in order to fix class loading errors if we use different versions Relocate all lib we use in order to fix class loading errors if we use different versions
than already loaded libs (i.e. by Mojang -> gson) than already loaded libs (i.e. by Mojang -> gson)
--> -->
<executions>
<!-- Spigot 1.12+ -->
<execution>
<id>spigot-shade</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<!-- Exclude guava (already included into spigot) -->
<artifactSet>
<excludes>
<exclude>com.google.guava:guava</exclude>
<exclude>com.google.code.gson:gson</exclude>
</excludes>
</artifactSet>
<relocations>
<relocation>
<pattern>ch.jalu.injector</pattern>
<shadedPattern>fr.xephi.authme.libs.jalu.injector</shadedPattern>
</relocation>
<relocation>
<pattern>ch.jalu.configme</pattern>
<shadedPattern>fr.xephi.authme.libs.jalu.configme</shadedPattern>
</relocation>
<relocation>
<pattern>com.zaxxer.hikari</pattern>
<shadedPattern>fr.xephi.authme.libs.zaxxer.hikari</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>fr.xephi.authme.libs.slf4j.slf4j</shadedPattern>
</relocation>
<relocation>
<pattern>com.maxmind.geoip</pattern>
<shadedPattern>fr.xephi.authme.libs.maxmind.geoip</shadedPattern>
</relocation>
<relocation>
<pattern>net.ricecode.similarity</pattern>
<shadedPattern>fr.xephi.authme.libs.ricecode.similarity</shadedPattern>
</relocation>
<relocation>
<pattern>de.rtner</pattern>
<shadedPattern>fr.xephi.authme.libs.de.rtner</shadedPattern>
</relocation>
<relocation>
<pattern>javax.inject</pattern>
<shadedPattern>fr.xephi.authme.libs.javax.inject</shadedPattern>
</relocation>
<!-- bStats metrics class -->
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>fr.xephi.authme.libs.org.bstats</shadedPattern>
</relocation>
</relocations>
<outputFile>target/${project.finalName}-spigot.jar</outputFile>
</configuration>
</execution>
<!-- 1.11.2 and lower -->
<execution>
<id>legacy-shade</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<relocations> <relocations>
<!-- Include all google libraries, because they are not available before 1.12 --> <!-- Include all google libraries, because they are not available before 1.12 -->
<relocation> <relocation>
@ -329,10 +260,7 @@
<shadedPattern>fr.xephi.authme.libs.org.bstats</shadedPattern> <shadedPattern>fr.xephi.authme.libs.org.bstats</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
<outputFile>target/${project.finalName}-legacy.jar</outputFile>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
<!-- Coverage report generator --> <!-- Coverage report generator -->
<plugin> <plugin>