FELIX-2712 Add Gogo commands and ensure proper compilation
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1052345 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index 3faa9eb..aa2118a 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -99,6 +99,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>0.6.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
<version>2.2.2</version>
@@ -181,6 +187,11 @@
</Private-Package>
<Import-Package>
<!--
+ optional import for Gogo annotations
+ -->
+ org.apache.felix.service.command;resolution:=optional,
+
+ <!--
The Felix Shell support is optional
-->
org.apache.felix.shell; resolution:=optional,
@@ -235,14 +246,32 @@
</plugin>
<!--
- configure default compilation for Java 1.3 and integration
+ Configure default compilation for Java 1.3 and integration
test compilation for Java 5 (since integration tests use
- Java Annotations for Pax Exam)
+ Java Annotations for Pax Exam).
+ Also configure the compilation of the Gogo Command class
+ (using Java 5 annotations) with Java 5 target.
-->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
+ <id>compile-java5</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <excludes>
+ <exclude>dummy-to-overwrite-global-config</exclude>
+ </excludes>
+ <includes>
+ <include>**/ScrGogoCommand.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ <execution>
<id>test-compile-java5</id>
<goals>
<goal>testCompile</goal>
@@ -263,6 +292,9 @@
<testExcludes>
<testExclude>**/integration/**</testExclude>
</testExcludes>
+ <excludes>
+ <exclude>**/ScrGogoCommand.java</exclude>
+ </excludes>
</configuration>
</plugin>