simlu
/
voxelshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- hopefully proper fix for https://github.com/simlu/voxelshop/issues/281

develop
blackflux 2018-04-06 22:17:11 -07:00
parent 05d99b6a90
commit 4094dd1ef3
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_1.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: javax.annotation:javax.annotation-api:1.3.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.1/javax.annotation-api-1.3.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.1/javax.annotation-api-1.3.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.1/javax.annotation-api-1.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

1
PS4k.iml
View File

@ -317,7 +317,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="module-library">
<library name="Maven: org.junit:org.springframework.orm:4.12.0">

BIN
lib/spring/javax.annotation-api-1.3.2.jar Normal file
View File

Binary file not shown.

7
pom.xml
View File

@ -161,6 +161,7 @@
./lib/trove-3.0.3.jar
./lib/jpct-1.15.0.jar
./lib/commons-logging-1.1.1.jar
./lib/javax.annotation-api-1.3.2.jar
./lib/log4j-1.2.17.jar
./lib/org.springframework.asm-3.1.2.jar
./lib/org.springframework.aspects-3.1.2.jar
@ -411,9 +412,11 @@
</dependency>
<dependency>
<!-- fix for https://github.com/simlu/voxelshop/issues/281 -->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.1</version>
<groupId>javax.annotation</groupId>
<scope>system</scope>
<version>1.3.2</version>
<systemPath>${project.basedir}/lib/spring/javax.annotation-api-1.3.2.jar</systemPath>
</dependency>
<dependency>
<groupId>junit</groupId>