Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2011-11-25 17:30:50 +0000
committerMickael Istria2011-11-25 17:30:50 +0000
commitb4fbefc95903e6517081f8f238ac528825110b6f (patch)
treeddd28f7f9adbcdc76f25a0354f03cad47f9c509c
parentd51ae35ae4f5db05c19080272528efb0b98fd329 (diff)
parent5f281f7b0ade0c501a71e194f4e9273e9025c991 (diff)
downloadorg.eclipse.gmf-tooling-b4fbefc95903e6517081f8f238ac528825110b6f.tar.gz
org.eclipse.gmf-tooling-b4fbefc95903e6517081f8f238ac528825110b6f.tar.xz
org.eclipse.gmf-tooling-b4fbefc95903e6517081f8f238ac528825110b6f.zip
Merge branch 'antrun' into 2.4.x-maintenance
Conflicts: repository/pom.xml
-rwxr-xr-xrepository/pom.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/repository/pom.xml b/repository/pom.xml
index 329e2167c..539721689 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -78,7 +78,9 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>deploy</id>
@@ -89,11 +91,19 @@
<configuration>
<tasks>
<delete includeemptydirs="false">
+<<<<<<< HEAD
<fileset dir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/2.4.x-maintenance">
+=======
+ <fileset dir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/3.0">
+>>>>>>> refs/heads/antrun
<include name="**" />
</fileset>
</delete>
+<<<<<<< HEAD
<copy includeemptydirs="false" todir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/2.4.x-maintenance">
+=======
+ <copy includeemptydirs="false" todir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/3.0">
+>>>>>>> refs/heads/antrun
<fileset dir="target/checksumFix">
<include name="**" />
</fileset>
@@ -115,4 +125,4 @@
</pluginRepository>
</pluginRepositories>
-</project> \ No newline at end of file
+</project>

Back to the top