Browse Source

Fix generated resources for IDE

pull/6/head
Dave Syer 11 years ago
parent
commit
98548ba34b
  1. 9
      spring-cloud-netflix-eureka-server/pom.xml
  2. 1
      spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java

9
spring-cloud-netflix-eureka-server/pom.xml

@ -83,6 +83,9 @@ @@ -83,6 +83,9 @@
<build>
<resources>
<resource>
<directory>${project.build.directory}/generated-resources</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
<excludes>
@ -118,7 +121,7 @@ @@ -118,7 +121,7 @@
<version>${wro4j.version}</version>
<executions>
<execution>
<phase>process-resources</phase>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
@ -126,7 +129,7 @@ @@ -126,7 +129,7 @@
</executions>
<configuration>
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
<destinationFolder>${project.build.directory}/classes/static/eureka/</destinationFolder>
<destinationFolder>${project.build.directory}/generated-resources/static/eureka/</destinationFolder>
<wroFile>${project.build.directory}/wro/eureka/wro.xml</wroFile>
<extraConfigFile>${basedir}/src/main/resources/wro/eureka/wro.properties</extraConfigFile>
</configuration>
@ -137,7 +140,7 @@ @@ -137,7 +140,7 @@
<executions>
<execution>
<id>add-resource</id>
<phase>process-resources</phase>
<phase>generate-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>

1
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java

@ -7,7 +7,6 @@ import java.util.Map; @@ -7,7 +7,6 @@ import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.IntegrationTest;

Loading…
Cancel
Save