Fix javadoc pom and reformat other poms

This commit is contained in:
fullwall 2019-05-13 16:44:50 +08:00
parent 47ee8da773
commit 68e5fb2570
9 changed files with 199 additions and 201 deletions

179
dist/pom.xml vendored
View File

@ -1,90 +1,91 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <modelVersion>4.0.0</modelVersion>
<groupId>net.citizensnpcs</groupId> <parent>
<artifactId>citizens-parent</artifactId> <groupId>net.citizensnpcs</groupId>
<version>2.0.25-SNAPSHOT</version> <artifactId>citizens-parent</artifactId>
</parent> <version>2.0.25-SNAPSHOT</version>
<artifactId>citizens</artifactId> </parent>
<packaging>pom</packaging> <artifactId>citizens</artifactId>
<build> <packaging>pom</packaging>
<plugins> <build>
<plugin> <plugins>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<configuration> <artifactId>maven-assembly-plugin</artifactId>
<finalName>Citizens-${CITIZENS_VERSION}-b${BUILD_NUMBER}</finalName> <configuration>
<appendAssemblyId>false</appendAssemblyId> <finalName>Citizens-${CITIZENS_VERSION}-b${BUILD_NUMBER}</finalName>
</configuration> <appendAssemblyId>false</appendAssemblyId>
<version>3.1.1</version> </configuration>
<executions> <version>3.1.1</version>
<execution> <executions>
<id>package-all</id> <execution>
<phase>package</phase> <id>package-all</id>
<goals> <phase>package</phase>
<goal>single</goal> <goals>
</goals> <goal>single</goal>
<configuration> </goals>
<appendAssemblyId>false</appendAssemblyId> <configuration>
<descriptors> <appendAssemblyId>false</appendAssemblyId>
<descriptor>src/main/assembly/all-jar.xml</descriptor> <descriptors>
</descriptors> <descriptor>src/main/assembly/all-jar.xml</descriptor>
</configuration> </descriptors>
</execution> </configuration>
</executions> </execution>
</plugin> </executions>
</plugins> </plugin>
</build> </plugins>
<dependencies> </build>
<dependency> <dependencies>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>citizens-main</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>citizens-main</artifactId>
<type>jar</type> <version>${project.version}</version>
<scope>compile</scope> <type>jar</type>
</dependency> <scope>compile</scope>
<dependency> </dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>citizens-v1_8_R3</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>citizens-v1_8_R3</artifactId>
<type>jar</type> <version>${project.version}</version>
<scope>compile</scope> <type>jar</type>
</dependency> <scope>compile</scope>
<dependency> </dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>citizens-v1_10_R1</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>citizens-v1_10_R1</artifactId>
<type>jar</type> <version>${project.version}</version>
<scope>compile</scope> <type>jar</type>
</dependency> <scope>compile</scope>
<dependency> </dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>citizens-v1_11_R1</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>citizens-v1_11_R1</artifactId>
<type>jar</type> <version>${project.version}</version>
<scope>compile</scope> <type>jar</type>
</dependency> <scope>compile</scope>
<dependency> </dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>citizens-v1_12_R1</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>citizens-v1_12_R1</artifactId>
<type>jar</type> <version>${project.version}</version>
<scope>compile</scope> <type>jar</type>
</dependency> <scope>compile</scope>
<dependency> </dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>citizens-v1_13_R2</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>citizens-v1_13_R2</artifactId>
<type>jar</type> <version>${project.version}</version>
<scope>compile</scope> <type>jar</type>
</dependency> <scope>compile</scope>
<dependency> </dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>citizens-v1_14_R1</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>citizens-v1_14_R1</artifactId>
<type>jar</type> <version>${project.version}</version>
<scope>compile</scope> <type>jar</type>
</dependency> <scope>compile</scope>
</dependencies> </dependency>
</dependencies>
</project> </project>

View File

