瀏覽代碼

Fixing up pom.xml.
Fixing static import error that causes lombok to not work.

Sam Jaffe 8 年之前
父節點
當前提交
69988019ae

+ 12 - 12
pom.xml

@@ -33,13 +33,24 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		<sourceDirectory>target/generated-sources/delombok</sourceDirectory>
 		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<compilerVersion>1.8</compilerVersion>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok-maven-plugin</artifactId>
 				<version>1.16.18.0</version>
 				<executions>
 					<execution>
+						<id>delombok</id>
 						<phase>generate-sources</phase>
 						<goals>
 							<goal>delombok</goal>
@@ -47,21 +58,10 @@
 					</execution>
 				</executions>
 				<configuration>
+					<addOutputDirectory>false</addOutputDirectory>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5</version>
-				<configuration>
-					<sourceDirectory>target/generated-sources</sourceDirectory>
-					<source>1.8</source>
-					<target>1.8</target>
-					<annotationProcessors>
-						<annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
-					</annotationProcessors>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>

+ 1 - 1
src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Duration.java

@@ -1,6 +1,6 @@
 package org.leumasjaffe.charsheet.model.magic.dimension;
 
-import static org.leumasjaffe.charsheet.config.Constants.K_DURATION;
+import static org.leumasjaffe.charsheet.config.Constants.*;
 import static org.leumasjaffe.charsheet.config.Constants.DurationMeasurement.*;
 
 import org.leumasjaffe.charsheet.config.Config;

+ 1 - 1
src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Range.java

@@ -11,7 +11,7 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-import static org.leumasjaffe.charsheet.config.Constants.K_DISTANCE;
+import static org.leumasjaffe.charsheet.config.Constants.*;
 import static org.leumasjaffe.charsheet.config.Constants.DistanceMeasurement.*;
 
 public interface Range {