From 29d95a0c603f15e25e53de7499208971db466d4d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 09 Dec 2013 16:24:54 +0000
Subject: [PATCH] Minor updates to pom so that it builds using Eclipse.
---
opendj-sdk/opendj-admin/pom.xml | 151 +++++++++++++++++++++++++++----------------------
1 files changed, 83 insertions(+), 68 deletions(-)
diff --git a/opendj-sdk/opendj-admin/pom.xml b/opendj-sdk/opendj-admin/pom.xml
index af9dd40..a8f8d74 100644
--- a/opendj-sdk/opendj-admin/pom.xml
+++ b/opendj-sdk/opendj-admin/pom.xml
@@ -25,7 +25,8 @@
This module includes Administration APIs for implementing LDAP Directory
client and server applications.
</description>
- <packaging>bundle</packaging>
+ <!-- Change to bundle when/if we have a need -->
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.forgerock.commons</groupId>
@@ -75,6 +76,86 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <!-- Parse the maven version to get version parts (major, minor, ...) -->
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ <!-- Add generated source directories to build -->
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/java</source>
+ <source>${project.build.directory}/generated-sources/admin</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Retrieve the SVN revision number and the build timestamp -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>generate-buildnumber</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <configuration>
+ <useLastCommittedRevision>true</useLastCommittedRevision>
+ <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-timestamp</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <configuration>
+ <format>{0,date,yyyyMMddHHmmss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ <buildNumberPropertyName>buildDateTime</buildNumberPropertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java-templates</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.forgerock.commons</groupId>
<artifactId>i18n-maven-plugin</artifactId>
<executions>
@@ -374,11 +455,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
@@ -386,67 +462,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
- <!-- Parse the maven version to get version parts (major, minor, ...) -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Retrieve the SVN revision number and the build timestamp -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>generate-buildnumber</id>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <useLastCommittedRevision>true</useLastCommittedRevision>
- <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
- </configuration>
- </execution>
- <execution>
- <id>generate-timestamp</id>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <format>{0,date,yyyyMMddHHmmss}</format>
- <items>
- <item>timestamp</item>
- </items>
- <buildNumberPropertyName>buildDateTime</buildNumberPropertyName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Filter java sources located in src/main/java-templates -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>templating-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>filter-src</id>
- <goals>
- <goal>filter-sources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<reporting>
@@ -477,4 +492,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.10.0