This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jxpath.git


The following commit(s) were added to refs/heads/master by this push:
     new 864705c  Pick up plugin versions from parent
     new 92d12d5  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/commons-jxpath.git
864705c is described below

commit 864705c31ba6105a793685f64ff0b0b767c1fa83
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Oct 18 17:56:09 2022 -0400

    Pick up plugin versions from parent
    
    - maven-pmd-plugin
    - maven-checkstyle-plugin
    - apache-rat-plugin
    - Replace package.html with package-info.java
    - Modernize checkstyle settings for current version
---
 checkstyle.properties                              | 17 -----------
 checkstyle.xml                                     | 34 +++++++++-------------
 pom.xml                                            | 16 ++++++----
 .../commons/jxpath/functions/package-info.java     | 21 +++++++++++++
 .../apache/commons/jxpath/functions/package.html   | 20 -------------
 .../org/apache/commons/jxpath/package-info.java    | 22 ++++++++++++++
 .../java/org/apache/commons/jxpath/package.html    | 24 ---------------
 .../commons/jxpath/ri/axes/package-info.java       | 22 ++++++++++++++
 .../org/apache/commons/jxpath/ri/axes/package.html | 21 -------------
 .../commons/jxpath/ri/compiler/package-info.java   | 21 +++++++++++++
 .../apache/commons/jxpath/ri/compiler/package.html | 20 -------------
 .../jxpath/ri/model/beans/package-info.java        | 21 +++++++++++++
 .../commons/jxpath/ri/model/beans/package.html     | 20 -------------
 .../jxpath/ri/model/container/package-info.java    | 21 +++++++++++++
 .../commons/jxpath/ri/model/container/package.html | 19 ------------
 .../commons/jxpath/ri/model/dom/package-info.java  | 21 +++++++++++++
 .../commons/jxpath/ri/model/dom/package.html       | 19 ------------
 .../jxpath/ri/model/dynabeans/package-info.java    | 21 +++++++++++++
 .../commons/jxpath/ri/model/dynabeans/package.html | 19 ------------
 .../jxpath/ri/model/dynamic/package-info.java      | 21 +++++++++++++
 .../commons/jxpath/ri/model/dynamic/package.html   | 20 -------------
 .../commons/jxpath/ri/model/jdom/package-info.java | 21 +++++++++++++
 .../commons/jxpath/ri/model/jdom/package.html      | 19 ------------
 .../commons/jxpath/ri/model/package-info.java      | 21 +++++++++++++
 .../apache/commons/jxpath/ri/model/package.html    | 22 --------------
 .../org/apache/commons/jxpath/ri/package-info.java | 22 ++++++++++++++
 .../java/org/apache/commons/jxpath/ri/package.html | 21 -------------
 .../commons/jxpath/ri/parser/package-info.java     | 21 +++++++++++++
 .../apache/commons/jxpath/ri/parser/package.html   | 20 -------------
 .../commons/jxpath/servlet/package-info.java       | 22 ++++++++++++++
 .../org/apache/commons/jxpath/servlet/package.html | 21 -------------
 .../apache/commons/jxpath/util/package-info.java   | 21 +++++++++++++
 .../org/apache/commons/jxpath/util/package.html    | 19 ------------
 .../apache/commons/jxpath/xml/package-info.java    | 21 +++++++++++++
 .../org/apache/commons/jxpath/xml/package.html     | 19 ------------
 35 files changed, 364 insertions(+), 366 deletions(-)

diff --git a/checkstyle.properties b/checkstyle.properties
deleted file mode 100644
index f326807..0000000
--- a/checkstyle.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.
-
-checkstyle.cache.file=C:/temp/cache
-basedir=D:/jakarta-commons/jxpath
\ No newline at end of file
diff --git a/checkstyle.xml b/checkstyle.xml
index 2601fdd..86c727e 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -27,7 +27,7 @@
       <property name="localeLanguage" value="en"/>
       <!-- Checks that a package.html file exists for each package.     -->
       <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-      <module name="PackageHtml"/>
+      <module name="JavadocPackage"/>
   
       <!-- Checks whether files end with a new line.                        -->
       <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -36,6 +36,15 @@
       <!-- Checks that property files contain the same keys.         -->
       <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
       <module name="Translation"/>
+
+      <module name="LineLength">
+        <property name="max" value="160"/>
+      </module>
+
+      <!-- Checks for Size Violations.                    -->
+      <!-- See http://checkstyle.sf.net/config_sizes.html -->
+      <module name="FileLength"/>
+      <module name="FileTabCharacterCheck"/>
   
       <module name="TreeWalker">
 
@@ -51,9 +60,6 @@
           <module name="RightCurly">
             <property name="option" value="alone"/>
           </module>
-          <module name="LineLength">
-            <property name="max" value="132"/>
-          </module>
           <module name="MethodLength">
             <property name="max" value="175"/>
           </module>
