Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AMBARI-23276] Maven cleanup #699

Merged
merged 7 commits into from Mar 19, 2018

Conversation

adoroszlai
Copy link
Contributor

@adoroszlai adoroszlai commented Mar 18, 2018

What changes were proposed in this pull request?

Clean up pom.xml files somewhat:

  • Copy version and some other files in the process-resources lifecycle phase, not in generate-resources or generate-test-resources.
  • Remove some version declarations from ambari-agent and ambari-server that are already (or should be) declared in the parent POM.
  • Major cleanup in ambari-funtest: its pom.xml was copied from ambari-server, but it really depends only on some libraries and ambari-server. There is no src/main/resources in ambari-funtest, either.
  • Explicitly declare dependency on Guava in ambari-server.
  • Get rid of unnecessary dependency: ambari-serviceadvisor -> maven-assembly-plugin. This brought a bunch of unnecessary jars to ambari-server's bundle:
    backport-util-concurrent-3.1.jar
    classworlds-1.1.jar
    doxia-logging-api-1.1.jar
    doxia-sink-api-1.1.jar
    file-management-1.1.jar
    jackrabbit-jcr-commons-1.5.0.jar
    jackrabbit-webdav-1.5.0.jar
    junit-4.10.jar
    maven-archiver-2.5.jar
    maven-artifact-2.2.1.jar
    maven-artifact-manager-2.2.1.jar
    maven-assembly-plugin-2.6.jar
    maven-common-artifact-filters-1.4.jar
    maven-core-2.2.1.jar
    maven-error-diagnostics-2.2.1.jar
    maven-filtering-1.3.jar
    maven-model-2.2.1.jar
    maven-monitor-2.2.1.jar
    maven-plugin-api-2.2.1.jar
    maven-plugin-descriptor-2.2.1.jar
    maven-plugin-parameter-documenter-2.2.1.jar
    maven-plugin-registry-2.2.1.jar
    maven-profile-2.2.1.jar
    maven-project-2.2.1.jar
    maven-reporting-api-2.2.1.jar
    maven-repository-builder-1.0.jar
    maven-repository-metadata-2.2.1.jar
    maven-settings-2.2.1.jar
    maven-shared-io-1.1.jar
    maven-shared-utils-0.6.jar
    nekohtml-1.9.6.2.jar
    plexus-archiver-3.0.1.jar
    plexus-build-api-0.0.4.jar
    plexus-cipher-1.4.jar
    plexus-container-default-1.0-alpha-9-stable-1.jar
    plexus-interactivity-api-1.0-alpha-4.jar
    plexus-interpolation-1.22.jar
    plexus-io-2.6.jar
    plexus-sec-dispatcher-1.3.jar
    plexus-utils-3.0.21.jar
    snappy-0.3.jar
    wagon-file-1.0-beta-6.jar
    wagon-http-1.0-beta-6.jar
    wagon-http-lightweight-1.0-beta-6.jar
    wagon-http-shared-1.0-beta-6.jar
    wagon-provider-api-1.0-beta-6.jar
    wagon-ssh-1.0-beta-6.jar
    wagon-ssh-common-1.0-beta-6.jar
    wagon-ssh-external-1.0-beta-6.jar
    wagon-webdav-jackrabbit-1.0-beta-6.jar
    xercesMinimal-1.9.6.2.jar
    

How was this patch tested?

  • Full build from scratch:
    $ mvn -B -fae -Del.log=WARN -DskipTests clean package
    ...
    [INFO] BUILD SUCCESS
    [INFO] ------------------------------------------------------------------------
    [INFO] Total time: 11:21 min
    
  • Built rpms for ambari-server and ambari-agent, installed locally. Verified that the jars listed above are not present in /usr/lib/ambari-server.
  • Installed ZooKeeper cluster via blueprints, added HDFS via UI.
  • Ran ambari-serviceadvisor with inputs from a previous run:
    export PYTHONPATH=/usr/lib/ambari-agent/lib
    export CLASSPATH=$(echo /usr/lib/ambari-server/*jar | sed 's/ /:/g')
    cd /var/run/ambari-server/stack-recommendations/1
    java org.apache.ambari.serviceadvisor.ServiceAdvisor recommend-configurations hosts.json services.json OUT ERR
    

@adoroszlai adoroszlai self-assigned this Mar 18, 2018
@asfgit
Copy link

asfgit commented Mar 18, 2018

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/Ambari-Github-PullRequest-Builder/1225/
Test PASSed.

@adoroszlai
Copy link
Contributor Author

@smolnar82 please review.

@@ -23,9 +23,9 @@
import org.apache.ambari.server.configuration.LdapUsernameCollisionHandlingBehavior;
import org.apache.ambari.server.security.authorization.LdapServerProperties;
import org.apache.ambari.server.utils.PasswordUtils;
import org.apache.commons.lang.StringUtils;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

@adoroszlai adoroszlai merged commit e44d5ac into apache:trunk Mar 19, 2018
@adoroszlai adoroszlai deleted the AMBARI-23276_pom_cleanup branch March 19, 2018 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
5 participants