瀏覽代碼

prevent build order issues

It seemed that whenever the release profile was enabled, the POM ordering was
not respected causing the antrun plugin to happen before the appassembler
plugin. Move them to different, more appropriate phases.
archiva-1.3.x
Brett Porter 10 年之前
父節點
當前提交
540bd3a79f
共有 1 個文件被更改,包括 29 次插入2 次删除
  1. 29
    2
      archiva-jetty/pom.xml

+ 29
- 2
archiva-jetty/pom.xml 查看文件

@@ -191,7 +191,7 @@
<goal>generate-daemons</goal>
<goal>create-repository</goal>
</goals>
<phase>prepare-package</phase>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>
@@ -232,7 +232,7 @@
</execution>
<execution>
<id>fix-appassembler-bug</id>
<phase>prepare-package</phase>
<phase>process-resources</phase>
<configuration>
<tasks>
<replaceregexp file="target/generated-resources/appassembler/jsw/archiva/conf/wrapper.conf" match="set.ARCHIVA_BASE" replace="set.default.ARCHIVA_BASE" />
@@ -252,6 +252,33 @@
</supplementalModels>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-beanshell</id>
<goals>
<goal>enforce</goal>
</goals>
<phase>package</phase>
<configuration>
<rules>
<evaluateBeanshell>
<message>wrapper.conf should be correctly set</message>
<condition>
<![CDATA[
java.util.Properties props = new java.util.Properties();
props.load( new java.io.FileInputStream( "${project.build.directory}/generated-resources/appassembler/jsw/archiva/conf/wrapper.conf" ) );
props.getProperty( "set.default.ARCHIVA_BASE" ).equals( "." )
]]>
</condition>
</evaluateBeanshell>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

Loading…
取消
儲存