You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2017/04/26 10:36:08 UTC
[2/4] directory-kerby git commit: Plugin upgrades
Plugin upgrades
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/85d47716
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/85d47716
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/85d47716
Branch: refs/heads/trunk
Commit: 85d477162c9769cdf491c6084580facbfe322013
Parents: fe8e552
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 26 10:39:30 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 26 10:39:30 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/kerby/asn1/TaggingOption.java | 2 +-
pom.xml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/85d47716/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
----------------------------------------------------------------------
diff --git a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
index 154e1ab..7ac6761 100644
--- a/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
+++ b/kerby-common/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
@@ -86,7 +86,7 @@ public final class TaggingOption {
* @return tag
*/
public Tag getTag(boolean isTaggedConstructed) {
- boolean isConstructed = isImplicit ? isTaggedConstructed : true;
+ boolean isConstructed = !isImplicit || isTaggedConstructed;
TagClass tagClass = isAppSpecific ? TagClass.APPLICATION : TagClass.CONTEXT_SPECIFIC;
int flags = tagClass.getValue() | (isConstructed ? 0x20 : 0x00);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/85d47716/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b38a4f7..ce50b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,10 +56,10 @@
<nimbus.jose.version>3.10</nimbus.jose.version>
<slf4j.version>1.7.25</slf4j.version>
<assertj.version>2.6.0</assertj.version>
- <findbugs.version>3.0.3</findbugs.version>
+ <findbugs.version>3.0.4</findbugs.version>
<buildtools.dir>${basedir}/build-tools</buildtools.dir>
<skipTests>false</skipTests>
- <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
+ <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
<mockito.version>2.7.22</mockito.version>
</properties>
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <version>0.12</version>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
@@ -176,7 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>2.20</version>
<configuration>
<skipTests>${skipTests}</skipTests>
<reuseForks>false</reuseForks>
@@ -198,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.6</version>
+ <version>3.7</version>
<configuration>
<rulesets>
<ruleset>${buildtools.dir}/kerby-pmd-ruleset.xml</ruleset>