Skip to content

Commit

Permalink
Upgraded Shiro and commons-digester to commons-digester3
Browse files Browse the repository at this point in the history
  • Loading branch information
@eebus
eebus committed Sep 7, 2017
1 parent e24ff70 commit c20cf89
Show file tree
Hide file tree
Showing 30 changed files with 166 additions and 52 deletions.
2 changes: 0 additions & 2 deletions community/neo4j-harness/LICENSES.txt
View file
Expand Up @@ -11,8 +11,6 @@ Apache Software License, Version 2.0
Apache HttpClient
Apache HttpCore
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
ConcurrentLinkedHashMap
Expand Down
2 changes: 0 additions & 2 deletions community/neo4j-harness/NOTICE.txt
View file
Expand Up @@ -34,8 +34,6 @@ Apache Software License, Version 2.0
Apache HttpClient
Apache HttpCore
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
ConcurrentLinkedHashMap
Expand Down
2 changes: 0 additions & 2 deletions community/server-api/LICENSES.txt
View file
Expand Up @@ -5,8 +5,6 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
Apache Software License, Version 2.0
Apache Commons Configuration
Apache Commons Lang
Commons BeanUtils
Commons Digester
Commons Lang
Commons Logging
Lucene Core
Expand Down
2 changes: 0 additions & 2 deletions community/server-api/NOTICE.txt
View file
Expand Up @@ -28,8 +28,6 @@ Third-party licenses
Apache Software License, Version 2.0
Apache Commons Configuration
Apache Commons Lang
Commons BeanUtils
Commons Digester
Commons Lang
Commons Logging
Lucene Core
Expand Down
5 changes: 0 additions & 5 deletions community/server-api/pom.xml
View file
Expand Up @@ -80,10 +80,5 @@ the relevant Commercial Agreement.
<artifactId>commons-configuration</artifactId>
</dependency>

<!-- Added directly to avoid version clash in commons-configuration. -->
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 0 additions & 2 deletions community/server/LICENSES.txt
View file
Expand Up @@ -7,8 +7,6 @@ Apache Software License, Version 2.0
Apache Commons Configuration
Apache Commons Lang
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
Commons Logging
Expand Down
2 changes: 0 additions & 2 deletions community/server/NOTICE.txt
View file
Expand Up @@ -30,8 +30,6 @@ Apache Software License, Version 2.0
Apache Commons Configuration
Apache Commons Lang
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
Commons Logging
Expand Down
5 changes: 0 additions & 5 deletions community/server/pom.xml
View file
Expand Up @@ -179,11 +179,6 @@
<artifactId>commons-configuration</artifactId>
</dependency>

<!-- Added directly to avoid version clash in commons-configuration. -->
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>

<dependency>
<groupId>commons-io</groupId>
Expand Down
11 changes: 10 additions & 1 deletion enterprise/causal-clustering/LICENSES.txt
View file
Expand Up @@ -3,10 +3,19 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
hazelcast-all
Lucene codecs
Lucene Common Analyzers
Expand Down
11 changes: 10 additions & 1 deletion enterprise/causal-clustering/NOTICE.txt
View file
Expand Up @@ -25,10 +25,19 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
hazelcast-all
Lucene codecs
Lucene Common Analyzers
Expand Down
11 changes: 10 additions & 1 deletion enterprise/ha/LICENSES.txt
View file
Expand Up @@ -3,11 +3,20 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Lang
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Lucene codecs
Lucene Common Analyzers
Lucene Core
Expand Down
11 changes: 10 additions & 1 deletion enterprise/ha/NOTICE.txt
View file
Expand Up @@ -25,11 +25,20 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Lang
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Lucene codecs
Lucene Common Analyzers
Lucene Core
Expand Down
2 changes: 2 additions & 0 deletions enterprise/metrics/LICENSES.txt
View file
Expand Up @@ -3,6 +3,8 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Graphite Integration for Metrics
Metrics Core
------------------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions enterprise/metrics/NOTICE.txt
View file
Expand Up @@ -25,6 +25,8 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Graphite Integration for Metrics
Metrics Core

Expand Down
11 changes: 10 additions & 1 deletion enterprise/neo4j-enterprise/LICENSES.txt
View file
Expand Up @@ -3,11 +3,20 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Lang
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
ConcurrentLinkedHashMap
Graphite Integration for Metrics
hazelcast-all
Expand Down
11 changes: 10 additions & 1 deletion enterprise/neo4j-enterprise/NOTICE.txt
View file
Expand Up @@ -25,11 +25,20 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Lang
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
ConcurrentLinkedHashMap
Graphite Integration for Metrics
hazelcast-all
Expand Down
12 changes: 10 additions & 2 deletions enterprise/neo4j-harness-enterprise/LICENSES.txt
View file
Expand Up @@ -3,14 +3,22 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Configuration
Apache Commons Lang
Apache Commons Logging
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
ConcurrentLinkedHashMap
Expand Down
12 changes: 10 additions & 2 deletions enterprise/neo4j-harness-enterprise/NOTICE.txt
View file
Expand Up @@ -25,14 +25,22 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Configuration
Apache Commons Lang
Apache Commons Logging
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
ConcurrentLinkedHashMap
Expand Down
2 changes: 2 additions & 0 deletions enterprise/query-logging/LICENSES.txt
View file
Expand Up @@ -3,6 +3,8 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Lucene Core
Lucene Memory
Netty/All-in-One
Expand Down
2 changes: 2 additions & 0 deletions enterprise/query-logging/NOTICE.txt
View file
Expand Up @@ -25,6 +25,8 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Lucene Core
Lucene Memory
Netty/All-in-One
Expand Down
11 changes: 10 additions & 1 deletion enterprise/security/LICENSES.txt
View file
Expand Up @@ -3,10 +3,19 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Lucene codecs
Lucene Common Analyzers
Lucene Core
Expand Down
11 changes: 10 additions & 1 deletion enterprise/security/NOTICE.txt
View file
Expand Up @@ -25,10 +25,19 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Lucene codecs
Lucene Common Analyzers
Lucene Core
Expand Down
2 changes: 1 addition & 1 deletion enterprise/security/pom.xml
View file
Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.3.2</version>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
Expand Down
12 changes: 10 additions & 2 deletions enterprise/server-enterprise/LICENSES.txt
View file
Expand Up @@ -3,13 +3,21 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Configuration
Apache Commons Lang
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
Commons Logging
Expand Down
12 changes: 10 additions & 2 deletions enterprise/server-enterprise/NOTICE.txt
View file
Expand Up @@ -25,13 +25,21 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Apache Commons BeanUtils
Apache Commons Collections
Apache Commons Compress
Apache Commons Configuration
Apache Commons Lang
Apache Shiro :: Cache
Apache Shiro :: Configuration :: Core
Apache Shiro :: Configuration :: OGDL
Apache Shiro :: Core
Apache Shiro :: Cryptography :: Ciphers
Apache Shiro :: Cryptography :: Core
Apache Shiro :: Cryptography :: Hashing
Apache Shiro :: Event
Apache Shiro :: Lang
Caffeine cache
Commons BeanUtils
Commons Digester
Commons IO
Commons Lang
Commons Logging
Expand Down

0 comments on commit c20cf89

Please sign in to comment.