nifi-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alopresto <...@git.apache.org>
Subject [GitHub] nifi pull request #328: NIFI-1690 Changed MonitorMemory to use allowable val...
Date Tue, 14 Jun 2016 23:31:52 GMT
Github user alopresto commented on a diff in the pull request:

    https://github.com/apache/nifi/pull/328#discussion_r67076846
  
    --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
---
    @@ -1,60 +1,69 @@
    -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    -    <!--
    -      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.
    -    -->
    -    <modelVersion>4.0.0</modelVersion>
    -    <parent>
    -        <groupId>org.apache.nifi</groupId>
    -        <artifactId>nifi-standard-bundle</artifactId>
    -        <version>1.0.0-SNAPSHOT</version>
    -    </parent>
    -    <artifactId>nifi-standard-reporting-tasks</artifactId>
    -    <packaging>jar</packaging>
    -    <dependencies>
    -        <dependency>
    -            <groupId>org.apache.nifi</groupId>
    -            <artifactId>nifi-api</artifactId>
    -        </dependency>
    -        <dependency>
    -            <groupId>org.apache.nifi</groupId>
    -            <artifactId>nifi-utils</artifactId>
    -        </dependency>
    -        <dependency>
    -            <groupId>org.apache.nifi</groupId>
    -            <artifactId>nifi-properties</artifactId>
    -        </dependency>
    -        <dependency>
    -            <groupId>org.apache.nifi</groupId>
    -            <artifactId>nifi-processor-utils</artifactId>
    -        </dependency>
    -        <dependency>
    -            <groupId>com.yammer.metrics</groupId>
    -            <artifactId>metrics-ganglia</artifactId>
    -        </dependency>
    -        <dependency>
    -            <groupId>org.slf4j</groupId>
    -            <artifactId>slf4j-api</artifactId>
    -        </dependency>
    -        <dependency>
    -            <groupId>org.apache.nifi</groupId>
    -            <artifactId>nifi-mock</artifactId>
    -            <scope>test</scope>
    -        </dependency>
    -        <dependency>
    -            <groupId>org.mockito</groupId>
    -            <artifactId>mockito-all</artifactId>
    -            <scope>test</scope>
    -        </dependency>
    -    </dependencies>
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    +	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    +	<!-- 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. -->
    +	<modelVersion>4.0.0</modelVersion>
    +	<parent>
    +		<groupId>org.apache.nifi</groupId>
    +		<artifactId>nifi-standard-bundle</artifactId>
    +		<version>1.0.0-SNAPSHOT</version>
    +	</parent>
    +	<artifactId>nifi-standard-reporting-tasks</artifactId>
    +	<packaging>jar</packaging>
    +	<dependencies>
    +		<dependency>
    +			<groupId>org.apache.nifi</groupId>
    +			<artifactId>nifi-framework-core</artifactId>
    +			<version>${project.version}</version>
    +			<scope>test</scope>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.apache.nifi</groupId>
    +			<artifactId>nifi-nar-utils</artifactId>
    +			<scope>test</scope>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.apache.nifi</groupId>
    +			<artifactId>nifi-api</artifactId>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.apache.nifi</groupId>
    +			<artifactId>nifi-utils</artifactId>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.apache.nifi</groupId>
    +			<artifactId>nifi-properties</artifactId>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.apache.nifi</groupId>
    +			<artifactId>nifi-processor-utils</artifactId>
    +		</dependency>
    +		<dependency>
    +			<groupId>com.yammer.metrics</groupId>
    +			<artifactId>metrics-ganglia</artifactId>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.slf4j</groupId>
    +			<artifactId>slf4j-api</artifactId>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.apache.nifi</groupId>
    +			<artifactId>nifi-mock</artifactId>
    +			<scope>test</scope>
    +		</dependency>
    +		<dependency>
    +			<groupId>org.mockito</groupId>
    +			<artifactId>mockito-all</artifactId>
    +			<scope>test</scope>
    +		</dependency>
    +
    +	</dependencies>
    --- End diff --
    
    Looks like there are some formatting changes here that is throwing the diff out of whack.
I saw that there was only one significant difference -- the following block was added: 
    
    ```
    		<dependency>
    			<groupId>org.apache.nifi</groupId>
    			<artifactId>nifi-framework-core</artifactId>
    			<version>${project.version}</version>
    			<scope>test</scope>
    		</dependency>
    		<dependency>
    			<groupId>org.apache.nifi</groupId>
    			<artifactId>nifi-nar-utils</artifactId>
    			<scope>test</scope>
    		</dependency>
    ```
    
    Can you revert and just insert these lines?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message