Skip to content

Commit 7c6630b

Browse files
khos2owrafaelweingartner
khos2ow
authored and
rafaelweingartner
committed
Cleanup POMs (apache#2613)
* Cleaup and code-formatting POM files * Remove obsolete mycila license-maven-plugin * Remove obsolete console-proxy/plugin project * Move console-proxy-rdbconsole under console-proxy parent * Use correct parent path for rdpconsole * Order alphabetally items in setnextversion.sh * Unifiy License header in POMs * Alphabetic order of modules definition * Extract all defined versions into parent pom * Remove obsolete files: version-info.in, configure-info.in * Remove redundant defaultGoal * Remove useless checkstyle plugin from checkstyle project * Order alphabetally items in pom.xml * Add aditional SPACEs to fix debian build * Don't execute checkstyle on parent projects * Use UTF-8 encoding in building checkstyle project * Extract plugin versions into properties * Execute PMD plugin on all the projects with -Penablefindbugs * Upgrade maven plugins to latest version * Make sure to always look for apache parent pom from repository * Fix incorrect version grep in debian packaging * Fix rebase conflicts * Fix rebase conflicts * Remove PMD for now to be fixed on another PR
1 parent 542d4da commit 7c6630b

298 files changed

Lines changed: 9486 additions & 9406 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎agent/pom.xml‎

Lines changed: 99 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,113 @@
11
<!--
22
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
3+
or more contributor license agreements. See the NOTICE file
44
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
5+
regarding copyright ownership. The ASF licenses this file
66
to you under the Apache License, Version 2.0 (the
77
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
8+
with the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
http://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing,
1313
software distributed under the License is distributed on an
1414
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
15+
KIND, either express or implied. See the License for the
1616
specific language governing permissions and limitations
1717
under the License.
1818
-->
19-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20-
<modelVersion>4.0.0</modelVersion>
21-
<artifactId>cloud-agent</artifactId>
22-
<name>Apache CloudStack Agents</name>
23-
<parent>
24-
<groupId>org.apache.cloudstack</groupId>
25-
<artifactId>cloudstack</artifactId>
26-
<version>4.12.0.0-SNAPSHOT</version>
27-
</parent>
28-
<dependencies>
29-
<dependency>
30-
<groupId>org.apache.cloudstack</groupId>
31-
<artifactId>cloud-core</artifactId>
32-
<version>${project.version}</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.apache.cloudstack</groupId>
36-
<artifactId>cloud-utils</artifactId>
37-
<version>${project.version}</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>commons-io</groupId>
41-
<artifactId>commons-io</artifactId>
42-
<version>${cs.commons-io.version}</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>commons-daemon</groupId>
46-
<artifactId>commons-daemon</artifactId>
47-
</dependency>
48-
</dependencies>
49-
<build>
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
63-
todir="${basedir}/target/transformed">
64-
<fileset dir="${basedir}/conf">
65-
<include name="agent.properties" />
66-
</fileset>
67-
</copy>
68-
<copy overwrite="true"
69-
todir="${basedir}/target/transformed">
70-
<fileset dir="${basedir}/conf">
71-
<include name="*.in" />
72-
</fileset>
73-
<globmapper from="*.in" to="*" />
74-
<filterchain>
75-
<filterreader
76-
classname="org.apache.tools.ant.filters.ReplaceTokens">
77-
<param type="propertiesfile"
78-
value="${cs.replace.properties}" />
79-
</filterreader>
80-
</filterchain>
81-
</copy>
82-
<copy overwrite="true"
83-
todir="${basedir}/target/transformed">
84-
<fileset dir="${basedir}/bindir">
85-
<include name="*.in" />
86-
</fileset>
87-
<globmapper from="*.in" to="*" />
88-
<filterchain>
89-
<filterreader
90-
classname="org.apache.tools.ant.filters.ReplaceTokens">
91-
<param type="propertiesfile"
92-
value="${cs.replace.properties}" />
93-
</filterreader>
94-
</filterchain>
95-
</copy>
96-
</target>
97-
</configuration>
98-
</execution>
99-
</executions>
100-
</plugin>
101-
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103-
<artifactId>maven-dependency-plugin</artifactId>
104-
<executions>
105-
<execution>
106-
<id>copy-dependencies</id>
107-
<phase>package</phase>
108-
<goals>
109-
<goal>copy-dependencies</goal>
110-
</goals>
111-
<configuration>
112-
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
113-
<includeScope>runtime</includeScope>
114-
</configuration>
115-
</execution>
116-
</executions>
117-
</plugin>
118-
</plugins>
119-
</build>
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<artifactId>cloud-agent</artifactId>
23+
<name>Apache CloudStack Agents</name>
24+
<parent>
25+
<groupId>org.apache.cloudstack</groupId>
26+
<artifactId>cloudstack</artifactId>
27+
<version>4.12.0.0-SNAPSHOT</version>
28+
</parent>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.cloudstack</groupId>
32+
<artifactId>cloud-core</artifactId>
33+
<version>${project.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.cloudstack</groupId>
37+
<artifactId>cloud-utils</artifactId>
38+
<version>${project.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>commons-io</groupId>
42+
<artifactId>commons-io</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>commons-daemon</groupId>
46+
<artifactId>commons-daemon</artifactId>
47+
</dependency>
48+
</dependencies>
49+
<build>
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" todir="${basedir}/target/transformed">
68+
<fileset dir="${basedir}/conf">
69+
<include name="*.in" />
70+
</fileset>
71+
<globmapper from="*.in" to="*" />
72+
<filterchain>
73+
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
74+
<param type="propertiesfile" value="${cs.replace.properties}" />
75+
</filterreader>
76+
</filterchain>
77+
</copy>
78+
<copy overwrite="true" todir="${basedir}/target/transformed">
79+
<fileset dir="${basedir}/bindir">
80+
<include name="*.in" />
81+
</fileset>
82+
<globmapper from="*.in" to="*" />
83+
<filterchain>
84+
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
85+
<param type="propertiesfile" value="${cs.replace.properties}" />
86+
</filterreader>
87+
</filterchain>
88+
</copy>
89+
</target>
90+
</configuration>
91+
</execution>
92+
</executions>
93+
</plugin>
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-dependency-plugin</artifactId>
97+
<executions>
98+
<execution>
99+
<id>copy-dependencies</id>
100+
<phase>package</phase>
101+
<goals>
102+
<goal>copy-dependencies</goal>
103+
</goals>
104+
<configuration>
105+
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
106+
<includeScope>runtime</includeScope>
107+
</configuration>
108+
</execution>
109+
</executions>
110+
</plugin>
111+
</plugins>
112+
</build>
120113
</project>

‎api/pom.xml‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
11
<!--
22
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
3+
or more contributor license agreements. See the NOTICE file
44
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
5+
regarding copyright ownership. The ASF licenses this file
66
to you under the Apache License, Version 2.0 (the
77
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
8+
with the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
http://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing,
1313
software distributed under the License is distributed on an
1414
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
15+
KIND, either express or implied. See the License for the
1616
specific language governing permissions and limitations
1717
under the License.
1818
-->
19-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20-
<modelVersion>4.0.0</modelVersion>
21-
<artifactId>cloud-api</artifactId>
22-
<name>Apache CloudStack API</name>
23-
<parent>
24-
<groupId>org.apache.cloudstack</groupId>
25-
<artifactId>cloudstack</artifactId>
26-
<version>4.12.0.0-SNAPSHOT</version>
27-
</parent>
28-
<dependencies>
29-
<dependency>
30-
<groupId>org.apache.cloudstack</groupId>
31-
<artifactId>cloud-utils</artifactId>
32-
<version>${project.version}</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>com.google.code.gson</groupId>
36-
<artifactId>gson</artifactId>
37-
</dependency>
38-
<dependency>
39-
<groupId>javax.servlet</groupId>
40-
<artifactId>javax.servlet-api</artifactId>
41-
<version>${cs.servlet.version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.apache.cloudstack</groupId>
45-
<artifactId>cloud-framework-db</artifactId>
46-
<version>${project.version}</version>
47-
<scope>test</scope>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.apache.cloudstack</groupId>
51-
<artifactId>cloud-framework-config</artifactId>
52-
<version>${project.version}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.apache.cloudstack</groupId>
56-
<artifactId>cloud-framework-ca</artifactId>
57-
<version>${project.version}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.apache.commons</groupId>
61-
<artifactId>commons-lang3</artifactId>
62-
<version>${cs.commons-lang3.version}</version>
63-
</dependency>
64-
<dependency>
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<artifactId>cloud-api</artifactId>
23+
<name>Apache CloudStack API</name>
24+
<parent>
6525
<groupId>org.apache.cloudstack</groupId>
66-
<artifactId>cloud-framework-direct-download</artifactId>
67-
<version>${project.version}</version>
68-
</dependency>
69-
</dependencies>
70-
<build>
71-
<plugins>
72-
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-jar-plugin</artifactId>
75-
<executions>
76-
<execution>
77-
<goals>
78-
<goal>test-jar</goal>
79-
</goals>
80-
</execution>
81-
</executions>
82-
</plugin>
83-
</plugins>
84-
</build>
26+
<artifactId>cloudstack</artifactId>
27+
<version>4.12.0.0-SNAPSHOT</version>
28+
</parent>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.cloudstack</groupId>
32+
<artifactId>cloud-utils</artifactId>
33+
<version>${project.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.google.code.gson</groupId>
37+
<artifactId>gson</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>javax.servlet</groupId>
41+
<artifactId>javax.servlet-api</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.apache.cloudstack</groupId>
45+
<artifactId>cloud-framework-db</artifactId>
46+
<version>${project.version}</version>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.apache.cloudstack</groupId>
51+
<artifactId>cloud-framework-config</artifactId>
52+
<version>${project.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.apache.cloudstack</groupId>
56+
<artifactId>cloud-framework-ca</artifactId>
57+
<version>${project.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.apache.commons</groupId>
61+
<artifactId>commons-lang3</artifactId>
62+
<version>${cs.commons-lang3.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.apache.cloudstack</groupId>
66+
<artifactId>cloud-framework-direct-download</artifactId>
67+
<version>${project.version}</version>
68+
</dependency>
69+
</dependencies>
70+
<build>
71+
<plugins>
72+
<plugin>
73+
<groupId>org.apache.maven.plugins</groupId>
74+
<artifactId>maven-jar-plugin</artifactId>
75+
<executions>
76+
<execution>
77+
<goals>
78+
<goal>test-jar</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
8585
</project>

0 commit comments

Comments
 (0)