Repository: chukwa Updated Branches: refs/heads/master e90967f94 -> 973e11e9d
CHUKWA-821. Remove broken dependencies. (Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/973e11e9 Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/973e11e9 Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/973e11e9 Branch: refs/heads/master Commit: 973e11e9de2b6067f2a8431599912b04db49a50a Parents: e90967f Author: Eric Yang <[email protected]> Authored: Sun Sep 10 22:01:23 2017 -0700 Committer: Eric Yang <[email protected]> Committed: Sun Sep 10 22:01:23 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 + pom.xml | 226 ++----------------------------------------------------- 2 files changed, 8 insertions(+), 220 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/chukwa/blob/973e11e9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 882c9ab..0daafc1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,8 @@ Trunk (unreleased changes) BUGS + CHUKWA-821. Remove broken dependencies. (Eric Yang) + CHUKWA-818. Convert Solr client to singleton to prevent connection leaks. (Eric Yang) CHUKWA-817. Prevent connections leaks when HBaseWriter or parser generate errors. (Eric Yang) http://git-wip-us.apache.org/repos/asf/chukwa/blob/973e11e9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d23b1b4..a6096bf 100644 --- a/pom.xml +++ b/pom.xml @@ -131,20 +131,9 @@ <version>0.2.6</version> </dependency> <dependency> - <groupId>com.googlecode.jsendnsca</groupId> + <groupId>com.github.jsendnsca</groupId> <artifactId>jsendnsca</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>de.viaboxx</groupId> - <artifactId>log4j-nagios-appender</artifactId> - <version>1.1</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> + <version>2.1.1</version> </dependency> <dependency> <groupId>org.fusesource</groupId> @@ -1302,209 +1291,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <executions> - <execution> - <id>agent-public-api</id> - <goals> - <goal>javadoc</goal> - </goals> - <phase>compile</phase> - <configuration> - <encoding>UTF-8</encoding> - <verbose>false</verbose> - <show>public</show> - <failOnError>false</failOnError> - <subpackages>org.apache.hadoop.chukwa.datacollection.agent.rest</subpackages> - <doclet>com.sun.jersey.wadl.resourcedoc.ResourceDocletJSON</doclet> - <docletPath>${path.separator}${project.build.outputDirectory}</docletPath> - <docletArtifacts> - <docletArtifact> - <groupId>com.atlassian.plugins.rest</groupId> - <artifactId>atlassian-rest-doclet</artifactId> - <version>2.8.0-m3</version> - </docletArtifact> - <docletArtifact> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.11.0</version> - </docletArtifact> - </docletArtifacts> - <useStandardDocletOptions>false</useStandardDocletOptions> - <additionalparam>-output ${project.build.outputDirectory}/agent-rest.xml</additionalparam> - </configuration> - </execution> - <execution> - <id>hicc-public-api</id> - <goals> - <goal>javadoc</goal> - </goals> - <phase>compile</phase> - <configuration> - <encoding>UTF-8</encoding> - <verbose>false</verbose> - <show>public</show> - <failOnError>false</failOnError> - <subpackages>org.apache.hadoop.chukwa.hicc.rest</subpackages> - <doclet>com.sun.jersey.wadl.resourcedoc.ResourceDocletJSON</doclet> - <docletPath>${path.separator}${project.build.outputDirectory}</docletPath> - <docletArtifacts> - <docletArtifact> - <groupId>com.atlassian.plugins.rest</groupId> - <artifactId>atlassian-rest-doclet</artifactId> - <version>2.8.0-m3</version> - </docletArtifact> - <docletArtifact> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.11.0</version> - </docletArtifact> - </docletArtifacts> - <useStandardDocletOptions>false</useStandardDocletOptions> - <additionalparam>-output ${project.build.outputDirectory}/hicc-rest.xml</additionalparam> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>maven-wadl-plugin</artifactId> - <version>1.8</version> - <executions> - <execution> - <id>agent-rest</id> - <goals> - <goal>generate</goal> - </goals> - <phase>compile</phase> - <configuration> - <wadlFile>${project.build.outputDirectory}/application.wadl</wadlFile> - <formatWadlFile>true</formatWadlFile> - <baseUri>http://[host]:[port]/rest/v2</baseUri> - <packagesResourceConfig> - <param>org.apache.hadoop.chukwa.datacollection.agent.rest</param> - </packagesResourceConfig> - <wadlGenerators> - <wadlGeneratorDescription> - <className>com.sun.jersey.server.wadl.generators.WadlGeneratorApplicationDoc</className> - <properties> - <property> - <name>applicationDocsFile</name> - <value>${basedir}/src/main/resources/agent-rest.xml</value> - </property> - </properties> - </wadlGeneratorDescription> - <wadlGeneratorDescription> - <className>com.sun.jersey.server.wadl.generators.WadlGeneratorGrammarsSupport</className> - <properties> - <property> - <name>grammarsFile</name> - <value>${basedir}/src/main/resources/application-grammars.xml</value> - </property> - </properties> - </wadlGeneratorDescription> - <wadlGeneratorDescription> - <className>com.sun.jersey.server.wadl.generators.resourcedoc.WadlGeneratorResourceDocSupport</className> - <properties> - <property> - <name>resourceDocFile</name> - <value>${project.build.outputDirectory}/agent-rest.xml</value> - </property> - </properties> - </wadlGeneratorDescription> - </wadlGenerators> - </configuration> - </execution> - <execution> - <id>hicc-rest</id> - <goals> - <goal>generate</goal> - </goals> - <phase>compile</phase> - <configuration> - <wadlFile>${project.build.outputDirectory}/hicc-application.wadl</wadlFile> - <formatWadlFile>true</formatWadlFile> - <baseUri>http://[host]:[port]/hicc/v1</baseUri> - <packagesResourceConfig> - <param>org.apache.hadoop.chukwa.hicc.rest</param> - </packagesResourceConfig> - <wadlGenerators> - <wadlGeneratorDescription> - <className>com.sun.jersey.server.wadl.generators.WadlGeneratorApplicationDoc</className> - <properties> - <property> - <name>applicationDocsFile</name> - <value>${basedir}/src/main/resources/hicc-rest.xml</value> - </property> - </properties> - </wadlGeneratorDescription> - <wadlGeneratorDescription> - <className>com.sun.jersey.server.wadl.generators.WadlGeneratorGrammarsSupport</className> - <properties> - <property> - <name>grammarsFile</name> - <value>${basedir}/src/main/resources/application-grammars.xml</value> - </property> - </properties> - </wadlGeneratorDescription> - <wadlGeneratorDescription> - <className>com.sun.jersey.server.wadl.generators.resourcedoc.WadlGeneratorResourceDocSupport</className> - <properties> - <property> - <name>resourceDocFile</name> - <value>${project.build.outputDirectory}/hicc-rest.xml</value> - </property> - </properties> - </wadlGeneratorDescription> - </wadlGenerators> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.11.0</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <id>exec-xsltproc: target/application.html</id> - <goals> - <goal>exec</goal> - </goals> - <phase>package</phase> - <configuration> - <executable>xsltproc</executable> - <commandlineArgs>-o ${project.build.directory}/site/apidocs/agent-rest.html src/main/webapps/wadl.xsl target/classes/application.wadl</commandlineArgs> - </configuration> - </execution> - <execution> - <id>exec-xsltproc: target/hicc-application.html</id> - <goals> - <goal>exec</goal> - </goals> - <phase>package</phase> - <configuration> - <executable>xsltproc</executable> - <commandlineArgs>-o ${project.build.directory}/site/apidocs/hicc-rest.html src/main/webapps/wadl.xsl target/hicc/WEB-INF/classes/hicc-application.wadl</commandlineArgs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> <dependencies> @@ -1534,6 +1320,10 @@ <repositories> <repository> + <id>maven-central</id> + <url>https://repo.maven.apache.org/maven2/</url> + </repository> + <repository> <id>clojars</id> <url>http://clojars.org/repo/</url> </repository> @@ -1542,10 +1332,6 @@ <url>http://repo.maven.apache.org/maven2/</url> </repository> <repository> - <id>opencast</id> - <url>http://repository.opencastproject.org/nexus/content/repositories/public/</url> - </repository> - <repository> <id>pentaho</id> <url>http://repository.pentaho.org/artifactory/repo/</url> </repository>
