Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 12:46:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:CitizensDev/Citizens2

Browse Source
This commit is contained in:
fullwall 2018-10-29 22:34:40 +08:00
commit 7dd03e4c36
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/pom.xml vendored
View File

@ -13,6 +13,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>Citizens-${CITIZENS_VERSION}-b${BUILD_NUMBER}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<version>2.2</version> <version>2.2</version>
<executions> <executions>
<execution> <execution>

2
main/pom.xml
View File

@ -17,8 +17,6 @@
<vault.version>1.5.4</vault.version> <vault.version>1.5.4</vault.version>
<powermock.version>1.4.12</powermock.version> <powermock.version>1.4.12</powermock.version>
<bstats.version>1.2</bstats.version> <bstats.version>1.2</bstats.version>
<build.number>Unknown</build.number>
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
</properties> </properties>
<repositories> <repositories>

7
pom.xml
View File

@ -8,6 +8,13 @@
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.24-SNAPSHOT</version> <version>2.0.24-SNAPSHOT</version>
<properties>
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
<CITIZENS_VERSION>2.0.24</CITIZENS_VERSION>
</properties>
<build>
<defaultGoal>clean package install</defaultGoal>
</build>
<modules> <modules>
<module>main</module> <module>main</module>
<module>v1_8_R3</module> <module>v1_8_R3</module>