@ -16,7 +16,7 @@
<craftbukkit.version>1.14-R0.1-SNAPSHOT</craftbukkit.version> <craftbukkit.version>1.14-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>${project.version}</citizensapi.version> <citizensapi.version>${project.version}</citizensapi.version>
<powermock.version>1.4.12</powermock.version> <powermock.version>1.4.12</powermock.version>
<bstats.version>1.4</bstats.version> <bstats.version>1.5</bstats.version>
</properties> </properties>
<repositories> <repositories>
@ -164,33 +164,24 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
<executions> <configuration>
<execution> <source>8</source>
<id>javadoc-jar</id> <author>false</author>
<phase>package</phase> <doclint>none</doclint>
<goals> <links>
<goal>jar</goal> <link>https://hub.spigotmc.org/javadocs/spigot</link>
</goals> </links>
<configuration> <includeDependencySources>true</includeDependencySources>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes> <dependencySourceIncludes>
<dependencySourceInclude>net.citizensnpcs.api:*</dependencySourceInclude> <dependencySourceInclude>net.citizensnpcs:citizensapi</dependencySourceInclude>
</dependencySourceIncludes> </dependencySourceIncludes>
</configuration>
<source>8</source>
<author>false</author>
<doclint>none</doclint>
<links>
<link>https://hub.spigotmc.org/javadocs/spigot</link>
</links>
</configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

48
pom.xml
View File

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.25-SNAPSHOT</version> <version>2.0.25-SNAPSHOT</version>
<properties> <properties>
<BUILD_NUMBER>Unknown</BUILD_NUMBER> <BUILD_NUMBER>Unknown</BUILD_NUMBER>
<CITIZENS_VERSION>2.0.25</CITIZENS_VERSION> <CITIZENS_VERSION>2.0.25</CITIZENS_VERSION>
</properties> </properties>
<build> <build>
<defaultGoal>clean package install</defaultGoal> <defaultGoal>clean package install</defaultGoal>
</build> </build>
<modules> <modules>
<module>main</module> <module>main</module>
<module>v1_8_R3</module> <module>v1_8_R3</module>
<module>v1_10_R1</module> <module>v1_10_R1</module>
<module>v1_11_R1</module> <module>v1_11_R1</module>
<module>v1_12_R1</module> <module>v1_12_R1</module>
<module>v1_13_R2</module> <module>v1_13_R2</module>
<module>v1_14_R1</module> <module>v1_14_R1</module>
<module>dist</module> <module>dist</module>
</modules> </modules>
</project> </project>

View File

@ -1,11 +1,12 @@
<!-- Citizens build file --> <!-- Citizens build file -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.25-SNAPSHOT</version> <version>2.0.25-SNAPSHOT</version>
</parent> </parent>
<artifactId>citizens-v1_10_R1</artifactId> <artifactId>citizens-v1_10_R1</artifactId>
@ -30,12 +31,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>${craftbukkit.version}</version> <version>${craftbukkit.version}</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -71,7 +72,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,11 +1,12 @@
<!-- Citizens build file --> <!-- Citizens build file -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.25-SNAPSHOT</version> <version>2.0.25-SNAPSHOT</version>
</parent> </parent>
<artifactId>citizens-v1_11_R1</artifactId> <artifactId>citizens-v1_11_R1</artifactId>
@ -30,12 +31,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>${craftbukkit.version}</version> <version>${craftbukkit.version}</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -71,7 +72,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,11 +1,12 @@
<!-- Citizens build file --> <!-- Citizens build file -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.25-SNAPSHOT</version> <version>2.0.25-SNAPSHOT</version>
</parent> </parent>
<artifactId>citizens-v1_12_R1</artifactId> <artifactId>citizens-v1_12_R1</artifactId>
@ -30,12 +31,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>${craftbukkit.version}</version> <version>${craftbukkit.version}</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -71,7 +72,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,11 +1,12 @@
<!-- Citizens build file --> <!-- Citizens build file -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.25-SNAPSHOT</version> <version>2.0.25-SNAPSHOT</version>
</parent> </parent>
<artifactId>citizens-v1_13_R2</artifactId> <artifactId>citizens-v1_13_R2</artifactId>
@ -30,12 +31,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>${craftbukkit.version}</version> <version>${craftbukkit.version}</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -1,11 +1,12 @@
<!-- Citizens build file --> <!-- Citizens build file -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.25-SNAPSHOT</version> <version>2.0.25-SNAPSHOT</version>
</parent> </parent>
<artifactId>citizens-v1_14_R1</artifactId> <artifactId>citizens-v1_14_R1</artifactId>
@ -30,12 +31,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>${craftbukkit.version}</version> <version>${craftbukkit.version}</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -79,7 +80,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,11 +1,12 @@
<!-- Citizens build file --> <!-- Citizens build file -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>net.citizensnpcs</groupId> <groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.25-SNAPSHOT</version> <version>2.0.25-SNAPSHOT</version>
</parent> </parent>
<artifactId>citizens-v1_8_R3</artifactId> <artifactId>citizens-v1_8_R3</artifactId>
@ -30,12 +31,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>${craftbukkit.version}</version> <version>${craftbukkit.version}</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -71,7 +72,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>