mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2025-12-09 16:45:44 -07:00
Reverted last commit and fixed the root cause of package info issue
This commit is contained in:
parent
5f6bbf4d63
commit
7f9656d40a
7 changed files with 57 additions and 102 deletions
122
Server/pom.xml
122
Server/pom.xml
|
|
@ -196,23 +196,22 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<maxmem>1024m</maxmem>
|
<maxmem>1024m</maxmem>
|
||||||
<useIncrementalCompilation>false</useIncrementalCompilation>
|
<useIncrementalCompilation>false</useIncrementalCompilation>
|
||||||
<compilerArgs>
|
<compilerArgs>
|
||||||
<arg>-XDcompilePolicy=simple</arg>
|
<arg>-XDcompilePolicy=simple</arg>
|
||||||
<arg>-Xpkginfo:always</arg>
|
<!-- <arg>-Xplugin:ErrorProne</arg> uncomment when fixing java static analysis errors !-->
|
||||||
<!-- <arg>-Xplugin:ErrorProne</arg> uncomment when fixing java static analysis errors !-->
|
</compilerArgs>
|
||||||
</compilerArgs>
|
<annotationProcessorPaths>
|
||||||
<annotationProcessorPaths>
|
<path>
|
||||||
<path>
|
<groupId>com.google.errorprone</groupId>
|
||||||
<groupId>com.google.errorprone</groupId>
|
<artifactId>error_prone_core</artifactId>
|
||||||
<artifactId>error_prone_core</artifactId>
|
<version>2.9.0</version>
|
||||||
<version>2.9.0</version>
|
</path>
|
||||||
</path>
|
<!-- Other annotation processors go here.
|
||||||
<!-- Other annotation processors go here.
|
|
||||||
|
|
||||||
If 'annotationProcessorPaths' is set, processors will no longer be
|
If 'annotationProcessorPaths' is set, processors will no longer be
|
||||||
discovered on the regular -classpath; see also 'Using Error Prone
|
discovered on the regular -classpath; see also 'Using Error Prone
|
||||||
together with other annotation processors' below. -->
|
together with other annotation processors' below. -->
|
||||||
</annotationProcessorPaths>
|
</annotationProcessorPaths>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<!-- Replacing default-compile as it is treated specially by maven -->
|
<!-- Replacing default-compile as it is treated specially by maven -->
|
||||||
|
|
@ -258,59 +257,52 @@
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>exec-maven-plugin</artifactId>
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
<version>1.2.1</version>
|
<version>1.2.1</version>
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>exec</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<mainClass>rs09.Server</mainClass>
|
<mainClass>rs09.Server</mainClass>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
<version>1.8</version>
|
<version>1.8</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<!-- This can be run separately with mvn antrun:run@detekt -->
|
<!-- This can be run separately with mvn antrun:run@detekt -->
|
||||||
<id>detekt</id>
|
<id>detekt</id>
|
||||||
<phase>verify</phase>
|
<phase>verify</phase>
|
||||||
<configuration>
|
<configuration>
|
||||||
<target name="detekt">
|
<target name="detekt">
|
||||||
<java taskname="detekt" dir="${basedir}"
|
<java taskname="detekt" dir="${basedir}"
|
||||||
fork="true"
|
fork="true"
|
||||||
failonerror="true"
|
failonerror="true"
|
||||||
classname="io.gitlab.arturbosch.detekt.cli.Main"
|
classname="io.gitlab.arturbosch.detekt.cli.Main"
|
||||||
classpathref="maven.plugin.classpath">
|
classpathref="maven.plugin.classpath">
|
||||||
<arg value="--input"/>
|
<arg value="--input"/>
|
||||||
<arg value="${basedir}/src/main/kotlin"/>
|
<arg value="${basedir}/src/main/kotlin"/>
|
||||||
<arg value="--excludes"/>
|
<arg value="--excludes"/>
|
||||||
<arg value="**/special/package/internal/**"/>
|
<arg value="**/special/package/internal/**"/>
|
||||||
<arg value="--report"/>
|
<arg value="--report"/>
|
||||||
<arg value="xml:${basedir}/reports/detekt.xml"/>
|
<arg value="xml:${basedir}/reports/detekt.xml"/>
|
||||||
<arg value="--config"/>
|
<arg value="--config"/>
|
||||||
<arg value="${basedir}/detekt.yml"/>
|
<arg value="${basedir}/detekt.yml"/>
|
||||||
<!--
|
<!--
|
||||||
<arg value="-b" />
|
<arg value="-b" />
|
||||||
<arg value="${basedir}/reports/baseline.xml"/>
|
<arg value="${basedir}/reports/baseline.xml"/>
|
||||||
-->
|
-->
|
||||||
</java>
|
</java>
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
<goals><goal>run</goal></goals>
|
<goals><goal>run</goal></goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.gitlab.arturbosch.detekt</groupId>
|
<groupId>io.gitlab.arturbosch.detekt</groupId>
|
||||||
<artifactId>detekt-cli</artifactId>
|
<artifactId>detekt-cli</artifactId>
|
||||||
<version>1.21.0</version>
|
<version>1.21.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<repositories>
|
<repositories>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
/**
|
|
||||||
* Holds all the plugin classes.
|
|
||||||
*
|
|
||||||
* @author Emperor
|
|
||||||
*/
|
|
||||||
package core.game.content.activity;
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
/**
|
|
||||||
* Holds more important content classes.
|
|
||||||
*
|
|
||||||
* @author Emperor
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package core.game.content;
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
/**
|
|
||||||
* @author Leewo
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package core.game.node.entity.skill.construction.decoration.costume;
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
/**
|
|
||||||
* @author Adam
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package core.game.node.entity.skill.fletching.items;
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
/**
|
|
||||||
* Holds skill-related plugins.
|
|
||||||
*
|
|
||||||
* @author Emperor
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package core.game.node.entity.skill;
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
/**
|
|
||||||
* Used for handling important aspects of the game.
|
|
||||||
*
|
|
||||||
* @author Emperor
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package core.game;
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue