Skip to content

Commit 9d2271d

Browse files
spark404spark404
committed
Revert "fixed m2eclipse error" because it breaks packaging
This reverts commit 5bcd828.
1 parent 25d4333 commit 9d2271d

4 files changed

Lines changed: 230 additions & 237 deletions

File tree

‎agent/pom.xml‎

Lines changed: 69 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -46,75 +46,74 @@
4646
</dependency>
4747
</dependencies>
4848
<build>
49-
<pluginManagement>
50-
<plugins>
51-
<plugin>
52-
<artifactId>maven-antrun-plugin</artifactId>
53-
<executions>
54-
<execution>
55-
<id>generate-resource</id>
56-
<phase>generate-resources</phase>
57-
<goals>
58-
<goal>run</goal>
59-
</goals>
60-
<configuration>
61-
<target>
62-
<copy todir="${basedir}/target/transformed">
63-
<fileset dir="${basedir}/conf">
64-
<include name="agent.properties" />
65-
</fileset>
66-
</copy>
67-
<copy overwrite="true"
68-
todir="${basedir}/target/transformed">
69-
<fileset dir="${basedir}/conf">
70-
<include name="*.in" />
71-
</fileset>
72-
<globmapper from="*.in" to="*" />
73-
<filterchain>
74-
<filterreader
75-
classname="org.apache.tools.ant.filters.ReplaceTokens">
76-
<param type="propertiesfile"
77-
value="${cs.replace.properties}" />
78-
</filterreader>
79-
</filterchain>
80-
</copy>
81-
<copy overwrite="true"
82-
todir="${basedir}/target/transformed">
83-
<fileset dir="${basedir}/bindir">
84-
<include name="*.in" />
85-
</fileset>
86-
<globmapper from="*.in" to="*" />
87-
<filterchain>
88-
<filterreader
89-
classname="org.apache.tools.ant.filters.ReplaceTokens">
90-
<param type="propertiesfile"
91-
value="${cs.replace.properties}" />
92-
</filterreader>
93-
</filterchain>
94-
</copy>
95-
</target>
96-
</configuration>
97-
</execution>
98-
</executions>
99-
</plugin>
100-
<plugin>
101-
<groupId>org.apache.maven.plugins</groupId>
102-
<artifactId>maven-dependency-plugin</artifactId>
103-
<executions>
104-
<execution>
105-
<id>copy-dependencies</id>
106-
<phase>package</phase>
107-
<goals>
108-
<goal>copy-dependencies</goal>
109-
</goals>
110-
<configuration>
111-
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
112-
<includeScope>runtime</includeScope>
113-
</configuration>
114-
</execution>
115-
</executions>
116-
</plugin>
117-
</plugins>
118-
</pluginManagement>
49+
<plugins>
50+
<plugin>
51+
<artifactId>maven-antrun-plugin</artifactId>
52+
<executions>
53+
<execution>
54+
<id>generate-resource</id>
55+
<phase>generate-resources</phase>
56+
<goals>
57+
<goal>run</goal>
58+
</goals>
59+
<configuration>
60+
<target>
61+
<copy
62+
todir="${basedir}/target/transformed">
63+
<fileset dir="${basedir}/conf">
64+
<include name="agent.properties" />
65+
</fileset>
66+
</copy>
67+
<copy overwrite="true"
68+
todir="${basedir}/target/transformed">
69+
<fileset dir="${basedir}/conf">
70+
<include name="*.in" />
71+
</fileset>
72+
<globmapper from="*.in" to="*" />
73+
<filterchain>
74+
<filterreader
75+
classname="org.apache.tools.ant.filters.ReplaceTokens">
76+
<param type="propertiesfile"
77+
value="${cs.replace.properties}" />
78+
</filterreader>
79+
</filterchain>
80+
</copy>
81+
<copy overwrite="true"
82+
todir="${basedir}/target/transformed">
83+
<fileset dir="${basedir}/bindir">
84+
<include name="*.in" />
85+
</fileset>
86+
<globmapper from="*.in" to="*" />
87+
<filterchain>
88+
<filterreader
89+
classname="org.apache.tools.ant.filters.ReplaceTokens">
90+
<param type="propertiesfile"
91+
value="${cs.replace.properties}" />
92+
</filterreader>
93+
</filterchain>
94+
</copy>
95+
</target>
96+
</configuration>
97+
</execution>
98+
</executions>
99+
</plugin>
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-dependency-plugin</artifactId>
103+
<executions>
104+
<execution>
105+
<id>copy-dependencies</id>
106+
<phase>package</phase>
107+
<goals>
108+
<goal>copy-dependencies</goal>
109+
</goals>
110+
<configuration>
111+
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
112+
<includeScope>runtime</includeScope>
113+
</configuration>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
</plugins>
119118
</build>
120119
</project>

