Skip to content

Commit aa6355f

Browse files
spark404spark404
committed
Updated master to 4.1.0
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P client,deps,developer -DdevelopmentVersion=4.1.0-SNAPSHOT
1 parent 12d12ac commit aa6355f

34 files changed

Lines changed: 76 additions & 110 deletions

File tree

‎agent/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-agent</artifactId>
2322
<name>Apache CloudStack Agents</name>
2423
<parent>
2524
<groupId>org.apache.cloudstack</groupId>
2625
<artifactId>cloudstack</artifactId>
27-
<version>4.0.0-SNAPSHOT</version>
26+
<version>4.1.0-SNAPSHOT</version>
2827
</parent>
2928
<dependencies>
3029
<dependency>

‎api/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-api</artifactId>
2322
<name>Apache CloudStack API</name>
2423
<parent>
2524
<groupId>org.apache.cloudstack</groupId>
2625
<artifactId>cloudstack</artifactId>
27-
<version>4.0.0-SNAPSHOT</version>
26+
<version>4.1.0-SNAPSHOT</version>
2827
</parent>
2928
<dependencies>
3029
<dependency>

‎awsapi/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-awsapi</artifactId>
23-
<version>4.0.0-SNAPSHOT</version>
22+
<version>4.1.0-SNAPSHOT</version>
2423
<name>Apache CloudStack AWS API Bridge</name>
2524
<parent>
2625
<groupId>org.apache.cloudstack</groupId>
2726
<artifactId>cloudstack</artifactId>
28-
<version>4.0.0-SNAPSHOT</version>
27+
<version>4.1.0-SNAPSHOT</version>
2928
</parent>
3029
<dependencies>
3130
<dependency>
@@ -321,7 +320,7 @@
321320
</goals>
322321
</pluginExecutionFilter>
323322
<action>
324-
<ignore></ignore>
323+
<ignore />
325324
</action>
326325
</pluginExecution>
327326
<pluginExecution>

‎client/pom.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-client-ui</artifactId>
2322
<name>Apache CloudStack Client UI</name>
2423
<packaging>war</packaging>
2524
<parent>
2625
<groupId>org.apache.cloudstack</groupId>
2726
<artifactId>cloudstack</artifactId>
28-
<version>4.0.0-SNAPSHOT</version>
27+
<version>4.1.0-SNAPSHOT</version>
2928
</parent>
3029
<dependencies>
3130
<dependency>
@@ -152,15 +151,15 @@
152151
</goals>
153152
<configuration>
154153
<target>
155-
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes" >
156-
<fileset dir="${basedir}/WEB-INF/classes" >
154+
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
155+
<fileset dir="${basedir}/WEB-INF/classes">
157156
<include name="resources/**/*" />
158157
</fileset>
159158
</copy>
160-
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts" >
159+
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
161160
<fileset dir="${basedir}/../scripts" />
162161
</copy>
163-
<copy todir="${basedir}/target/generated-webapp" >
162+
<copy todir="${basedir}/target/generated-webapp">
164163
<fileset dir="${basedir}/../ui" />
165164
</copy>
166165
<copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
@@ -204,7 +203,7 @@
204203
</goals>
205204
</pluginExecutionFilter>
206205
<action>
207-
<ignore></ignore>
206+
<ignore />
208207
</action>
209208
</pluginExecution>
210209
</pluginExecutions>

‎console-proxy/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-console-proxy</artifactId>
2322
<name>Apache CloudStack Console Proxy</name>
2423
<parent>
2524
<groupId>org.apache.cloudstack</groupId>
2625
<artifactId>cloudstack</artifactId>
27-
<version>4.0.0-SNAPSHOT</version>
26+
<version>4.1.0-SNAPSHOT</version>
2827
</parent>
2928
<dependencies>
3029
<dependency>

‎core/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-core</artifactId>
2322
<name>Apache CloudStack Core</name>
2423
<parent>
2524
<groupId>org.apache.cloudstack</groupId>
2625
<artifactId>cloudstack</artifactId>
27-
<version>4.0.0-SNAPSHOT</version>
26+
<version>4.1.0-SNAPSHOT</version>
2827
</parent>
2928
<dependencies>
3029
<dependency>

‎deps/XenServerJava/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<parent>
2322
<groupId>org.apache.cloudstack</groupId>
2423
<artifactId>cloudstack</artifactId>
25-
<version>4.0.0-SNAPSHOT</version>
24+
<version>4.1.0-SNAPSHOT</version>
2625
<relativePath>../../pom.xml</relativePath>
2726
</parent>
2827
<artifactId>xapi</artifactId>

‎deps/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-deps</artifactId>
2322
<name>Apache CloudStack Dependencies</name>
2423
<packaging>jar</packaging>
2524
<parent>
2625
<groupId>org.apache.cloudstack</groupId>
2726
<artifactId>cloudstack</artifactId>
28-
<version>4.0.0-SNAPSHOT</version>
27+
<version>4.1.0-SNAPSHOT</version>
2928
</parent>
3029
<dependencies>
3130
<dependency>
@@ -176,7 +175,7 @@
176175
</goals>
177176
</pluginExecutionFilter>
178177
<action>
179-
<ignore></ignore>
178+
<ignore />
180179
</action>
181180
</pluginExecution>
182181
<pluginExecution>

‎developer/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
99
OF ANY KIND, either express or implied. See the License for the specific
1010
language governing permissions and limitations under the License. -->
11-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
11+
<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">
1312
<modelVersion>4.0.0</modelVersion>
1413
<groupId>org.apache.cloudstack</groupId>
1514
<artifactId>cloud-developer</artifactId>
@@ -18,7 +17,7 @@
1817
<parent>
1918
<groupId>org.apache.cloudstack</groupId>
2019
<artifactId>cloudstack</artifactId>
21-
<version>4.0.0-SNAPSHOT</version>
20+
<version>4.1.0-SNAPSHOT</version>
2221
</parent>
2322
<dependencies>
2423
<dependency>

‎patches/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
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"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloud-patches</artifactId>
2322
<name>Apache CloudStack SystemVM Patches</name>
2423
<parent>
2524
<groupId>org.apache.cloudstack</groupId>
2625
<artifactId>cloudstack</artifactId>
27-
<version>4.0.0-SNAPSHOT</version>
26+
<version>4.1.0-SNAPSHOT</version>
2827
</parent>
2928
<dependencies>
3029
<dependency>

0 commit comments

Comments
 (0)