summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-equinox/modules/pom.xml20
-rw-r--r--branches/sca-equinox/pom.xml13
2 files changed, 24 insertions, 9 deletions
diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml
index b194de3747..a700a65f7c 100644
--- a/branches/sca-equinox/modules/pom.xml
+++ b/branches/sca-equinox/modules/pom.xml
@@ -170,6 +170,26 @@
<build>
<plugins>
+ <!-- compiler plugin configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <compilerId>tuscany-eclipse</compilerId>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-eclipse-compiler</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version>
diff --git a/branches/sca-equinox/pom.xml b/branches/sca-equinox/pom.xml
index 4be8e810c3..ac9d8eb2de 100644
--- a/branches/sca-equinox/pom.xml
+++ b/branches/sca-equinox/pom.xml
@@ -340,6 +340,7 @@
</profile>
</profiles>
+
<build>
<defaultGoal>install</defaultGoal>
@@ -367,18 +368,12 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <compilerId>tuscany-eclipse</compilerId>
+ <!--
+ <compilerId>eclipse</compilerId>
+ -->
<source>1.5</source>
<target>1.5</target>
</configuration>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-eclipse-compiler</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
<!-- surefire plugin configuration -->