‎plugins/hypervisors/kvm/pom.xml‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -58,37 +58,35 @@
5858
<defaultGoal>install</defaultGoal>
5959
<sourceDirectory>src</sourceDirectory>
6060
<testSourceDirectory>test</testSourceDirectory>
61-
<pluginManagement>
62-
<plugins>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-dependency-plugin</artifactId>
66-
<version>2.5.1</version>
67-
<executions>
68-
<execution>
69-
<id>copy-dependencies</id>
70-
<phase>package</phase>
71-
<goals>
72-
<goal>copy-dependencies</goal>
73-
</goals>
74-
<configuration>
75-
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
76-
<includeScope>runtime</includeScope>
77-
</configuration>
78-
</execution>
79-
</executions>
80-
</plugin>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-surefire-plugin</artifactId>
84-
<version>2.14</version>
85-
<configuration>
86-
<excludes>
87-
<exclude>**/Qemu*.java</exclude>
88-
</excludes>
89-
</configuration>
90-
</plugin>
91-
</plugins>
92-
</pluginManagement>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-dependency-plugin</artifactId>
65+
<version>2.5.1</version>
66+
<executions>
67+
<execution>
68+
<id>copy-dependencies</id>
69+
<phase>package</phase>
70+
<goals>
71+
<goal>copy-dependencies</goal>
72+
</goals>
73+
<configuration>
74+
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
75+
<includeScope>runtime</includeScope>
76+
</configuration>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-surefire-plugin</artifactId>
83+
<version>2.14</version>
84+
<configuration>
85+
<excludes>
86+
<exclude>**/Qemu*.java</exclude>
87+
</excludes>
88+
</configuration>
89+
</plugin>
90+
</plugins>
9391
</build>
9492
</project>

‎plugins/user-authenticators/ldap/pom.xml‎

Lines changed: 63 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -20,78 +20,76 @@
2020
</parent>
2121

2222
<build>
23-
<pluginManagement>
24-
<plugins>
25-
<plugin>
26-
<groupId>org.codehaus.gmaven</groupId>
27-
<artifactId>gmaven-plugin</artifactId>
28-
<version>1.3</version>
29-
<configuration>
30-
<providerSelection>1.7</providerSelection>
31-
</configuration>
32-
<executions>
33-
<execution>
34-
<goals>
35-
<goal>compile</goal>
36-
<goal>testCompile</goal>
37-
</goals>
38-
<configuration>
39-
<sources>
40-
<fileset>
41-
<directory>test/groovy</directory>
42-
<includes>
43-
<include>**/*.groovy</include>
44-
</includes>
45-
</fileset>
46-
</sources>
47-
</configuration>
48-
</execution>
49-
</executions>
50-
<dependencies>
51-
<dependency>
52-
<groupId>org.codehaus.gmaven.runtime</groupId>
53-
<artifactId>gmaven-runtime-1.7</artifactId>
54-
<version>1.3</version>
55-
<exclusions>
56-
<exclusion>
57-
<groupId>org.codehaus.groovy</groupId>
58-
<artifactId>groovy-all</artifactId>
59-
</exclusion>
60-
</exclusions>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.codehaus.groovy</groupId>
64-
<artifactId>groovy-all</artifactId>
65-
<version>2.0.5</version>
66-
</dependency>
67-
</dependencies>
68-
</plugin>
69-
<plugin>
70-
<groupId>org.apache.maven.plugins</groupId>
71-
<artifactId>maven-surefire-plugin</artifactId>
72-
<configuration>
73-
<includes>
74-
<include>**/*Spec*</include>
75-
</includes>
76-
</configuration>
77-
</plugin>
23+
<plugins>
24+
<plugin>
25+
<groupId>org.codehaus.gmaven</groupId>
26+
<artifactId>gmaven-plugin</artifactId>
27+
<version>1.3</version>
28+
<configuration>
29+
<providerSelection>1.7</providerSelection>
30+
</configuration>
31+
<executions>
32+
<execution>
33+
<goals>
34+
<goal>compile</goal>
35+
<goal>testCompile</goal>
36+
</goals>
37+
<configuration>
38+
<sources>
39+
<fileset>
40+
<directory>test/groovy</directory>
41+
<includes>
42+
<include>**/*.groovy</include>
43+
</includes>
44+
</fileset>
45+
</sources>
46+
</configuration>
47+
</execution>
48+
</executions>
49+
<dependencies>
50+
<dependency>
51+
<groupId>org.codehaus.gmaven.runtime</groupId>
52+
<artifactId>gmaven-runtime-1.7</artifactId>
53+
<version>1.3</version>
54+
<exclusions>
55+
<exclusion>
56+
<groupId>org.codehaus.groovy</groupId>
57+
<artifactId>groovy-all</artifactId>
58+
</exclusion>
59+
</exclusions>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.codehaus.groovy</groupId>
63+
<artifactId>groovy-all</artifactId>
64+
<version>2.0.5</version>
65+
</dependency>
66+
</dependencies>
67+
</plugin>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-surefire-plugin</artifactId>
71+
<configuration>
72+
<includes>
73+
<include>**/*Spec*</include>
74+
</includes>
75+
</configuration>
76+
</plugin>
7877

79-
<plugin>
80-
<groupId>com.btmatthews.maven.plugins</groupId>
81-
<artifactId>ldap-maven-plugin</artifactId>
82-
<version>1.1.0</version>
83-
<configuration>
84-
<monitorPort>11389</monitorPort>
78+
<plugin>
79+
<groupId>com.btmatthews.maven.plugins</groupId>
80+
<artifactId>ldap-maven-plugin</artifactId>
81+
<version>1.1.0</version>
82+
<configuration>
83+
<monitorPort>11389</monitorPort>
8584
<monitorKey>ldap</monitorKey>
8685
<daemon>false</daemon>
8786
<rootDn>dc=cloudstack,dc=org</rootDn>
8887
<ldapPort>10389</ldapPort>
8988
<ldifFile>test/resources/cloudstack.org.ldif</ldifFile>
90-
</configuration>
91-
</plugin>
89+
</configuration>
90+
</plugin>
9291

93-
</plugins>
94-
</pluginManagement>
92+
</plugins>
9593
</build>
9694

9795
<dependencies>

0 commit comments

Comments
 (0)