diff options
author | liamfallon <liam.fallon@ericsson.com> | 2018-11-10 00:39:12 +0000 |
---|---|---|
committer | liamfallon <liam.fallon@ericsson.com> | 2018-11-12 11:07:31 +0000 |
commit | 32497610bd7bc721bb73f0d753fc1426bba677e2 (patch) | |
tree | 44167f3feb03c84b3cff784d9758b03528f1eb0b /client/client-common | |
parent | 53d8916cc60d97e2ce7ae345f8cc25f5602567da (diff) |
Clean up eclipse and document warnings
Parent versions in some POMs only called on the test profile
were incorrect
Warnings in Eclipse on POM including from outside its project
are fixed
Some checkstyle fixes
Some javadoc warnings fixed
Issue-ID: POLICY-954
Change-Id: I640bc842dc79a9fa580015abb9a76c84a7845efe
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'client/client-common')
-rw-r--r-- | client/client-common/pom.xml | 25 | ||||
-rw-r--r-- | client/client-common/src/main/assembly/assembly.xml | 32 |
2 files changed, 1 insertions, 56 deletions
diff --git a/client/client-common/pom.xml b/client/client-common/pom.xml index 7c679ad41..92174c87f 100644 --- a/client/client-common/pom.xml +++ b/client/client-common/pom.xml @@ -26,32 +26,9 @@ </parent> <artifactId>client-common</artifactId> - <packaging>pom</packaging> + <packaging>jar</packaging> <name>${project.artifactId}</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>make shared resources</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> <profile> <id>apexSite</id> diff --git a/client/client-common/src/main/assembly/assembly.xml b/client/client-common/src/main/assembly/assembly.xml deleted file mode 100644 index ddc56e57f..000000000 --- a/client/client-common/src/main/assembly/assembly.xml +++ /dev/null @@ -1,32 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2016-2018 Ericsson. All rights reserved. - ================================================================================ - Licensed 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. - - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> -<assembly> - <id>resources</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory></outputDirectory> - </fileSet> - </fileSets> -</assembly>
\ No newline at end of file |