@@ -71,8 +77,6 @@
           <!-- Checks for Javadoc comments.                     -->
           <!-- See http://checkstyle.sf.net/config_javadoc.html -->
           <module name="JavadocMethod">
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="allowMissingJavadoc" value="true"/>
           </module>
           <module name="JavadocType"/>
           <!--module name="JavadocVariable"/-->
@@ -96,13 +100,10 @@
           <module name="RedundantImport"/>
           <module name="UnusedImports"/>
   
-  
           <!-- Checks for Size Violations.                    -->
           <!-- See http://checkstyle.sf.net/config_sizes.html -->
-          <module name="FileLength"/>
           <module name="ParameterNumber"/>
   
-  
           <!-- Checks for whitespace                               -->
           <!-- See http://checkstyle.sf.net/config_whitespace.html -->
           <module name="EmptyForIteratorPad"/>
@@ -112,11 +113,9 @@
           </module>
           <module name="NoWhitespaceBefore"/>
           <module name="OperatorWrap"/>
-          <module name="TabCharacter"/>
           <module name="WhitespaceAfter"/>
           <module name="WhitespaceAround"/>
   
-  
           <!-- Modifier Checks                                    -->
           <!-- See http://checkstyle.sf.net/config_modifiers.html -->
           <module name="ModifierOrder"/>
@@ -127,11 +126,10 @@
           <!-- Checks for blocks. You know, those {}'s         -->
           <!-- See http://checkstyle.sf.net/config_blocks.html -->
           <module name="AvoidNestedBlocks"/>
-          <module name="EmptyBlock">
-            <property name="option" value="stmt" />
+          <module name="EmptyBlockCheck">
             <property name="tokens" 
value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,INSTANCE_INIT,STATIC_INIT"
 />
           </module>
-          <module name="EmptyBlock">
+          <module name="EmptyBlockCheck">
             <property name="option" value="text" />
             <property name="tokens" value="LITERAL_CATCH" />
           </module>
@@ -141,7 +139,6 @@
   
           <!-- Checks for common coding problems               -->
           <!-- See http://checkstyle.sf.net/config_coding.html -->
-          <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
           <module name="EmptyStatement"/>
           <module name="EqualsHashCode"/>
           <!--module name="HiddenField">
@@ -153,7 +150,6 @@
           <module name="InnerAssignment"/>
           <module name="MagicNumber"/>
           <module name="MissingSwitchDefault"/>
-          <module name="RedundantThrows"/>
           <module name="SimplifyBooleanExpression"/>
           <module name="SimplifyBooleanReturn"/>
   
@@ -169,12 +165,8 @@
           <!-- See http://checkstyle.sf.net/config_misc.html -->
           <module name="ArrayTypeStyle"/>
           <!--module name="FinalParameters"/-->
-          <module name="GenericIllegalRegexp">
-              <property name="format" value="\s+$"/>
-              <property name="message" value="Line has trailing spaces."/>
-          </module>
           <module name="UpperEll"/>
   
       </module>
-  
+
   </module>
diff --git a/pom.xml b/pom.xml
index e6bda86..6df1168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
   </properties> 
 
   <build>
-    <defaultGoal>clean apache-rat:check package japicmp:cmp 
javadoc:javadoc</defaultGoal>
+    <defaultGoal>clean apache-rat:check package japicmp:cmp checkstyle:check 
javadoc:javadoc</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.apache.rat</groupId>
@@ -157,6 +157,14 @@
           </links>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>${basedir}/checkstyle.xml</configLocation>
