You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/04/14 05:40:19 UTC
[1/5] nifi git commit: NIFI-1654 Creating an initial appveyor.yml
file.
Repository: nifi
Updated Branches:
refs/heads/NIFI-1654 [created] c256e1fd3
NIFI-1654 Creating an initial appveyor.yml file.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3970c5e1
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3970c5e1
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3970c5e1
Branch: refs/heads/NIFI-1654
Commit: 3970c5e136f731dba9a594f0f7e7345ede57674c
Parents: e4b7e47
Author: Aldrin Piri <al...@apache.org>
Authored: Fri Mar 25 10:54:50 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Fri Mar 25 10:54:50 2016 -0400
----------------------------------------------------------------------
appveyor.yml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/3970c5e1/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..932211a
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,22 @@
+version: '0.6.0-SNAPSHOT-{build}'
+os: Windows Server 2012
+install:
+ - ps: |
+ Add-Type -AssemblyName System.IO.Compression.FileSystem
+ if (!(Test-Path -Path "C:\maven" )) {
+ (new-object System.Net.WebClient).DownloadFile(
+ 'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
+ 'C:\maven-bin.zip'
+ )
+ [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
+ }
+ - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
+ - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
+ - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
+build_script:
+ - mvn clean package --batch-mode -DskipTest
+test_script:
+ - mvn clean install --batch-mode -Pcontrib-check
+cache:
+ - C:\maven\
+ - C:\Users\appveyor\.m2
[4/5] nifi git commit: Merge branch 'NIFI-1654' of
https://git-wip-us.apache.org/repos/asf/nifi into NIFI-1654
Posted by al...@apache.org.
Merge branch 'NIFI-1654' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-1654
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a32338be
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a32338be
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a32338be
Branch: refs/heads/NIFI-1654
Commit: a32338be632403bf488eff6bfc963a5c586c6d91
Parents: 884c8b8 3970c5e
Author: Aldrin Piri <al...@apache.org>
Authored: Mon Apr 11 15:18:39 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Mon Apr 11 15:18:39 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/5] nifi git commit: NIFI-1654 Adjusting configuration for Appveyor
CI.
Posted by al...@apache.org.
NIFI-1654 Adjusting configuration for Appveyor CI.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c256e1fd
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c256e1fd
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c256e1fd
Branch: refs/heads/NIFI-1654
Commit: c256e1fd38fc73ee7ff3fe9d1a2fa1c4451e8254
Parents: a32338b
Author: Aldrin Piri <al...@apache.org>
Authored: Wed Apr 13 23:40:12 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed Apr 13 23:40:12 2016 -0400
----------------------------------------------------------------------
appveyor.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/c256e1fd/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 932211a..9f979ea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,20 +1,22 @@
-version: '0.6.0-SNAPSHOT-{build}'
+version: '0.7.0-SNAPSHOT-{build}'
os: Windows Server 2012
+environment:
+ JAVA_HOME: C:\Program Files\Java\jdk1.7.0
install:
- ps: |
Add-Type -AssemblyName System.IO.Compression.FileSystem
if (!(Test-Path -Path "C:\maven" )) {
(new-object System.Net.WebClient).DownloadFile(
- 'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
+ 'http://www.us.apache.org/dist/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.zip',
'C:\maven-bin.zip'
)
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
}
- - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
+ - cmd: SET PATH=C:\maven\apache-maven-3.1.1\bin;%JAVA_HOME%\bin;%PATH%
- cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
- cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
build_script:
- - mvn clean package --batch-mode -DskipTest
+ - mvn clean package --batch-mode -DskipTests
test_script:
- mvn clean install --batch-mode -Pcontrib-check
cache:
[2/5] nifi git commit: NIFI-1654 Creating an initial appveyor.yml
file.
Posted by al...@apache.org.
NIFI-1654 Creating an initial appveyor.yml file.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4ab65f7b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4ab65f7b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4ab65f7b
Branch: refs/heads/NIFI-1654
Commit: 4ab65f7b35c4a42b8ea7ca8001ac8b68841eabf3
Parents: 3e6f1f8
Author: Aldrin Piri <al...@apache.org>
Authored: Fri Mar 25 10:54:50 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Mon Apr 11 12:40:50 2016 -0400
----------------------------------------------------------------------
appveyor.yml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/4ab65f7b/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..932211a
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,22 @@
+version: '0.6.0-SNAPSHOT-{build}'
+os: Windows Server 2012
+install:
+ - ps: |
+ Add-Type -AssemblyName System.IO.Compression.FileSystem
+ if (!(Test-Path -Path "C:\maven" )) {
+ (new-object System.Net.WebClient).DownloadFile(
+ 'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
+ 'C:\maven-bin.zip'
+ )
+ [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
+ }
+ - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
+ - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
+ - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
+build_script:
+ - mvn clean package --batch-mode -DskipTest
+test_script:
+ - mvn clean install --batch-mode -Pcontrib-check
+cache:
+ - C:\maven\
+ - C:\Users\appveyor\.m2
[3/5] nifi git commit: Adding appveyor.yml to the list of excluded
items for RAT check.
Posted by al...@apache.org.
Adding appveyor.yml to the list of excluded items for RAT check.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/884c8b8f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/884c8b8f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/884c8b8f
Branch: refs/heads/NIFI-1654
Commit: 884c8b8f29ee767e0483392b67ad675c1f00fdcb
Parents: 4ab65f7
Author: Aldrin Piri <al...@apache.org>
Authored: Mon Apr 11 15:10:51 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Mon Apr 11 15:10:51 2016 -0400
----------------------------------------------------------------------
pom.xml | 53 +++++++++++++++++++++++++++--------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/884c8b8f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e9a46da..4d0a805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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
+<!-- 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. -->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -103,7 +103,7 @@ language governing permissions and limitations under the License. -->
<repositories>
<repository>
<id>central</id>
- <!-- This should be at top, it makes maven try the central repo
+ <!-- This should be at top, it makes maven try the central repo
first and then others and hence faster dep resolution -->
<name>Maven Repository</name>
<url>https://repo1.maven.org/maven2</url>
@@ -296,8 +296,8 @@ language governing permissions and limitations under the License. -->
<artifactId>quartz</artifactId>
<version>2.2.1</version>
<exclusions>
- <!-- | Exclude the quartz 2.2.1 bundled version of c3p0 because it is
- lgpl licensed | We also don't use the JDBC related features of quartz for
+ <!-- | Exclude the quartz 2.2.1 bundled version of c3p0 because it is
+ lgpl licensed | We also don't use the JDBC related features of quartz for
which the dependency would matter -->
<exclusion>
<groupId>c3p0</groupId>
@@ -367,7 +367,7 @@ language governing permissions and limitations under the License. -->
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<exclusions>
- <!-- <artifactId>jcl-over-slf4j</artifactId> is used in dependencies
+ <!-- <artifactId>jcl-over-slf4j</artifactId> is used in dependencies
section -->
<exclusion>
<groupId>commons-logging</groupId>
@@ -765,7 +765,7 @@ language governing permissions and limitations under the License. -->
<artifactId>zookeeper</artifactId>
<version>3.4.6</version>
</dependency>
-
+
<!-- Test Dependencies for testing interactions with ZooKeeper -->
<dependency>
<groupId>org.apache.curator</groupId>
@@ -779,7 +779,7 @@ language governing permissions and limitations under the License. -->
<version>6.8.8</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.3</version>
@@ -1453,7 +1453,7 @@ language governing permissions and limitations under the License. -->
</module>
<module name="OuterTypeFilename" />
<module name="LineLength">
- <!-- needs extra, because Eclipse formatter ignores the ending left
+ <!-- needs extra, because Eclipse formatter ignores the ending left
brace -->
<property name="max" value="200" />
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
@@ -1523,6 +1523,7 @@ language governing permissions and limitations under the License. -->
<exclude>nbactions.xml</exclude> <!-- courtesy excludes for netbeans users -->
<exclude>DEPENDENCIES</exclude> <!-- auto generated file by apache's maven config while building sources.zip -->
<exclude>.travis.yml</exclude> <!-- Travis CI Build Descriptor File -->
+ <exclude>appveyor.yml</exclude> <!-- AppVeyor CI Build Descriptor File -->
</excludes>
</configuration>
<dependencies>
@@ -1566,11 +1567,11 @@ language governing permissions and limitations under the License. -->
</build>
</profile>
<profile>
- <!-- Checks style and licensing requirements. This is a good idea to run
- for contributions and for the release process. While it would be nice to
- run always these plugins can considerably slow the build and have proven
- to create unstable builds in our multi-module project and when building using
- multiple threads. The stability issues seen with Checkstyle in multi-module
+ <!-- Checks style and licensing requirements. This is a good idea to run
+ for contributions and for the release process. While it would be nice to
+ run always these plugins can considerably slow the build and have proven
+ to create unstable builds in our multi-module project and when building using
+ multiple threads. The stability issues seen with Checkstyle in multi-module
builds include false-positives and false negatives. -->
<id>contrib-check</id>
<build>
@@ -1603,11 +1604,11 @@ language governing permissions and limitations under the License. -->
</build>
</profile>
<profile>
- <!-- This profile will disable DocLint which performs strict
- JavaDoc processing which was introduced in JDK 8. These are technically errors
- in the JavaDoc which we need to eventually address. However, if a release
- is performed using JDK 8, the JavaDoc generation would fail. By activating
- this profile when running on JDK 8 we can ensure the JavaDocs continue to
+ <!-- This profile will disable DocLint which performs strict
+ JavaDoc processing which was introduced in JDK 8. These are technically errors
+ in the JavaDoc which we need to eventually address. However, if a release
+ is performed using JDK 8, the JavaDoc generation would fail. By activating
+ this profile when running on JDK 8 we can ensure the JavaDocs continue to
generate successfully -->
<id>disable-doclint</id>
<activation>