Merge pull request #283 from simlu/develop

fix for #281
simlu · Apr 7, 2018 · 50866d1 · 50866d1
2 parents 05d99b6 + 4094dd1
commit 50866d1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_1.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_1.xml
diff --git a/PS4k.iml b/PS4k.iml
@@ -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">

diff --git a/lib/spring/javax.annotation-api-1.3.2.jar b/lib/spring/javax.annotation-api-1.3.2.jar
diff --git a/pom.xml b/pom.xml
@@ -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>