diff options
| author | Olivier Lamy <olamy@apache.org> | 2014-02-08 12:04:47 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2014-02-08 12:04:47 +0000 |
| commit | 10553cbf4255c350ba32e0e4c86de8165f469be7 (patch) | |
| tree | fb6c8a65ea377ff3f2365c5872f8c4fec8d67a93 /archiva-jetty | |
| parent | 16dcdfb944a7b356c11b03378664c0baac73a8e3 (diff) | |
| download | archiva-10553cbf4255c350ba32e0e4c86de8165f469be7.tar.gz archiva-10553cbf4255c350ba32e0e4c86de8165f469be7.zip | |
ensure ARCHIVA_BASE works
Previous workaround failed due to the ordering of wrapper.conf, so now we
leave the current mechanism in place, but workaround the APPASM bug by
replacing set.ARCHIVA_BASE=. with set.default.ARCHIVA_BASE=.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1566000 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-jetty')
| -rw-r--r-- | archiva-jetty/pom.xml | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index aa26ebddd..e97fbdcde 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -196,27 +196,12 @@ <goal>generate-daemons</goal> <goal>create-repository</goal> </goals> + <phase>prepare-package</phase> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptor>src/main/assembly/bin.xml</descriptor> - <finalName>apache-archiva-${project.version}</finalName> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -235,6 +220,20 @@ <goal>run</goal> </goals> </execution> + <execution> + <id>fix-appassembler-bug</id> + <phase>prepare-package</phase> + <configuration> + <tasks> + <replaceregexp + file="target/generated-resources/appassembler/jsw/archiva/conf/wrapper.conf" + match="set.ARCHIVA_BASE" replace="set.default.ARCHIVA_BASE" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> </executions> </plugin> <plugin> @@ -245,6 +244,22 @@ </supplementalModels> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptor>src/main/assembly/bin.xml</descriptor> + <finalName>apache-archiva-${project.version}</finalName> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> |