Juan Hernandez has uploaded a new change for review.
Change subject: core: Update maven-war-plugin and maven-ear-plugin
......................................................................
core: Update maven-war-plugin and maven-ear-plugin
This change updates the maven-war-plugin version to 2.2 and the
maven-ear-plugin version to 2.8. This update is required in order to use
the packagingIncludes and packagingExcludes configuration parameters
that are silentlly ignored in previous versions.
Change-Id: Iffc6ac741d4bb864246f67ea5c1e207013b96405
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M frontend/webadmin/modules/pom.xml
M frontend/webadmin/modules/userportal-gwtp/pom.xml
M frontend/webadmin/modules/webadmin/pom.xml
D packaging/fedora/spec/ovirt-engine.spec.tmpl
A packaging/fedora/spec/ovirt-engine.spec.tmpl
M pom.xml
6 files changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/13908/1
diff --git a/frontend/webadmin/modules/pom.xml
b/frontend/webadmin/modules/pom.xml
index cb90db2..0a3ff23 100644
--- a/frontend/webadmin/modules/pom.xml
+++ b/frontend/webadmin/modules/pom.xml
@@ -34,7 +34,6 @@
<gin.version>1.5.0</gin.version>
<maven-resources-plugin.version>2.5</maven-resources-plugin.version>
<maven-clean-plugin.version>2.4.1</maven-clean-plugin.version>
- <maven-war-plugin.version>2.1.1</maven-war-plugin.version>
<build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
<!-- Using older maven-processor-plugin version for Maven 2 compatibility
-->
<maven-processor-plugin.version>1.3.7</maven-processor-plugin.version>
diff --git a/frontend/webadmin/modules/userportal-gwtp/pom.xml
b/frontend/webadmin/modules/userportal-gwtp/pom.xml
index 57b3da2..28d87b4 100644
--- a/frontend/webadmin/modules/userportal-gwtp/pom.xml
+++ b/frontend/webadmin/modules/userportal-gwtp/pom.xml
@@ -143,7 +143,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>${maven-war-plugin.version}</version>
<configuration>
<packagingExcludes>WEB-INF/deploy/**,WEB-INF/classes/**</packagingExcludes>
</configuration>
diff --git a/frontend/webadmin/modules/webadmin/pom.xml
b/frontend/webadmin/modules/webadmin/pom.xml
index 5213ab7..8da1a29 100644
--- a/frontend/webadmin/modules/webadmin/pom.xml
+++ b/frontend/webadmin/modules/webadmin/pom.xml
@@ -143,7 +143,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>${maven-war-plugin.version}</version>
<configuration>
<packagingExcludes>WEB-INF/deploy/**,WEB-INF/classes/**</packagingExcludes>
</configuration>
diff --git a/packaging/fedora/spec/ovirt-engine.spec.tmpl
b/packaging/fedora/spec/ovirt-engine.spec.tmpl
deleted file mode 120000
index f895688..0000000
--- a/packaging/fedora/spec/ovirt-engine.spec.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-ovirt-engine.spec.in
\ No newline at end of file
diff --git a/packaging/fedora/spec/ovirt-engine.spec.tmpl
b/packaging/fedora/spec/ovirt-engine.spec.tmpl
new file mode 100644
index 0000000..f895688
--- /dev/null
+++ b/packaging/fedora/spec/ovirt-engine.spec.tmpl
@@ -0,0 +1 @@
+ovirt-engine.spec.in
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3f5a6a7..7dd0ad9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -497,7 +497,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
<configuration>
<fileNameMapping>no-version</fileNameMapping>
</configuration>
@@ -506,7 +506,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
<configuration>
<outputFileNameMapping>@{artifactId}@.@{extension}@</outputFileNameMapping>
</configuration>
--
To view, visit http://gerrit.ovirt.org/13908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffc6ac741d4bb864246f67ea5c1e207013b96405
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
