Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-codec

Author: garydgregory

pom.xml

@@ -227,9 +227,6 @@ limitations under the License.
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
-    <!-- Fix to build on JDK 7: version 4.0.0 requires Java 8. -->
-    <!-- Can be dropped when CP 49 is released -->
-    <commons.felix.version>3.5.1</commons.felix.version>
     <commons.componentid>codec</commons.componentid>
     <commons.module.name>org.apache.commons.codec</commons.module.name>
     <commons.jira.id>CODEC</commons.jira.id>
@@ -409,6 +406,18 @@ limitations under the License.
     </plugins>
   </reporting>
   <profiles>
+    <!-- profile to allow the use of plugin versions that require Java 7 -->
+    <!-- TODO remove when CP updated to version 51 -->
+    <profile>
+      <id>jdk7-plugin-fix-version</id>
+      <activation>
+        <jdk>[1.7,1.8)</jdk>
+      </activation>
+      <properties>
+        <!-- Fix to build on JDK 7: version 1.18 requires Java 8. -->
+        <commons.animal-sniffer.version>1.17</commons.animal-sniffer.version>
+      </properties>
+    </profile>
     <profile>
       <id>java9+</id>
       <activation>