hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-19 07:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tuning Up build process for dspace-solr, uses separate directories now for applying patches.

Browse Source
This commit is contained in:
Mark Diggory
2010-02-25 13:18:46 +00:00
parent 50468a1af7
commit d15ce96aa7
5 changed files with 203 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
common/pom.xml
View File

@@ -40,38 +40,56 @@
</developerConnection> </developerConnection>
</scm> </scm>
<profiles> <build>
<profile> <plugins>
<id>patch</id> <plugin>
<activation> <artifactId>maven-antrun-plugin</artifactId>
<activeByDefault>false</activeByDefault> <executions>
</activation> <execution>
<build> <phase>generate-sources</phase>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
<version>1.0</version>
<configuration> <configuration>
<patches> <tasks>
<patch>common.patch</patch> <delete dir="{project.build.directory}/generated-sources"/>
</patches> <copy
todir="${project.build.directory}/generated-sources/main/java">
<fileset dir="src/main/external-java" />
</copy>
</tasks>
<sourceRoot>
${project.build.directory}/generated-sources/main/java
</sourceRoot>
<testSourceRoot>
${project.build.directory}/generated-sources/test/java
</testSourceRoot>
</configuration> </configuration>
<executions> <goals>
<execution> <goal>run</goal>
<id>patch</id> </goals>
<phase>process-sources</phase> </execution>
<goals> </executions>
<goal>apply</goal> </plugin>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
<configuration>
<patchFile>src/main/patches/common.patch</patchFile>
<targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>apply</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>
<!-- Solr --> <!-- Solr -->

79
core/pom.xml
View File

@@ -40,37 +40,58 @@
</developerConnection> </developerConnection>
</scm> </scm>
<profiles> <build>
<profile> <plugins>
<id>patch</id>
<activation> <plugin>
<activeByDefault>false</activeByDefault> <artifactId>maven-antrun-plugin</artifactId>
</activation> <executions>
<build> <execution>
<plugins> <phase>generate-sources</phase>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
<version>1.0</version>
<configuration> <configuration>
<patches> <tasks>
<patch>core.patch</patch>
</patches> <delete dir="{project.build.directory}/generated-sources"/>
<copy
todir="${project.build.directory}/generated-sources/main/java">
<fileset dir="src/main/external-java" />
</copy>
</tasks>
<sourceRoot>
${project.build.directory}/generated-sources/main/java
</sourceRoot>
<testSourceRoot>
${project.build.directory}/generated-sources/test/java
</testSourceRoot>
</configuration> </configuration>
<executions> <goals>
<execution> <goal>run</goal>
<id>patch</id> </goals>
<phase>process-sources</phase> </execution>
<goals> </executions>
<goal>apply</goal> </plugin>
</goals>
</execution> <plugin>
</executions> <groupId>org.apache.maven.plugins</groupId>
</plugin> <artifactId>maven-patch-plugin</artifactId>
</plugins> <configuration>
</build> <patchFile>src/main/patches/core.patch</patchFile>
</profile> <targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
</profiles> </configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>apply</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>
<!-- Solr --> <!-- Solr -->

6
pom.xml
View File

@@ -72,7 +72,7 @@
<id>maven.dspace.org-snapshot</id> <id>maven.dspace.org-snapshot</id>
<name>DSpace Maven Repository</name> <name>DSpace Maven Repository</name>
<url>scp://maven.dspace.org/var/maven/snapshot</url> <url>scp://maven.dspace.org/var/maven/snapshot</url>
<uniqueVersion>false</uniqueVersion> <uniqueVersion>true</uniqueVersion>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
@@ -122,8 +122,12 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>

79
server/pom.xml
View File

@@ -39,38 +39,6 @@
</developerConnection> </developerConnection>
</scm> </scm>
<profiles>
<profile>
<id>patch</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
<version>1.0</version>
<configuration>
<patches>
<patch>webapp.patch</patch>
</patches>
</configuration>
<executions>
<execution>
<id>patch</id>
<phase>process-sources</phase>
<goals>
<goal>apply</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@@ -82,6 +50,53 @@
<classesClassifier>classes</classesClassifier> <classesClassifier>classes</classesClassifier>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<tasks>
<delete dir="{project.build.directory}/generated-sources/main/java"/>
<copy
todir="${project.build.directory}/generated-sources/main/java">
<fileset dir="src/main/external-java" />
</copy>
</tasks>
<sourceRoot>
${project.build.directory}/generated-sources/main/java
</sourceRoot>
<testSourceRoot>
${project.build.directory}/generated-sources/test/java
</testSourceRoot>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
<configuration>
<patchFile>src/main/patches/webapp.patch</patchFile>
<targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>apply</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

82
solrj/pom.xml
View File

@@ -41,37 +41,57 @@
</developerConnection> </developerConnection>
</scm> </scm>
<profiles> <build>
<profile> <plugins>
<id>patch</id>
<activation> <plugin>
<activeByDefault>false</activeByDefault> <artifactId>maven-antrun-plugin</artifactId>
</activation> <executions>
<build> <execution>
<plugins> <phase>generate-sources</phase>
<plugin> <configuration>
<groupId>org.apache.maven.plugins</groupId> <tasks>
<artifactId>maven-patch-plugin</artifactId>
<version>1.0</version> <delete dir="{project.build.directory}/generated-sources/main/java"/>
<configuration> <copy
<patches> todir="${project.build.directory}/generated-sources/main/java">
<patch>solrj.patch</patch> <fileset dir="src/main/external-java" />
</patches> </copy>
</configuration> </tasks>
<executions> <sourceRoot>
<execution> ${project.build.directory}/generated-sources/main/java
<id>patch</id> </sourceRoot>
<phase>process-sources</phase> <testSourceRoot>
<goals> ${project.build.directory}/generated-sources/test/java
<goal>apply</goal> </testSourceRoot>
</goals> </configuration>
</execution> <goals>
</executions> <goal>run</goal>
</plugin> </goals>
</plugins> </execution>
</build> </executions>
</profile> </plugin>
</profiles>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
<configuration>
<patchFile>src/main/patches/solrj.patch</patchFile>
<targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>apply</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>