You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2019/08/21 14:03:51 UTC
[nifi-registry] branch master updated (306bfa4 -> a96b56f)
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git.
from 306bfa4 NIFIREG-311 Use H2 version 1.4.197 (#221)
new a720aa7 NIFIREG-286 - Upgrade dependencies - Upgraded bouncycastle deps - Upgraded jgit dependency. Had to include commons-codec:1.12 as without this I was seeing missing class errors. - Upgraded jackson-databind dependency version. - Upgraded logback-classic dependency. - Upgraded puppycrawl and maven-checkstyle-plugin versions. Minor adjustments to checkstyle rules as a result. - Updated logback.xml configuration as we were seeing some logback error/warnings on STDOUT.
new a96b56f NIFIREG-286 Using latest 4.x version of jgit
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nifi-registry-core/nifi-registry-framework/pom.xml | 11 ++++++++---
nifi-registry-core/nifi-registry-properties/pom.xml | 2 +-
.../properties/AESSensitivePropertyProviderTest.groovy | 9 +++++----
.../src/main/resources/conf/logback.xml | 12 ++++++------
.../nifi-registry-security-utils/pom.xml | 4 ++--
nifi-registry-core/pom.xml | 2 +-
pom.xml | 18 +++++++++---------
7 files changed, 32 insertions(+), 26 deletions(-)
[nifi-registry] 02/02: NIFIREG-286 Using latest 4.x version of jgit
Posted by bb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
commit a96b56fc89f4a945ab989b8aca85a3f6ee6dc9fa
Author: Bryan Bende <bb...@apache.org>
AuthorDate: Wed Aug 21 10:00:58 2019 -0400
NIFIREG-286 Using latest 4.x version of jgit
This closes #207.
---
nifi-registry-core/nifi-registry-framework/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nifi-registry-core/nifi-registry-framework/pom.xml b/nifi-registry-core/nifi-registry-framework/pom.xml
index 5342b47..bbb1e1d 100644
--- a/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -299,7 +299,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.4.0.201906121030-r</version>
+ <version>4.11.8.201904181247-r</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
[nifi-registry] 01/02: NIFIREG-286 - Upgrade dependencies -
Upgraded bouncycastle deps - Upgraded jgit dependency. Had to include
commons-codec:1.12 as without this I was seeing missing class errors. -
Upgraded jackson-databind dependency version. - Upgraded logback-classic
dependency. - Upgraded puppycrawl and maven-checkstyle-plugin versions.
Minor adjustments to checkstyle rules as a result. - Updated logback.xml
configuration as we were seeing some logback error/warnings on STDOUT.
Posted by bb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
commit a720aa793f4f7667144cdaac17762c6974a57a30
Author: thenatog <th...@gmail.com>
AuthorDate: Wed Jul 24 12:25:22 2019 -0400
NIFIREG-286 - Upgrade dependencies
- Upgraded bouncycastle deps
- Upgraded jgit dependency. Had to include commons-codec:1.12 as without this I was seeing missing class errors.
- Upgraded jackson-databind dependency version.
- Upgraded logback-classic dependency.
- Upgraded puppycrawl and maven-checkstyle-plugin versions. Minor adjustments to checkstyle rules as a result.
- Updated logback.xml configuration as we were seeing some logback error/warnings on STDOUT.
Signed-off-by: Bryan Bende <bb...@apache.org>
---
nifi-registry-core/nifi-registry-framework/pom.xml | 11 ++++++++---
nifi-registry-core/nifi-registry-properties/pom.xml | 2 +-
.../properties/AESSensitivePropertyProviderTest.groovy | 9 +++++----
.../src/main/resources/conf/logback.xml | 12 ++++++------
.../nifi-registry-security-utils/pom.xml | 4 ++--
nifi-registry-core/pom.xml | 2 +-
pom.xml | 18 +++++++++---------
7 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/nifi-registry-core/nifi-registry-framework/pom.xml b/nifi-registry-core/nifi-registry-framework/pom.xml
index 8962ef7..5342b47 100644
--- a/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -246,7 +246,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.55</version>
+ <version>1.61</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -299,7 +299,12 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>4.11.0.201803080745-r</version>
+ <version>5.4.0.201906121030-r</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.12</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
@@ -314,7 +319,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-registry-core/nifi-registry-properties/pom.xml b/nifi-registry-core/nifi-registry-properties/pom.xml
index e945b21..51d0d7e 100644
--- a/nifi-registry-core/nifi-registry-properties/pom.xml
+++ b/nifi-registry-core/nifi-registry-properties/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.55</version>
+ <version>1.61</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
diff --git a/nifi-registry-core/nifi-registry-properties/src/test/groovy/org/apache/nifi/registry/properties/AESSensitivePropertyProviderTest.groovy b/nifi-registry-core/nifi-registry-properties/src/test/groovy/org/apache/nifi/registry/properties/AESSensitivePropertyProviderTest.groovy
index 98fdd9b..ed071ac 100644
--- a/nifi-registry-core/nifi-registry-properties/src/test/groovy/org/apache/nifi/registry/properties/AESSensitivePropertyProviderTest.groovy
+++ b/nifi-registry-core/nifi-registry-properties/src/test/groovy/org/apache/nifi/registry/properties/AESSensitivePropertyProviderTest.groovy
@@ -277,9 +277,10 @@ class AESSensitivePropertyProviderTest extends GroovyTestCase {
SensitivePropertyProvider spp = new AESSensitivePropertyProvider(Hex.decode(getKeyOfSize(keySize)))
logger.info("Initialized ${spp.name} with key size ${keySize}")
String cipherText = spp.protect(PLAINTEXT)
+
// Remove the IV from the "complete" cipher text
final String MISSING_IV_CIPHER_TEXT = cipherText[18..-1]
- logger.info("Manipulated ${cipherText} to\n${MISSING_IV_CIPHER_TEXT.padLeft(163)}")
+ logger.info("Manipulated ${cipherText} to\n${MISSING_IV_CIPHER_TEXT.padLeft(172)}")
def msg = shouldFail(IllegalArgumentException) {
spp.unprotect(MISSING_IV_CIPHER_TEXT)
@@ -288,9 +289,9 @@ class AESSensitivePropertyProviderTest extends GroovyTestCase {
// Remove the IV from the "complete" cipher text but keep the delimiter
final String MISSING_IV_CIPHER_TEXT_WITH_DELIMITER = cipherText[16..-1]
- logger.info("Manipulated ${cipherText} to\n${MISSING_IV_CIPHER_TEXT_WITH_DELIMITER.padLeft(163)}")
+ logger.info("Manipulated ${cipherText} to\n${MISSING_IV_CIPHER_TEXT_WITH_DELIMITER.padLeft(172)}")
- def msgWithDelimiter = shouldFail(DecoderException) {
+ def msgWithDelimiter = shouldFail(IllegalArgumentException) {
spp.unprotect(MISSING_IV_CIPHER_TEXT_WITH_DELIMITER)
}
logger.expected("${msgWithDelimiter} for keySize ${keySize} and cipher text [${MISSING_IV_CIPHER_TEXT_WITH_DELIMITER}]")
@@ -299,7 +300,7 @@ class AESSensitivePropertyProviderTest extends GroovyTestCase {
assert msg == "The cipher text does not contain the delimiter || -- it should be of the form Base64(IV) || Base64(cipherText)"
// Assert
- assert msgWithDelimiter =~ "unable to decode base64 string"
+ assert msgWithDelimiter == "The IV (0 bytes) must be at least 12 bytes"
}
}
diff --git a/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml b/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml
index b32118a..2b7c5f5 100644
--- a/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml
+++ b/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml
@@ -17,10 +17,10 @@
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
</contextListener>
-
+
<appender name="APP_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${org.apache.nifi.registry.bootstrap.config.log.dir}/nifi-registry-app.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--
For daily rollover, use 'app_%d.log'.
For hourly rollover, use 'app_%d{yyyy-MM-dd_HH}.log'.
@@ -28,15 +28,15 @@
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
<fileNamePattern>${org.apache.nifi.registry.bootstrap.config.log.dir}/nifi-registry-app_%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
+ <maxFileSize>100MB</maxFileSize>
<!-- keep 30 log files worth of history -->
<maxHistory>30</maxHistory>
+ <!-- keep 10GB total of log files -->
+ <totalSizeCap>10GB</totalSizeCap>
</rollingPolicy>
+ <immediateFlush>true</immediateFlush>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date %level [%thread] %logger{40} %msg%n</pattern>
- <immediateFlush>true</immediateFlush>
</encoder>
</appender>
diff --git a/nifi-registry-core/nifi-registry-security-utils/pom.xml b/nifi-registry-core/nifi-registry-security-utils/pom.xml
index 2425209..9fb5f4f 100644
--- a/nifi-registry-core/nifi-registry-security-utils/pom.xml
+++ b/nifi-registry-core/nifi-registry-security-utils/pom.xml
@@ -26,12 +26,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.55</version>
+ <version>1.61</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.55</version>
+ <version>1.61</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-registry-core/pom.xml b/nifi-registry-core/pom.xml
index 23d9c93..7200ee0 100644
--- a/nifi-registry-core/pom.xml
+++ b/nifi-registry-core/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index 37aa061..842786d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,13 +95,14 @@
<jax.rs.api.version>2.1</jax.rs.api.version>
<jersey.version>2.27</jersey.version>
<jackson.version>2.9.9</jackson.version>
+ <jackson.databind.version>2.9.9.1</jackson.databind.version>
<spring.boot.version>2.1.6.RELEASE</spring.boot.version>
<spring.security.version>5.1.5.RELEASE</spring.security.version>
<flyway.version>5.2.4</flyway.version>
<flyway.tests.version>5.1.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
<testcontainers.version>1.11.2</testcontainers.version>
- <h2.version>1.4.197</h2.version>
+ <h2.version>1.4.197</h2.version>
</properties>
<repositories>
@@ -159,7 +160,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.3</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -420,12 +421,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
+ <version>3.0.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>6.5</version>
+ <version>8.21</version>
</dependency>
</dependencies>
</plugin>
@@ -536,13 +537,11 @@
<property name="processJavadoc" value="true" />
</module>
<module name="NoLineWrap" />
- <module name="LeftCurly">
- <property name="maxLineLength" value="160" />
- </module>
+ <module name="LeftCurly" />
<module name="RightCurly" />
<module name="RightCurly">
- <property name="option" value="alone" />
- <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT" />
+ <property name="option" value="alone_or_singleline" />
+ <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT" />
</module>
<module name="SeparatorWrap">
<property name="tokens" value="DOT" />
@@ -572,6 +571,7 @@
</module>
<module name="NonEmptyAtclauseDescription" />
<module name="JavadocMethod">
+ <property name="allowUndeclaredRTE" value="true" />
<property name="allowMissingJavadoc" value="true" />
<property name="allowMissingParamTags" value="true" />
<property name="allowMissingThrowsTags" value="true" />