summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2008-10-28 04:16:32 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2008-10-28 04:16:32 +0000
commit94897cb5827882b22c180877dd4d28cc850e8c31 (patch)
tree5bd4460a90964e024eb086bb6500aafa5ac32de5 /branches
parent4e3a545fb4e519144bf1c2e3fe1b6adfdf4ef2c7 (diff)
Reverting changes from #708370 as it looks like didn't solve all the issues.
We will need to document that we first need to build tuscany-maven-eclipse-plugin, before the top-down build... this might go away after we start publishing snapshots. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@708425 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-equinox/modules/pom.xml20
-rw-r--r--branches/sca-equinox/pom.xml13
2 files changed, 9 insertions, 24 deletions
diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml
index a700a65f7c..b194de3747 100644
--- a/branches/sca-equinox/modules/pom.xml
+++ b/branches/sca-equinox/modules/pom.xml
@@ -170,26 +170,6 @@
<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 ac9d8eb2de..4be8e810c3 100644
--- a/branches/sca-equinox/pom.xml
+++ b/branches/sca-equinox/pom.xml
@@ -340,7 +340,6 @@
</profile>
</profiles>
-
<build>
<defaultGoal>install</defaultGoal>
@@ -368,12 +367,18 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <!--
- <compilerId>eclipse</compilerId>
- -->
+ <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>
<!-- surefire plugin configuration -->