Merge branch 'resetting-cache-as-info' JCS-200
diff --git a/commons-jcs-core/src/site/resources/profile.clirr b/commons-jcs-core/src/site/resources/profile.clirr
index b5cfeb9..0a6949c 100644
--- a/commons-jcs-core/src/site/resources/profile.clirr
+++ b/commons-jcs-core/src/site/resources/profile.clirr
@@ -1 +1,18 @@
+# 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.
+
Re-enable clirr-report for core
\ No newline at end of file
diff --git a/commons-jcs-core/src/site/resources/profile.noanimal b/commons-jcs-core/src/site/resources/profile.noanimal
index 1f096a0..f55503f 100644
--- a/commons-jcs-core/src/site/resources/profile.noanimal
+++ b/commons-jcs-core/src/site/resources/profile.noanimal
@@ -1 +1,18 @@
+# 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.
+
Animal sniffer throws NPE
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6f18560..430ee61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>47</version>
+ <version>50</version>
</parent>
<artifactId>commons-jcs</artifactId>
@@ -319,7 +319,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.1.1</version>
+ <version>2.7.0</version>
<optional>true</optional>
</dependency>
@@ -560,8 +560,8 @@
<commons.javadoc.java.link>https://docs.oracle.com/javase/8/docs/api/</commons.javadoc.java.link>
<jsr107.api.version>1.0.0</jsr107.api.version>
- <commons.collections.version>4.2</commons.collections.version>
- <commons.lang.version>3.6</commons.lang.version>
+ <commons.collections.version>4.4</commons.collections.version>
+ <commons.lang.version>3.9</commons.lang.version>
<commons.clirr.version>2.8</commons.clirr.version>
<test.type>Unit</test.type>