+          <excludes>org/apache/commons/jxpath/ri/parser/*</excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencyManagement>
@@ -247,8 +255,8 @@
         <version>2.2</version>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <configLocation>${basedir}/checkstyle.xml</configLocation>
           <excludes>org/apache/commons/jxpath/ri/parser/*</excludes>
@@ -257,9 +265,8 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
         <configuration>
-          <targetJdk>1.3</targetJdk>
+          <targetJdk>1.8</targetJdk>
           <excludes>
             <exclude>org/apache/commons/jxpath/ri/parser/*</exclude>
           </excludes>
@@ -289,7 +296,6 @@
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>${commons.rat.version}</version>
         <configuration>
           <excludes>
             <exclude>src/java/org/apache/commons/jxpath/ri/parser/*</exclude>
diff --git 
a/src/main/java/org/apache/commons/jxpath/functions/package-info.java 
b/src/main/java/org/apache/commons/jxpath/functions/package-info.java
new file mode 100644
index 0000000..cc0b70b
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/functions/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementations of Java class-based extension functions.
+ */
+package org.apache.commons.jxpath.functions;
diff --git a/src/main/java/org/apache/commons/jxpath/functions/package.html 
b/src/main/java/org/apache/commons/jxpath/functions/package.html
deleted file mode 100644
index e81acdc..0000000
--- a/src/main/java/org/apache/commons/jxpath/functions/package.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementations of Java class-based extension functions.
-</body>
-
diff --git a/src/main/java/org/apache/commons/jxpath/package-info.java 
b/src/main/java/org/apache/commons/jxpath/package-info.java
new file mode 100644
index 0000000..71e1025
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Public, abstract part of JXPath: interfaces and configuration. If you are a 
user of JXPath and don't plan to modify its implementation, this is the only
+ * package you'll need to use. Start with the {@link 
org.apache.commons.jxpath.JXPathContext} class.
+ */
+package org.apache.commons.jxpath;
diff --git a/src/main/java/org/apache/commons/jxpath/package.html 
b/src/main/java/org/apache/commons/jxpath/package.html
deleted file mode 100644
index b0a9526..0000000
--- a/src/main/java/org/apache/commons/jxpath/package.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-   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.
--->
-<html>
-<body>
-Public, abstract part of JXPath: interfaces and configuration. 
-If you are a user of JXPath and don't plan to modify its implementation,
-this is the only package you'll need to use.
-Start with the {@link org.apache.commons.jxpath.JXPathContext} class.
-</body>
-</html>
diff --git a/src/main/java/org/apache/commons/jxpath/ri/axes/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/axes/package-info.java
new file mode 100644
index 0000000..6176416
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/axes/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementations of EvalContext used for different XPath axes (child::, 
parent:: etc). In order to evaluate a path, RI creates a chain of EvalContexts, 
one
+ * for each step in the path.
+ */
+package org.apache.commons.jxpath.ri.axes;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/axes/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/axes/package.html
deleted file mode 100644
index ecea525..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/axes/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementations of EvalContext used for different XPath axes (child::, 
parent:: etc). 
-In order to evaluate a path, RI creates a chain of EvalContexts, one for each
-step in the path.
-</body>
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/compiler/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/compiler/package-info.java
new file mode 100644
index 0000000..fd22021
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * XPath parse tree. TreeCompiler is the class responsible for the 
construction of a parse tree out of individual elements.
+ */
+package org.apache.commons.jxpath.ri.compiler;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/compiler/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/compiler/package.html
deleted file mode 100644
index df02672..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/compiler/package.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-   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.
--->
-<body>
-XPath parse tree.  TreeCompiler is the class responsible for
-the construction of a parse tree out of individual elements.
-</body>
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/beans/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/model/beans/package-info.java
new file mode 100644
index 0000000..7a7f23b
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementation of "model" APIs for JavaBeans, Dynamic Property Objects, 
collections and null.
+ */
+package org.apache.commons.jxpath.ri.model.beans;
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/beans/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/model/beans/package.html
deleted file mode 100644
index ad1b531..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/package.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementation of "model" APIs for JavaBeans, Dynamic Property Objects,
-collections and null.
-</body>
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/container/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/model/container/package-info.java
new file mode 100644
index 0000000..7691b10
--- /dev/null
+++ 
b/src/main/java/org/apache/commons/jxpath/ri/model/container/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementation of "model" APIs for Containers.
+ */
+package org.apache.commons.jxpath.ri.model.container;
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/container/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/model/container/package.html
deleted file mode 100644
index b1db3e5..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/model/container/package.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementation of "model" APIs for Containers.
-</body>
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/dom/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/model/dom/package-info.java
new file mode 100644
index 0000000..a1471c8
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementation of "model" APIs for W3C DOM.
+ */
+package org.apache.commons.jxpath.ri.model.dom;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/model/dom/package.html
deleted file mode 100644
index e9ce5ff..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/package.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementation of "model" APIs for W3C DOM.
-</body>
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/package-info.java
new file mode 100644
index 0000000..39547d9
--- /dev/null
+++ 
b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementation of "model" APIs for Commons BeanUtils DynaBeans.
+ */
+package org.apache.commons.jxpath.ri.model.dynabeans;
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/package.html
deleted file mode 100644
index 629e8d3..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/package.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementation of "model" APIs for Commons BeanUtils DynaBeans.
-</body>
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/package-info.java
new file mode 100644
index 0000000..b615cf5
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementation of "model" APIs for dynamic property objects e.g. Maps or 
anything else for which a client can provide a DynamicPropertyHandler class.
+ */
+package org.apache.commons.jxpath.ri.model.dynamic;
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/package.html
deleted file mode 100644
index 28ea85e..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/package.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementation of "model" APIs for dynamic property objects e.g. Maps or 
anything else for
-which a client can provide a DynamicPropertyHandler class.
-</body>
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/package-info.java
new file mode 100644
index 0000000..0659e2b
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementation of "model" APIs for JDOM (see jdom.org).
+ */
+package org.apache.commons.jxpath.ri.model.jdom;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/package.html
deleted file mode 100644
index 0625a89..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/package.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementation of "model" APIs for JDOM (see jdom.org).
-</body>
\ No newline at end of file
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/model/package-info.java
new file mode 100644
index 0000000..cb215ed
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementation of "model" APIs for Containers.
+ */
+package org.apache.commons.jxpath.ri.model;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/model/package.html
deleted file mode 100644
index c432ddc..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/model/package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-   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.
--->
-<body>
-The "model" package defines APIs that are implemented 
-for every object model to be supported by JXPath. 
-The main part of this API is Pointers, which are a mechanism 
-for identifying locations of objects within an object graph.
-</body>
diff --git a/src/main/java/org/apache/commons/jxpath/ri/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/package-info.java
new file mode 100644
index 0000000..b1d1a62
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Reference implementation of JXPath. It comes with a JavaCC-based parser for 
XPath expressions, a parse tree and a fast interpreter, which applies XPaths to
+ * graphs of Java objects.
+ */
+package org.apache.commons.jxpath.ri;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/package.html
deleted file mode 100644
index 8404e12..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-   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.
--->
-<body>
-Reference implementation of JXPath. It comes with a JavaCC-based parser
-for XPath expressions, a parse tree and a fast interpreter, which
-applies XPaths to graphs of Java objects.
-</body>
\ No newline at end of file
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/parser/package-info.java 
b/src/main/java/org/apache/commons/jxpath/ri/parser/package-info.java
new file mode 100644
index 0000000..783dbac
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/ri/parser/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * JavaCC XPath grammar. All classes in this package were generated by JavaCC. 
The grammar definition is in the XPath.jj file.
+ */
+package org.apache.commons.jxpath.ri.parser;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/parser/package.html 
b/src/main/java/org/apache/commons/jxpath/ri/parser/package.html
deleted file mode 100644
index 55f9235..0000000
--- a/src/main/java/org/apache/commons/jxpath/ri/parser/package.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-   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.
--->
-<body>
-JavaCC XPath grammar. All classes in this package were generated
-by JavaCC. The grammar definition is in the XPath.jj file.
-</body>
diff --git a/src/main/java/org/apache/commons/jxpath/servlet/package-info.java 
b/src/main/java/org/apache/commons/jxpath/servlet/package-info.java
new file mode 100644
index 0000000..3ef978a
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/servlet/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Implementations of JXPathContexts bound to various servlet scopes: 
PageContext, ServletRequest, HttpSession and ServletContext. Start with the
+ * {@link org.apache.commons.jxpath.servlet.JXPathServletContexts} class.
+ */
+package org.apache.commons.jxpath.servlet;
diff --git a/src/main/java/org/apache/commons/jxpath/servlet/package.html 
b/src/main/java/org/apache/commons/jxpath/servlet/package.html
deleted file mode 100644
index 6b4ad54..0000000
--- a/src/main/java/org/apache/commons/jxpath/servlet/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-   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.
--->
-<body>
-Implementations of JXPathContexts bound to various servlet scopes: PageContext,
-ServletRequest, HttpSession and ServletContext. 
-Start with the {@link org.apache.commons.jxpath.servlet.JXPathServletContexts} 
class.
-</body>
diff --git a/src/main/java/org/apache/commons/jxpath/util/package-info.java 
b/src/main/java/org/apache/commons/jxpath/util/package-info.java
new file mode 100644
index 0000000..c33e8c3
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/util/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Utility classes to assist with JXPath implementation(s) and/or usage.
+ */
+package org.apache.commons.jxpath.util;
diff --git a/src/main/java/org/apache/commons/jxpath/util/package.html 
b/src/main/java/org/apache/commons/jxpath/util/package.html
deleted file mode 100644
index e79ea41..0000000
--- a/src/main/java/org/apache/commons/jxpath/util/package.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-   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.
--->
-<body>
-Utility classes to assist with JXPath implementation(s) and/or usage.
-</body>
diff --git a/src/main/java/org/apache/commons/jxpath/xml/package-info.java 
b/src/main/java/org/apache/commons/jxpath/xml/package-info.java
new file mode 100644
index 0000000..b44981c
--- /dev/null
+++ b/src/main/java/org/apache/commons/jxpath/xml/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+/**
+ * Support classes for working with XML.
+ */
+package org.apache.commons.jxpath.xml;
diff --git a/src/main/java/org/apache/commons/jxpath/xml/package.html 
b/src/main/java/org/apache/commons/jxpath/xml/package.html
deleted file mode 100644
index 38e4377..0000000
--- a/src/main/java/org/apache/commons/jxpath/xml/package.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-   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.
--->
-<body>
-Support classes for working with XML.
-</body>

Reply via email to