Skip to content

Commit d8a5f03

Browse files
committed
Revert "Starting the work of moving orchestration pieces to engine"
This reverts commit 7a2aaf9.
1 parent ab91def commit d8a5f03

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,9 @@
458458
</execution>
459459
</executions>
460460
</plugin>
461-
<plugin>
462461
<!--This plugin's configuration is used to store Eclipse m2e settings only.
463462
It has no influence on the Maven build itself. -->
463+
<plugin>
464464
<groupId>org.eclipse.m2e</groupId>
465465
<artifactId>lifecycle-mapping</artifactId>
466466
<version>1.0.0</version>
@@ -469,8 +469,12 @@
469469
<pluginExecutions>
470470
<pluginExecution>
471471
<pluginExecutionFilter>
472-
<groupId>org.apache.maven.plugins</groupId>
473-
<artifactId>maven-antrun-plugin</artifactId>
472+
<groupId>
473+
org.apache.maven.plugins
474+
</groupId>
475+
<artifactId>
476+
maven-antrun-plugin
477+
</artifactId>
474478
<versionRange>[1.7,)</versionRange>
475479
<goals>
476480
<goal>run</goal>
@@ -484,11 +488,6 @@
484488
</lifecycleMappingMetadata>
485489
</configuration>
486490
</plugin>
487-
<plugin>
488-
<groupId>org.apache.maven.plugins</groupId>
489-
<artifactId>maven-antrun-plugin</artifactId>
490-
<version>1.7</version>
491-
</plugin>
492491
<plugin>
493492
<groupId>org.apache.tomcat.maven</groupId>
494493
<artifactId>tomcat7-maven-plugin</artifactId>

engine/orchestration/src/com/cloud/vm/VirtualMachineManager.java renamed to server/src/com/cloud/vm/VirtualMachineManager.java

File renamed without changes.

0 commit comments

Comments
 (0)