OOZIE-3120 Upgrade maven-assembly plugin to v.3.1.0 (dionusos via kmarton)
diff --git a/core/pom.xml b/core/pom.xml
index 87851ec..b6c07d3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -546,9 +546,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptors>
- <descriptor>../src/main/assemblies/empty.xml</descriptor>
- </descriptors>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index e0a330a..bd3c9fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1694,7 +1694,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2007,9 +2007,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptors>
- <descriptor>src/main/assemblies/empty.xml</descriptor>
- </descriptors>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
<attach>false</attach>
</configuration>
</plugin>
diff --git a/release-log.txt b/release-log.txt
index 1ebbdd4..2c7265e 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3120 Upgrade maven-assembly plugin to v.3.1.0 (dionusos via kmarton)
OOZIE-3381 [coordinator] Enhance logging of CoordElFunctions (andras.piros via kmarton)
OOZIE-3380 TestCoordMaterializeTransitionXCommand failure after DST change date (asalamon74 via kmarton)
OOZIE-3338 [build] Remove SVN references (asalamon74 via andras.piros)
diff --git a/server/pom.xml b/server/pom.xml
index e502438..cc6041e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -160,9 +160,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptors>
- <descriptor>../src/main/assemblies/empty.xml</descriptor>
- </descriptors>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
</configuration>
</plugin>
diff --git a/server/src/main/assemblies/empty.xml b/server/src/main/assemblies/empty.xml
deleted file mode 100644
index 17ff68a..0000000
--- a/server/src/main/assemblies/empty.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
- <id>empty</id>
- <formats/>
-</assembly>
diff --git a/src/main/assemblies/empty.xml b/src/main/assemblies/empty.xml
deleted file mode 100644
index 35738b1..0000000
--- a/src/main/assemblies/empty.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
- <id>empty</id>
- <formats/>
-</assembly>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index bd805d7..d1a9306 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -176,9 +176,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptors>
- <descriptor>../src/main/assemblies/empty.xml</descriptor>
- </descriptors>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
</configuration>
</plugin>
<plugin>
