remove empty param, return, throws tags,
build javadoc with doclint:all,-missing

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/bundles/tests/src/test/java/org/eclipse/persistence/testing/jaxb/installer/JaxbCompilerTestCase.java b/bundles/tests/src/test/java/org/eclipse/persistence/testing/jaxb/installer/JaxbCompilerTestCase.java
index fbb2925..db679f7 100644
--- a/bundles/tests/src/test/java/org/eclipse/persistence/testing/jaxb/installer/JaxbCompilerTestCase.java
+++ b/bundles/tests/src/test/java/org/eclipse/persistence/testing/jaxb/installer/JaxbCompilerTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
     /**
      * Tests jaxb-compiler command after unzipping eclipselink.zip.
      *
-     * @throws Exception
      */
     public void testJaxbCompiler() throws Exception {
 
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java
index 9c16321..6109680 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java
@@ -96,9 +96,6 @@
      *      }
      *  }
      *
-     * @param loader
-     * @param className
-     * @return
      */
     @Override
     public byte[] writeClass(DynamicClassLoader loader, String className) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java
index ca4f92b..5e935b1 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java
@@ -30,8 +30,6 @@
     /**
      * Creates a class name that can be used for a ReferenceAdapter subclass for the given
      * classname.
-     * @param className
-     * @return
      */
     public static String constructClassNameForReferenceAdapter(String className){
         String packageName = className.lastIndexOf('.') >= 0 ? className.substring(0, className.lastIndexOf('.')) : "";
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java
index a81958a..064407e 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java
@@ -77,10 +77,6 @@
      *     }
      * }
      *
-     * @param loader
-     * @param className
-     * @return
-     * @throws ClassNotFoundException
      */
     @Override
     public byte[] writeClass(DynamicClassLoader loader, String className) throws ClassNotFoundException {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java
index 630054c..9074408 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java
@@ -75,10 +75,6 @@
      *      }
      *  }
      *
-     * @param loader
-     * @param className
-     * @return
-     * @throws ClassNotFoundException
      */
     @Override
     public byte[] writeClass(DynamicClassLoader loader, String className)
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Operation.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Operation.java
index 05efdb0..f4911de 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Operation.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Operation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,6 @@
 
     /**
      * <p><b>INTERNAL</b>: Set this <code>Operation</code>'s name
-     * @param name
      */
     public void setName(String name) {
         this.name = name;
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Parameter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Parameter.java
index e72e23a..70058a0 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Parameter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Parameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,7 +45,6 @@
     }
     /**
      * Set name of bound argument
-     * @param name
      */
     public void setName(String name) {
         this.name = name;
@@ -59,7 +58,6 @@
     }
     /**
      * Set type of bound argument
-     * @param type
      */
     public void setType(QName type) {
         this.type = type;
@@ -73,7 +71,6 @@
     }
     /**
      * Set the optional indicator
-     * @param optional
      */
     public void setOptional(boolean optional) {
         this.optional = optional;
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceContext.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceContext.java
index e3d1515..99e1221 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceContext.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -263,8 +263,6 @@
      * For each package in the EntityManagerFactory, a MetadataSource that is capable of building a JAXBContext
      * that creates the same mappings in JAXB is created.  These MetadataSources are used to constuct the JAXContext
      * that is used for JSON and XML translation.
-     * @param metadataSources
-     * @param session
      */
     protected void addDynamicXMLMetadataSources(List<Object> metadataSources, AbstractSession session) {
         Set<String> packages = new HashSet<String>();
@@ -287,9 +285,6 @@
     /**
      * A part of the facade over the JPA API.
      * Persist an entity in JPA and commit.
-     * @param tenantId
-     * @param entity
-     * @throws Exception
      */
     public void create(Map<String, String> tenantId, Object entity) throws Exception {
         EntityManager em = getEmf().createEntityManager(tenantId);
@@ -309,8 +304,6 @@
 
     /**
      * Create a JAXBContext based on the EntityManagerFactory for this PersistenceContext.
-     * @param session
-     * @return
      */
     protected JAXBContext createDynamicJAXBContext(AbstractSession session) throws JAXBException, IOException {
         final ServiceVersion cachedContextVersion = (ServiceVersion) session.getProperty(SESSION_VERSION_PROPERTY);
@@ -332,9 +325,6 @@
     /**
      * A part of the facade over the JPA API.
      * Create an EntityManagerFactory using the given PersistenceUnitInfo and properties.
-     * @param info
-     * @param properties
-     * @return
      */
     protected EntityManagerFactoryImpl createEntityManagerFactory(PersistenceUnitInfo info, Map<String, ?> properties) {
         PersistenceProvider provider = new PersistenceProvider();
@@ -345,8 +335,6 @@
     /**
      * A part of the facade over the JPA API
      * Create an EntityManager from the EntityManagerFactory wrapped by this persistence context
-     * @param tenantId
-     * @return
      */
     protected EntityManager createEntityManager(String tenantId) {
         return getEmf().createEntityManager();
@@ -355,9 +343,6 @@
     /**
      * Build the set of properties used to create the JAXBContext based on the EntityManagerFactory that
      * this PersistenceContext wraps
-     * @param session
-     * @return
-     * @throws IOException
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     protected Map<String, Object> createJAXBProperties(AbstractSession session) throws IOException {
@@ -446,9 +431,6 @@
     /**
      * A part of the facade over the JPA API
      * Find an entity with the given name and id in JPA
-     * @param entityName
-     * @param id
-     * @return
      */
     public Object find(String entityName, Object id) {
         return find(null, entityName, id);
@@ -457,10 +439,6 @@
     /**
      * A part of the facade over the JPA API
      * Find an entity with the given name and id in JPA
-     * @param tenantId
-     * @param entityName
-     * @param id
-     * @return
      */
     public Object find(Map<String, String> tenantId, String entityName, Object id) {
         return find(tenantId, entityName, id, null);
@@ -469,11 +447,7 @@
     /**
      * A part of the facade over the JPA API
      * Find an entity with the given name and id in JPA
-     * @param tenantId
-     * @param entityName
-     * @param id
      * @param properties - query hints used on the find
-     * @return
      */
     public Object find(Map<String, String> tenantId, String entityName, Object id, Map<String, Object> properties) {
         EntityManager em = getEmf().createEntityManager(tenantId);
@@ -548,8 +522,6 @@
      * @param entityName the entity name
      * @param id the id
      * @param attribute the attribute
-     * @param listItemId
-     * @param entity
      * @param partner the partner
      * @return the object
      *
@@ -678,8 +650,6 @@
     /**
      * Look-up the given entity name in the EntityManagerFactory and return the class
      * is describes
-     * @param entityName
-     * @return
      */
     public Class<?> getClass(String entityName) {
         ClassDescriptor descriptor = getDescriptor(entityName);
@@ -715,8 +685,6 @@
      * This method will look first in the EntityManagerFactory wrapped by this persistence context
      * and return that descriptor.  If one does not exist, it search the JAXBContext and return
      * a descriptor from there.
-     * @param entityName
-     * @return
      */
     public ClassDescriptor getDescriptor(String entityName) {
         DatabaseSession session = getServerSession();
@@ -802,9 +770,6 @@
      * Call jpa merge on the given object and commit
      * If the passed object is a list, we will iterate through the
      * list and merge each member
-     * @param tenantId
-     * @param entity
-     * @return
      */
     @SuppressWarnings("rawtypes")
     public Object merge(Map<String, String> tenantId, Object entity) {
@@ -835,8 +800,6 @@
 
     /**
      * A convenience method to create a new dynamic entity of the given type
-     * @param type
-     * @return
      */
     public DynamicEntity newEntity(String type) {
         return newEntity(null, type);
@@ -844,9 +807,6 @@
 
     /**
      * A convenience method to create a new dynamic entity of the given type
-     * @param tenantId
-     * @param type
-     * @return
      */
     public DynamicEntity newEntity(Map<String, String> tenantId, String type) {
         JPADynamicHelper helper = new JPADynamicHelper(getEmf());
@@ -1115,8 +1075,6 @@
     /**
      * Make adjustments to an unmarshalled entity based on what is found in the weaved fields
      *
-     * @param entity
-     * @return
      */
     protected Object wrap(Object entity) {
         if ((entity != null) && (PersistenceWeavedRest.class.isAssignableFrom(entity.getClass()))) {
@@ -1150,10 +1108,6 @@
      * Marshall an entity to either JSON or XML
      * Calling this method, will treat relationships as unfetched in the XML/JSON and marshall them as links
      * rather than attempting to marshall the data in those relationships
-     * @param object
-     * @param mediaType
-     * @param output
-     * @throws JAXBException
      */
     public void marshallEntity(Object object, MediaType mediaType, OutputStream output) throws JAXBException {
         JPARSLogger.entering(getSessionLog(), CLASS_NAME, "marshallEntity", new Object[] { object, mediaType });
@@ -1168,7 +1122,6 @@
      * @param filter the filter (included/excluded fields) to use.
      * @param mediaType the media type (XML/JSON).
      * @param output the result.
-     * @throws JAXBException
      */
     public void marshallEntity(Object object, FieldsFilter filter, MediaType mediaType, OutputStream output) throws JAXBException {
         JPARSLogger.entering(getSessionLog(), CLASS_NAME, "marshallEntity", new Object[] { object, filter, mediaType });
@@ -1179,12 +1132,8 @@
     /**
      * Marshall an entity to either JSON or XML.
      *
-     * @param object
-     * @param mediaType
-     * @param output
      * @param sendRelationships if this is set to true, relationships will be sent as links instead of sending.
      * the actual objects in the relationships
-     * @throws JAXBException
      */
     public void marshall(Object object, MediaType mediaType, OutputStream output, boolean sendRelationships) throws JAXBException {
         marshall(object, mediaType, output, sendRelationships, null);
@@ -1199,7 +1148,6 @@
      * @param sendRelationships if this is set to true, relationships will be sent as links instead of sending
      *                          the actual objects in the relationships.
      * @param fieldsFilter      Specifies fields to include/exclude from the response.
-     * @throws JAXBException
      */
     public void marshall(final Object object, final MediaType mediaType, final OutputStream output, boolean sendRelationships, final FieldsFilter fieldsFilter) throws JAXBException {
         if (version.compareTo(ServiceVersion.VERSION_2_0) < 0 && sendRelationships) {
@@ -1260,7 +1208,6 @@
     /**
      * Process an entity and add any additional data that needs to be added prior to marshalling
      * This method will both single entities and lists of entities
-     * @param object
      */
     @SuppressWarnings("rawtypes")
     protected void preMarshallEntity(Object object) {
@@ -1276,7 +1223,6 @@
     /**
      * Add any data required prior to marshalling an entity to XML or JSON
      * In general, this will only affect fields that have been weaved into the object
-     * @param entity
      */
     @SuppressWarnings("rawtypes")
     protected void preMarshallIndividualEntity(Object entity) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java
index e95b404..99067cc 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -133,9 +133,6 @@
 
     /**
      * Provide an initial set of properties for bootstrapping PersistenceContexts.
-     * @param dcl
-     * @param originalProperties
-     * @return
      */
     protected static Map<String, Object> createProperties(DynamicClassLoader dcl, Map<String, ?> originalProperties) {
         Map<String, Object> properties = new HashMap<>();
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/eventlistener/DescriptorBasedDatabaseEventListener.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/eventlistener/DescriptorBasedDatabaseEventListener.java
index ee2207a..5f883cd 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/eventlistener/DescriptorBasedDatabaseEventListener.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/eventlistener/DescriptorBasedDatabaseEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,8 +31,6 @@
 
     /**
      * Register for change notifications on a particular descriptor
-     * @param session
-     * @param queryName
      */
     public void register(Session session, String queryName);
 
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/logging/LoggingLocalization.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/logging/LoggingLocalization.java
index 428d367..87d4290 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/logging/LoggingLocalization.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/logging/LoggingLocalization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,10 +32,6 @@
      * INTERNAL:
      * Return the message for the given exception class and error number.
      * Based on the state of the translate flag - look up translation for the key:value message
-     * @param key
-     * @param arguments
-     * @param translate
-     * @return
      */
     public static String buildMessage(String key, Object[] arguments, boolean translate) {
         String message = key;
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/IdHelper.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/IdHelper.java
index 21e4f70..dd09760 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/IdHelper.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/IdHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -178,10 +178,6 @@
     /**
      * build a shell of an object based on a primary key.  The object shell will be an instance of the object with
      * only primary key populated
-     * @param context
-     * @param entityType
-     * @param id
-     * @return
      */
     public static Object buildObjectShell(PersistenceContext context, String entityType, Object id) {
         ClassDescriptor descriptor = context.getDescriptor(entityType);
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapter.java
index 363a35a..b4aff92 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapter.java
@@ -227,8 +227,6 @@
 
     /**
      * Update the targetMapping to have the same accessor as the originMapping
-     * @param originMapping
-     * @param targetMapping
      */
     private static void copyAccessorToMapping(DatabaseMapping originMapping, DatabaseMapping targetMapping) {
         if (originMapping.getAttributeAccessor().isVirtualAttributeAccessor()) {
@@ -251,9 +249,6 @@
     /**
      * Build an XMLInverseMapping based on a particular mapping and replace that mapping with
      * the newly created XMLInverseMapping in jaxbDescriptor
-     * @param jaxbDescriptor
-     * @param mapping
-     * @param jpaMapping
      */
     private static void convertMappingToXMLInverseReferenceMapping(ClassDescriptor jaxbDescriptor, DatabaseMapping mapping, ForeignReferenceMapping jpaMapping) {
         if ((mapping != null) && (jaxbDescriptor != null)) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java
index 057cfa4..d8abb73 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java
@@ -73,9 +73,6 @@
      * For static classes, JAXB annotations, xml and defaults will be used to map the class.
      * For Dynamic classes we create properties for each JPA mapping on the class
      * thing we create is a
-     * @param classDescriptor
-     * @param objectFactory
-     * @return
      */
     private JavaType createJAXBType(ClassDescriptor classDescriptor, ObjectFactory objectFactory) {
         JavaType javaType = new JavaType();
@@ -114,11 +111,6 @@
      * Create a JAXB property for a particular mapping.
      * This will only create JAXBProperties for mappings that are virtual - either because their
      * parent object is a dynamic class, or because the owning static class has virtual properties
-     * @param mapping
-     * @param objectFactory
-     * @param owningType
-     * @param isDynamic
-     * @return
      */
     private JAXBElement<XmlElement> createJAXBProperty(DatabaseMapping mapping, ObjectFactory objectFactory, JavaType owningType, boolean isDynamic) {
         if (!mapping.getAttributeAccessor().isVirtualAttributeAccessor() &&
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/xmladapters/ReferenceAdapterV2.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/xmladapters/ReferenceAdapterV2.java
index b783d7f..21f51ff 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/xmladapters/ReferenceAdapterV2.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/xmladapters/ReferenceAdapterV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,9 +55,6 @@
     /**
      * Marshal just passes through.
      *
-     * @param o
-     * @return
-     * @throws Exception
      */
     @Override
     public T marshal(T o) throws Exception {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Job.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Job.java
index 8190c33..f4763ad 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Job.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Job.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,7 +20,6 @@
 /**
  * Insert the type's description here.
  * Creation date: (6/7/00 9:56:29 AM)
- * @author: Administrator
  */
 public class Job {
     String title;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Worker.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Worker.java
index ba477f6..8208c62 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Worker.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/aggregate/Worker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,7 +19,6 @@
 /**
  * Insert the type's description here.
  * Creation date: (6/7/00 9:53:49 AM)
- * @author: Administrator
  */
 public class Worker {
     public int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappings.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappings.java
index e9e7f47..4e9eec3 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappings.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 04, 2003
  */
 public class DirectMapMappings {
     public int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsProject.java
index a1fd392..01d9a84 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsProject.java
@@ -27,7 +27,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 04, 2003
  */
 public class DirectMapMappingsProject extends Project {
     public DirectMapMappingsProject() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsSystem.java
index 7bc5362..2e98abc 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsSystem.java
@@ -22,7 +22,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 04, 2003
  */
 public class DirectMapMappingsSystem extends TestSystem {
     public DirectMapMappingsSystem() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsTableCreator.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsTableCreator.java
index 785e12d..c268976 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsTableCreator.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/directmap/DirectMapMappingsTableCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 04, 2003
  */
 public class DirectMapMappingsTableCreator extends TableCreator {
     public DirectMapMappingsTableCreator() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/LabradorRetriever.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/LabradorRetriever.java
index ec37b3e..ba3321e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/LabradorRetriever.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/LabradorRetriever.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,7 +19,6 @@
 /**
  * Insert the type's description here.
  * Creation date: (1/10/01 9:21:09 AM)
- * @author: Administrator
  */
 public class LabradorRetriever extends Dog {
 
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Cow.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Cow.java
index 625cf51..1a0674d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Cow.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Cow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,7 +20,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date June 17, 2005
  */
 public class Cow {
     protected int cowId;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Horse.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Horse.java
index e492d10..df316ef 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Horse.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Horse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,7 +20,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date June 17, 2005
  */
 public class Horse {
     protected int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Human.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Human.java
index c1fe578..3b1d073 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Human.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Human.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,7 +19,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date May 28, 2007
  */
 public class Human {
     protected int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableProject.java
index f733b22..3c57381 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date June 17, 2005
  */
 public class MultipleTableProject extends Project {
     public MultipleTableProject() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableSystem.java
index 9a15b950..c111cb4 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableSystem.java
@@ -24,7 +24,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date June 17, 2005
  */
 public class MultipleTableSystem extends TestSystem {
     public MultipleTableSystem() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableTableCreator.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableTableCreator.java
index 17857d7..92b56b2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableTableCreator.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/MultipleTableTableCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date June 17, 2005
  */
 public class MultipleTableTableCreator extends TableCreator {
     public MultipleTableTableCreator() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Swan.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Swan.java
index e9faf3e..95420ea 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Swan.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/multipletable/Swan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,7 +19,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date May 28, 2007
  */
 public class Swan {
     protected int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java
index ff3bebe..6e9d66f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrder.java
@@ -22,7 +22,7 @@
 
 /**
  * Simple order object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public abstract class AbstractOrder implements Serializable {
     public int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrderLine.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrderLine.java
index 4614d88..22f09d3 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrderLine.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractOrderLine.java
@@ -18,7 +18,7 @@
 
 /**
  * Simple order line object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public abstract class AbstractOrderLine implements Serializable, Cloneable {
     public int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractSalesRep.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractSalesRep.java
index 730d660..9ec1806 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractSalesRep.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/AbstractSalesRep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,7 +19,7 @@
 
 /**
  * Simple sales rep object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class AbstractSalesRep implements Serializable {
     public int id;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipProject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipProject.java
index f50916b..5893ced 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipProject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,6 @@
 /**
  * @author Guy Pelletier
  * @version 1.0
- * @date March 21, 2005
  */
 public class BidirectionalRelationshipProject extends Project {
     public BidirectionalRelationshipProject(DatabaseSession session) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipSystem.java
index edafb64..a131148 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipSystem.java
@@ -20,7 +20,6 @@
 /**
  * @author Guy Pelletier
  * @version 1.0
- * @date March 21, 2005
  */
 public class BidirectionalRelationshipSystem extends TestSystem {
     public BidirectionalRelationshipSystem() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipTableCreator.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipTableCreator.java
index 8f8b699..19bb985 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipTableCreator.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/BidirectionalRelationshipTableCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,7 +21,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 21, 2005
  */
 public class BidirectionalRelationshipTableCreator extends TableCreator {
     public BidirectionalRelationshipTableCreator() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrder.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrder.java
index 6c50810..9b6bda3 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrder.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrder.java
@@ -19,7 +19,7 @@
 /**
  * Simple order object. Just a test fixture.
  * Collections are held in Maps.
- * @author: Big Country
+ * @author Big Country
  */
 public class MappedOrder extends AbstractOrder {
     public Map salesReps;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrderLine.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrderLine.java
index ca8bc08..501c84e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrderLine.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedOrderLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,7 +17,7 @@
 
 /**
  * Simple order line object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class MappedOrderLine extends AbstractOrderLine {
     public MappedOrderLine() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedSalesRep.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedSalesRep.java
index 4d68145..a70608d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedSalesRep.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/MappedSalesRep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,7 +16,7 @@
 
 /**
  * Simple sales rep object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class MappedSalesRep extends AbstractSalesRep {
     public MappedSalesRep() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Order.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Order.java
index 71421da..25cfe58 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Order.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/Order.java
@@ -18,7 +18,7 @@
 
 /**
  * Simple order object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class Order extends AbstractOrder {
     public Collection salesReps;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/OrderLine.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/OrderLine.java
index 7d237eb..350adbb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/OrderLine.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/OrderLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,7 +17,7 @@
 
 /**
  * Simple order line object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class OrderLine extends AbstractOrderLine {
     public OrderLine() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SalesRep.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SalesRep.java
index 710a778..293f4f3 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SalesRep.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SalesRep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,7 +16,7 @@
 
 /**
  * Simple sales rep object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class SalesRep extends AbstractSalesRep {
     public SalesRep() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrder.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrder.java
index 55b06de..22a9265 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrder.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrder.java
@@ -20,7 +20,7 @@
  * Simple order object. Just a test fixture.
  * Collections are held in Sets.
  * this should only be used in jdk1.2+
- * @author: Big Country
+ * @author Big Country
  */
 public class SetOrder extends Order {
 
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrderLine.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrderLine.java
index cf2c8e5..175fee8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrderLine.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetOrderLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,7 +17,7 @@
 
 /**
  * Simple order line object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class SetOrderLine extends AbstractOrderLine {
     public SetOrderLine() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetSalesRep.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetSalesRep.java
index 9959974..20a4b8a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetSalesRep.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/transparentindirection/SetSalesRep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,7 +16,7 @@
 
 /**
  * Simple sales rep object. Just a test fixture.
- * @author: Big Country
+ * @author Big Country
  */
 public class SetSalesRep extends AbstractSalesRep {
     public SetSalesRep() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateInheritanceTypeFieldTestCase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateInheritanceTypeFieldTestCase.java
index 099e794..3b22917 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateInheritanceTypeFieldTestCase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AggregateInheritanceTypeFieldTestCase.java
@@ -23,7 +23,7 @@
 /**
  * Test to ensure that the type field in an aggregate with inheritance is not updated when it is
  * not changed
- * @author: Tom Ware
+ * @author Tom Ware
  */
 public class AggregateInheritanceTypeFieldTestCase extends org.eclipse.persistence.testing.framework.AutoVerifyTestCase {
     public AggregateUpdateDescriptorListener listener = null;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java
index 6d756cb..8e5ef5a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingDeleteTest.java
@@ -27,7 +27,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date June 12, 2003
  */
 public class DirectMapMappingDeleteTest extends AutoVerifyTestCase {
     DirectMapMappings queryResult;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java
index 84b1a42..da0ea5c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingHashMapTest.java
@@ -27,7 +27,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date July 26, 2005
  */
 public class DirectMapMappingHashMapTest extends AutoVerifyTestCase {
     private NullPointerException m_exception;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingModel.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingModel.java
index a8724d6..c412585 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingModel.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapMappingModel.java
@@ -22,7 +22,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 04, 2003
  */
 public class DirectMapMappingModel extends TestModel {
     public DirectMapMappingModel() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java
index 5382911..3d79abb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/DirectMapUnitOfWorkTest.java
@@ -23,7 +23,6 @@
 
 /**
  * @author Gordon Yorke
- * @date May 11, 2005
  */
 public class DirectMapUnitOfWorkTest extends AutoVerifyTestCase {
     boolean m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java
index 77348b2..884aca4 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithDirectMapMappingTest.java
@@ -28,7 +28,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 04, 2003
  */
 public class MergeChangeSetWithDirectMapMappingTest extends TransactionalTestCase {
     boolean m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java
index f35deb4..02df88f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/directmap/MergeChangeSetWithIndirectDirectMapMappingTest.java
@@ -26,7 +26,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 04, 2003
  */
 public class MergeChangeSetWithIndirectDirectMapMappingTest extends TransactionalTestCase {
     boolean m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java
index 25c4e41..8f4584a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/UpdateObjectInvalidationTest.java
@@ -26,7 +26,6 @@
  * Test to ensure a remote object is invalidated when updated and its
  * descriptor is configured to INVALIDATE_CHANGED_OBJECTS
  * @author dminsky
- * @date May-01-2008
  */
 public class UpdateObjectInvalidationTest extends ConfigurableCacheSyncDistributedTest {
 
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/QuerySQLTracker.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/QuerySQLTracker.java
index 10b7520..3e9917b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/QuerySQLTracker.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/QuerySQLTracker.java
@@ -48,7 +48,6 @@
     /**
      * Constructs and installs the event listener and sql tracking session log
      *
-     * @param session
      */
     private QuerySQLTracker(Session session) {
         session.getEventManager().addListener(this);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/BadExpressionTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/BadExpressionTest.java
index ee70b33..3cc4d85 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/BadExpressionTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/BadExpressionTest.java
@@ -22,7 +22,6 @@
 /**
  * Generic test to ensure that the correct exceptions are being thrown for bad expressions.
  * @author Peter O'Blenis
- * @date Feb. 3/99
  */
 public class BadExpressionTest extends AutoVerifyTestCase {
     // Expression to test
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/SearchTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/SearchTest.java
index bc64395..24ab2a4 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/SearchTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/expressions/SearchTest.java
@@ -23,7 +23,6 @@
  * Generic test to check if any results were returned as the result of a expression query.
  * If result vector is empty then throw an exception with specified message.
  * @author Peter O'Blenis
- * @date Feb. 3/99
  */
 public class SearchTest extends AutoVerifyTestCase {
     // Expression to test
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/IntegrityCheckerLazyCreationTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/IntegrityCheckerLazyCreationTest.java
index 8c0c73d..835f827 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/IntegrityCheckerLazyCreationTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/IntegrityCheckerLazyCreationTest.java
@@ -19,13 +19,12 @@
 import org.eclipse.persistence.testing.framework.AutoVerifyTestCase;
 import org.eclipse.persistence.testing.framework.TestErrorException;
 
-/*
+/**
  * Tests that the integrityChecker is lazily initialized on the session after
  * calling getIntegrityChecker()
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date January 28, 2003
  */
 public class IntegrityCheckerLazyCreationTest extends AutoVerifyTestCase {
     IntegrityChecker integrityChecker;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullPasswordLoginTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullPasswordLoginTest.java
index 813ca3d..8a85463 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullPasswordLoginTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/NullPasswordLoginTest.java
@@ -21,7 +21,7 @@
 /**
  * Insert the type's description here.
  * Creation date: (6/5/00 2:38:36 PM)
- * @author: Administrator
+ * @author Administrator
  */
 public class NullPasswordLoginTest extends org.eclipse.persistence.testing.framework.AutoVerifyTestCase {
 
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchDescriptorQueryManagerTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchDescriptorQueryManagerTest.java
index dfb8c2f..b5afd08 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchDescriptorQueryManagerTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchDescriptorQueryManagerTest.java
@@ -77,7 +77,6 @@
 
        /**
         * Iterate and register a number of objects in the unitOfWork
-        * @param uow
         */
        @Override
        protected List<Employee>  registerObjects(UnitOfWork uow) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchTestCase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchTestCase.java
index eeccc7b..d38f142 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchTestCase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/QueryTimeoutBatchTestCase.java
@@ -123,7 +123,6 @@
     /**
      * Setup the platform to perform batch inserts
      * Return to previous state after running
-     * @return
      */
     protected UnitOfWork setupPlatform() {
         Session session = getSession();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/JPQLTestCase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/JPQLTestCase.java
index d93a88a..a8406f2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/JPQLTestCase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/jpql/JPQLTestCase.java
@@ -103,9 +103,6 @@
      * Return the first employee that has a long enough name for the test.
      * If no match is found throw a warning exception.
      * See bug 223005
-     * @param minFirstNameLength
-     * @param testName
-     * @return
      */
     public Employee getEmployeeWithRequiredNameLength(int minFirstNameLength, String testName) {
         return getEmployeeWithRequiredNameLength(getSomeEmployees(), minFirstNameLength, testName);
@@ -115,10 +112,6 @@
      * Return the first employee that has a long enough name for the test.
      * If no match is found throw a warning exception.
      * See bug 223005
-     * @param vectorOfEmployees
-     * @param minFirstNameLength
-     * @param testName
-     * @return
      */
     public Employee getEmployeeWithRequiredNameLength(Vector vectorOfEmployees, int minFirstNameLength, String testName) {
         Employee empMatch = null;
@@ -212,7 +205,6 @@
 
     /**
      * Set the ejbql string to the passed value
-     * @param theEjbqlString
      */
     public void setEjbqlString(String theEjbqlString) {
         this.ejbql = theEjbqlString;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableModel.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableModel.java
index 45318d3..ba91f9b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableModel.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableModel.java
@@ -30,7 +30,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date May 28, 2007
  */
 public class MultipleTableModel extends TestModel {
     public MultipleTableModel() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableTest.java
index 82b722f..071626b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/multipletable/MultipleTableTest.java
@@ -27,7 +27,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date May 28/07
  */
 public class MultipleTableTest extends AutoVerifyTestCase {
     private Object m_testObject;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/optimization/queryandsqlcounting/QuerySQLTracker.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/optimization/queryandsqlcounting/QuerySQLTracker.java
index 816cb62..2b17fce 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/optimization/queryandsqlcounting/QuerySQLTracker.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/optimization/queryandsqlcounting/QuerySQLTracker.java
@@ -37,7 +37,6 @@
     /**
      * Instantiating a QuerySQLTracker will replace the session's log with the QuerySQLTracker
      * and store the old log.  The old log will be replaced when remove() is called.
-     * @param session
      */
     public QuerySQLTracker(Session session) {
         this.originalLog = session.getSessionLog();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/DataReadQueryContainerPolicyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/DataReadQueryContainerPolicyTest.java
index 4279fb0..878d9e6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/DataReadQueryContainerPolicyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/DataReadQueryContainerPolicyTest.java
@@ -30,7 +30,7 @@
  *
  * See BUG# 3337003
  *
- * @auther Guy Pelletier
+ * @author Guy Pelletier
  * @version 1.0 January 12/04
  */
 public class DataReadQueryContainerPolicyTest extends TestCase {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryExceptionStringTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryExceptionStringTest.java
index a817348..429eb2e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryExceptionStringTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryExceptionStringTest.java
@@ -23,7 +23,6 @@
  * domain class, if available.
  *
  * @author Guy Pelletier
- * @date January 21, 2003
  */
 public class QueryExceptionStringTest extends MultiNameQueriesTestCase {
     private DatabaseSession session;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/BatchReadingWithInvalidQueryKeyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/BatchReadingWithInvalidQueryKeyTest.java
index 8803feb..e78327c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/BatchReadingWithInvalidQueryKeyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/BatchReadingWithInvalidQueryKeyTest.java
@@ -26,7 +26,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date October 5, 2004
  */
 public class BatchReadingWithInvalidQueryKeyTest extends TestCase {
     private ValidationException m_validationException;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/QuerySQLTracker.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/QuerySQLTracker.java
index f94d31a..f4cd000 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/QuerySQLTracker.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/optimization/QuerySQLTracker.java
@@ -38,7 +38,6 @@
     /**
      * Instantiating a QuerySQLTracker will replace the session's log with the QuerySQLTracker
      * and store the old log.  The old log will be replaced when remove() is called.
-     * @param session
      */
     public QuerySQLTracker(Session session) {
         this.originalLog = session.getSessionLog();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Brewer.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Brewer.java
index 655ce2b..054eaed 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Brewer.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/report/Brewer.java
@@ -19,7 +19,7 @@
 /**
  * Insert the type's description here.
  * Creation date: (3/2/2003 8:51:02 AM)
- * @author: Administrator
+ * @author Administrator
  */
 public class Brewer implements Cloneable, java.io.Serializable {
     protected String key = null;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/MWConfigModelEncryptionTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/MWConfigModelEncryptionTest.java
index 8ce92a2..dd9ce34 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/MWConfigModelEncryptionTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/MWConfigModelEncryptionTest.java
@@ -27,7 +27,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date Septmeber 28, 2004
  */
 public class MWConfigModelEncryptionTest extends AutoVerifyTestCase {
     DatabaseSessionConfig m_sessionConfig1;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/ServerSessionEventListener.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/ServerSessionEventListener.java
index 4a4413c..2701714 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/ServerSessionEventListener.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/ServerSessionEventListener.java
@@ -27,7 +27,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date July 15, 2004
  */
 public class ServerSessionEventListener extends SessionEventAdapter {
     public static final String FILENAME = "ServerSessionEventListener";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionBrokerEventListener.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionBrokerEventListener.java
index 4ec4b99..cc5acf5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionBrokerEventListener.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionBrokerEventListener.java
@@ -27,7 +27,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date July 15, 2004
  */
 public class SessionBrokerEventListener extends SessionEventAdapter {
     public static final String FILENAME = "SessionBrokerEventListener";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionNotFoundTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionNotFoundTest.java
index ece4d78..f9586d1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionNotFoundTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionNotFoundTest.java
@@ -33,7 +33,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date September 27, 2004
  */
 public class SessionManagerGetSessionNotFoundTest extends AutoVerifyTestCase {
     DatabaseSession m_session;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionStringStringTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionStringStringTest.java
index 18a08ec..b08e0d9 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionStringStringTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionManagerGetSessionStringStringTest.java
@@ -28,7 +28,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date September 27, 2004
  */
 public class SessionManagerGetSessionStringStringTest extends AutoVerifyTestCase {
     DatabaseSession m_session = null;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaDefaultValueTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaDefaultValueTest.java
index 44b55db..d0d34c2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaDefaultValueTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaDefaultValueTest.java
@@ -34,9 +34,7 @@
  * BUG #3455771 and 3454653
  *
  * @author Guy Pelletier
- * @revisor Edwin Tang
  * @version 2.0
- * @date December 08, 2004
  */
 public class SessionsXMLSchemaDefaultValueTest extends AutoVerifyTestCase {
     DatabaseSession employeeSession;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaIncorrectTagValuesTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaIncorrectTagValuesTest.java
index 03fdbd8..74d9476 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaIncorrectTagValuesTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaIncorrectTagValuesTest.java
@@ -27,7 +27,6 @@
  *
  * @author Edwin Tang
  * @version 1.0
- * @date December 2, 2004
  */
 public class SessionsXMLSchemaIncorrectTagValuesTest extends TestCase {
     Exception exception = null;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaInvalidTagTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaInvalidTagTest.java
index a9d05b6..0350e39 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaInvalidTagTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaInvalidTagTest.java
@@ -26,7 +26,6 @@
  *
  * @author Edwin Tang
  * @version 1.0
- * @date December 2, 2004
  */
 public class SessionsXMLSchemaInvalidTagTest extends TestCase {
     Exception exception = null;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaJBossPlatformTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaJBossPlatformTest.java
index ee6c913..7a0ff9e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaJBossPlatformTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaJBossPlatformTest.java
@@ -26,7 +26,6 @@
  * Tests server platform tag for JBoss.
  *
  * @version 1.0
- * @date July 22, 2005
  */
 public class SessionsXMLSchemaJBossPlatformTest extends AutoVerifyTestCase {
     Exception m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaMisplacedDependentTagTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaMisplacedDependentTagTest.java
index e92e61d..547572a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaMisplacedDependentTagTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaMisplacedDependentTagTest.java
@@ -26,7 +26,6 @@
  *
  * @author Edwin Tang
  * @version 1.0
- * @date December 2, 2004
  */
 public class SessionsXMLSchemaMisplacedDependentTagTest extends TestCase {
     Exception exception = null;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaNoLoggingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaNoLoggingTest.java
index f8916bf..bf4b667 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaNoLoggingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaNoLoggingTest.java
@@ -26,7 +26,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date February 13, 2004
  */
 public class SessionsXMLSchemaNoLoggingTest extends AutoVerifyTestCase {
     boolean m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaProjectXMLTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaProjectXMLTest.java
index 47143f2..96b9a17 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaProjectXMLTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaProjectXMLTest.java
@@ -27,7 +27,6 @@
  *
  * @author Edwin Tang
  * @version 1.0
- * @date December 14, 2004
  */
 public class SessionsXMLSchemaProjectXMLTest extends AutoVerifyTestCase {
     DatabaseSession employeeSession;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaReloadTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaReloadTest.java
index 20a207b..2b85692 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaReloadTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaReloadTest.java
@@ -28,7 +28,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date November 18, 2003
  */
 public class SessionsXMLSchemaReloadTest extends TestCase {
     DatabaseSession employeeSession;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaSequencingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaSequencingTest.java
index aad4fde..7020408 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaSequencingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaSequencingTest.java
@@ -36,7 +36,6 @@
  *
  * @author Andrei Ilitchev
  * @version 1.0
- * @date June 11, 2004
  */
 public class SessionsXMLSchemaSequencingTest extends AutoVerifyTestCase {
     final int numSessions = 4;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaTest.java
index 77186f0..22bee8e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaTest.java
@@ -29,7 +29,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date November 18, 2003
  */
 public class SessionsXMLSchemaTest extends AutoVerifyTestCase {
     DatabaseSession employeeSession;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWeblogicPlatformTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWeblogicPlatformTest.java
index 8b8300a..cd3bb55 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWeblogicPlatformTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWeblogicPlatformTest.java
@@ -28,7 +28,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date September 4, 2008
  */
 public class SessionsXMLSchemaWeblogicPlatformTest extends AutoVerifyTestCase {
     Exception m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWebsphere61PlatformTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWebsphere61PlatformTest.java
index 0715e35..3a5eb86 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWebsphere61PlatformTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWebsphere61PlatformTest.java
@@ -26,7 +26,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date July 22, 2005
  */
 public class SessionsXMLSchemaWebsphere61PlatformTest extends AutoVerifyTestCase {
     Exception m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java
index 33b1e71..9c1bc2e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSchemaWriteTest.java
@@ -45,7 +45,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date November 18, 2003
  */
 public class SessionsXMLSchemaWriteTest extends AutoVerifyTestCase {
     private File m_resource;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLServerSessionSchemaTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLServerSessionSchemaTest.java
index eeda166..a824e0d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLServerSessionSchemaTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLServerSessionSchemaTest.java
@@ -28,7 +28,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date February 25, 2004
  */
 public class SessionsXMLServerSessionSchemaTest extends AutoVerifyTestCase {
     ServerSession serverSession;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSessionEventListenerTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSessionEventListenerTest.java
index 81fd346..21afb10 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSessionEventListenerTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/SessionsXMLSessionEventListenerTest.java
@@ -30,7 +30,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date July 15, 2004
  */
 public class SessionsXMLSessionEventListenerTest extends AutoVerifyTestCase {
     SessionBroker m_sessionBroker;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrentDecryptionTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrentDecryptionTest.java
index 6707a6e..99db136 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrentDecryptionTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/simultaneous/ConcurrentDecryptionTest.java
@@ -21,7 +21,6 @@
 
 /**
  * @author Chris Delahunt
- * @date June 26, 2003
  *  Test fix for 318187:
  *  java.lang.NegativeArraySizeException is thrown when threads concurrently access the
  *  JCEEncryptor.decrypt(password)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/BidirectionalRelationshipMaintenanceTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/BidirectionalRelationshipMaintenanceTest.java
index e4b256a..95c2149 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/BidirectionalRelationshipMaintenanceTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/BidirectionalRelationshipMaintenanceTest.java
@@ -26,7 +26,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 21, 2005
  */
 public class BidirectionalRelationshipMaintenanceTest extends AutoVerifyTestCase {
     boolean m_exceptionCaught;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectContainerTestDatabase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectContainerTestDatabase.java
index dae7be2..7c080f5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectContainerTestDatabase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectContainerTestDatabase.java
@@ -30,7 +30,7 @@
 
 /**
  * Test the IndirectList with assorted DatabaseSessions and UnitsOfWork.
- * @author: Big Country
+ * @author Big Country
  */
 public class IndirectContainerTestDatabase extends ZTestCase {
     int originalID;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectListTestDatabase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectListTestDatabase.java
index 54e0d11..3e81080 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectListTestDatabase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectListTestDatabase.java
@@ -22,7 +22,7 @@
 
 /**
  * Test the IndirectList with assorted DatabaseSessions and UnitsOfWork.
- * @author: Big Country
+ * @author Big Country
  */
 public class IndirectListTestDatabase extends IndirectContainerTestDatabase {
 
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectMapTestDatabase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectMapTestDatabase.java
index fe63b2d..6928021 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectMapTestDatabase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectMapTestDatabase.java
@@ -26,7 +26,7 @@
 
 /**
  * Test the IndirectMap with assorted DatabaseSessions and UnitsOfWork.
- * @author: Big Country
+ * @author Big Country
  */
 public class IndirectMapTestDatabase extends IndirectContainerTestDatabase {
     public IndirectMapTestDatabase(String name) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectSetTestDatabase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectSetTestDatabase.java
index ef1e249..4041185 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectSetTestDatabase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/transparentindirection/IndirectSetTestDatabase.java
@@ -26,7 +26,7 @@
 /**
  * Test the IndirectList with assorted DatabaseSessions and UnitsOfWork.
  * this should only be used in jdk1.2+
- * @author: Big Country
+ * @author Big Country
  */
 public class IndirectSetTestDatabase extends IndirectContainerTestDatabase {
 
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/UnitOfWorkRollbackConnectionReleaseTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/UnitOfWorkRollbackConnectionReleaseTest.java
index e55cc75..313a538 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/UnitOfWorkRollbackConnectionReleaseTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/unitofwork/UnitOfWorkRollbackConnectionReleaseTest.java
@@ -27,7 +27,6 @@
  * Tests the release of a write connection on a client session that is null
  *
  * @author Guy Pelletier
- * @date August 9, 2004
  */
 public class UnitOfWorkRollbackConnectionReleaseTest extends AutoVerifyTestCase {
     Accessor accessor;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ConversionExceptionFromMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ConversionExceptionFromMappingTest.java
index 077549a..749a673 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ConversionExceptionFromMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ConversionExceptionFromMappingTest.java
@@ -25,7 +25,6 @@
 /**
  * @author Guy Pelletier
  * @version 1.0
- * @date June 25, 2003
  */
 public class ConversionExceptionFromMappingTest extends AutoVerifyTestCase {
     ConversionException m_exception;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java
index db4b320..9ba9545 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorInheritanceMappingTest.java
@@ -22,7 +22,6 @@
  *
  * @author John Vandale
  * @version 1.0
- * @date Jan 20, 2010
  */
 public class ProjectClassGeneratorInheritanceMappingTest extends ProjectClassGeneratorResultFileTest {
 
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorOrderByQueryKeysTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorOrderByQueryKeysTest.java
index 5554466..a828395 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorOrderByQueryKeysTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectClassGeneratorOrderByQueryKeysTest.java
@@ -23,7 +23,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 11, 2005
  */
 public class ProjectClassGeneratorOrderByQueryKeysTest extends ProjectClassGeneratorResultFileTest {
     public static final String ATTRIBUTE_NAME = "phoneNumbers";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLOrderByQueryKeysTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLOrderByQueryKeysTest.java
index ee87c8e..8e249c0 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLOrderByQueryKeysTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLOrderByQueryKeysTest.java
@@ -33,7 +33,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date March 11, 2005
  */
 public class ProjectXMLOrderByQueryKeysTest extends TestCase {
     private List m_queryKeyExpressionsAfterWrite;
diff --git a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/JavaVersionTest.java b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/JavaVersionTest.java
index 6d1fefd..f590a4e 100644
--- a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/JavaVersionTest.java
+++ b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/helper/JavaVersionTest.java
@@ -44,7 +44,7 @@
 
     /**
      * Test Java version retrieval from {@code Runtime.Version}. It just calls {@code JavaVersion#runtimeVersion()} method
-     * on current Java SE when {@literal>}9 and checks that no exception is thrown.
+     * on current Java SE when {@literal >}9 and checks that no exception is thrown.
      */
     @Test
     public void testRuntimeVersion() {
diff --git a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/security/SecurableBackwardsCompatibilityTest.java b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/security/SecurableBackwardsCompatibilityTest.java
index 80f8a72..274292e 100644
--- a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/security/SecurableBackwardsCompatibilityTest.java
+++ b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/security/SecurableBackwardsCompatibilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,6 @@
     
     /**
      * Test the decryption of a String encrypted with DES ECB.
-     * @throws Exception
      */
     @Test
     public void testStringDecryption_DES_ECB() throws Exception {
@@ -54,7 +53,6 @@
     
     /**
      * Test the decryption of a String encrypted with AES CBC.
-     * @throws Exception
      */
     @Test
     public void testStringDecryption_AES_CBC() throws Exception {
@@ -70,7 +68,6 @@
     
     /**
      * Test the decryption of a String encrypted with AES ECB.
-     * @throws Exception
      */
     @Test
     public void testStringDecryption_AES_ECB() throws Exception {
@@ -86,7 +83,6 @@
     
     /**
      * Test the decryption/processing of a plaintext String.
-     * @throws Exception
      */
     @Test
     public void testStringDecryption_PlainText() throws Exception {
@@ -99,7 +95,6 @@
     
     /**
      * Test the decryption/processing of a null parameter.
-     * @throws Exception
      */
     @Test
     public void testNullParameterDecryption() throws Exception {
@@ -110,7 +105,6 @@
     
     /**
      * Test the encryption of a null parameter.
-     * @throws Exception
      */
     @Test
     public void testNullParameterEncryption() throws Exception {
diff --git a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectListTest.java b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectListTest.java
index ed1c24c..362fc90 100644
--- a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectListTest.java
+++ b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectListTest.java
@@ -48,7 +48,7 @@
 
 /**
  * Test a simple IndirectList.
- * @author: Big Country
+ * @author Big Country
  */
 @RunWith(Parameterized.class)
 public class IndirectListTest {
diff --git a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectMapTest.java b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectMapTest.java
index 71dea74..f852fa6 100644
--- a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectMapTest.java
+++ b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectMapTest.java
@@ -54,7 +54,7 @@
 
 /**
  * Test a simple IndirectMap.
- * @author: Big Country
+ * @author Big Country
  */
 @RunWith(Parameterized.class)
 public class IndirectMapTest {
diff --git a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectSetTest.java b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectSetTest.java
index 6019dbc..b408cf5 100644
--- a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectSetTest.java
+++ b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/transparentindirection/IndirectSetTest.java
@@ -46,7 +46,7 @@
 /**
  * Test a simple IndirectSet.
  * this should only be used in jdk1.2+
- * @author: Big Country
+ * @author Big Country
  */
 @RunWith(Parameterized.class)
 public class IndirectSetTest {
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/corba/SessionsXMLSchemaSunCORBATransportConfigTest.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/corba/SessionsXMLSchemaSunCORBATransportConfigTest.java
index c027b25..227625a 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/corba/SessionsXMLSchemaSunCORBATransportConfigTest.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/sessionsxml/corba/SessionsXMLSchemaSunCORBATransportConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,7 +28,6 @@
  *
  * @author Guy Pelletier
  * @version 1.0
- * @date July 27, 2004
  */
 public class SessionsXMLSchemaSunCORBATransportConfigTest extends AutoVerifyTestCase {
     DatabaseSession m_session;
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/QuerySQLTracker.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/QuerySQLTracker.java
index f6db5ea..9e3d4c0 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/QuerySQLTracker.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/QuerySQLTracker.java
@@ -42,7 +42,6 @@
     /**
      * Instantiating a QuerySQLTracker will replace the session's log with the QuerySQLTracker
      * and store the old log.  The old log will be replaced when remove() is called.
-     * @param session
      */
     public QuerySQLTracker(Session session) {
         this.originalLog = session.getSessionLog();
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestCase.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestCase.java
index 0d3761f..5d61258 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestCase.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/TestCase.java
@@ -640,8 +640,6 @@
      * Same as strongAssert but only throws a warning.  I.e. if the check
      * is how the feature is implemented but not really crucial to how it works,
      * just throw a warning and fix the test later.
-     * @param assertion
-     * @param warningMessage
      */
     public void weakAssert(boolean assertion, String warningMessage) {
         if (!assertion) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/annotations/TransientCompatibleAnnotations.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/annotations/TransientCompatibleAnnotations.java
index 53afdf8..da687ba 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/annotations/TransientCompatibleAnnotations.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/annotations/TransientCompatibleAnnotations.java
@@ -43,7 +43,6 @@
      * PUBLIC:
      * Return a list of classnames of annotations that are compatible with the jakarta.persistence.Transient
      * annotation.
-     * @return
      */
     public static List<String> getTransientCompatibleAnnotations(){
         return transientCompatibleAnnotations;
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/descriptors/CoreDescriptor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/descriptors/CoreDescriptor.java
index 38f8ee2..66f6b88 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/descriptors/CoreDescriptor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/descriptors/CoreDescriptor.java
@@ -55,7 +55,6 @@
 
     /**
      * Adds the attribute group to this descriptor.
-     * @param group
      */
     public void addAttributeGroup(ATTRIBUTE_GROUP group) {
         if (this.attributeGroups == null){
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/mappings/CoreAttributeAccessor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/mappings/CoreAttributeAccessor.java
index 7ce26a4..fe175b4 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/mappings/CoreAttributeAccessor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/core/mappings/CoreAttributeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,7 +50,6 @@
 
     /**
      * INTERNAL:
-     * @return
      */
     boolean isWriteOnly();
 
@@ -61,7 +60,6 @@
 
     /**
      * INTERNAL
-     * @param aBoolean
      */
     void setIsReadOnly(boolean aBoolean);
 
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionFactory.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionFactory.java
index 068bb8b..58df923 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionFactory.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,7 +40,6 @@
      * Return the connection.
      *
      * @return the CCI connection
-     * @throws EISException
      */
     @Override
     public jakarta.resource.cci.Connection getConnection() throws EISException {
@@ -51,7 +50,6 @@
      * Return the connection.
      *
      * @return the CCI connection
-     * @throws EISException
      */
     @Override
     public jakarta.resource.cci.Connection getConnection(ConnectionSpec spec) throws EISException {
@@ -127,7 +125,6 @@
     /**
      * Does nothing - for interface implementation
      *
-     * @param reference
      */
     @Override
     public void setReference(Reference reference) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionMetaData.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionMetaData.java
index b14481e..9f94945 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionMetaData.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,7 +41,6 @@
      * Return the product name
      *
      * @return the JMS provider name
-     * @throws EISException
      */
     @Override
     public String getEISProductName() throws EISException {
@@ -56,7 +55,6 @@
      * Return the provider version
      *
      * @return the JMS provider version
-     * @throws EISException
      */
     @Override
     public String getEISProductVersion() throws EISException {
@@ -70,7 +68,6 @@
     /**
      * Username meta-data is not supported
      *
-     * @return
      */
     @Override
     public String getUserName() {
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionSpec.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionSpec.java
index c58db7e..4d08914 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionSpec.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSConnectionSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -103,7 +103,6 @@
     /**
      * Set the username to be used when getting a queue connection.
      *
-     * @param name
      */
     public void setUsername(String name) {
         username = name;
@@ -126,7 +125,6 @@
     /**
      * Set the password to be used when getting a queue connection.
      *
-     * @param pass
      */
     public void setPassword(String pass) {
         // Bug 4117441 - Secure programming practices, store password in char[]
@@ -168,7 +166,6 @@
     /**
      * Set the JNDI lookup name of the connection factory.
      *
-     * @param jndiName
      */
     public void setConnectionFactoryURL(String jndiName) {
         connectionFactoryURL = jndiName;
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteraction.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteraction.java
index bcc25a0..dc2979b 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteraction.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteraction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,7 +43,6 @@
      *
      * @param spec - the interaction spec
      * @param input - the input record
-     * @throws EISException
      */
     @Override
     public jakarta.resource.cci.Record execute(InteractionSpec spec, jakarta.resource.cci.Record input) throws EISException {
@@ -60,7 +59,6 @@
      * @param spec - the interaction spec
      * @param input - the input record
      * @param output - the output record
-     * @throws EISException
      */
     @Override
     public boolean execute(InteractionSpec spec, jakarta.resource.cci.Record input, jakarta.resource.cci.Record output) throws EISException {
@@ -106,7 +104,6 @@
      * @param spec - the send interaction spec
      * @param input - the input record
      * @param output - the output record
-     * @throws EISException
      */
     protected void executeSendInteraction(CciJMSSendInteractionSpec spec, CciJMSRecord input, CciJMSRecord output) throws EISException {
         // verify input record
@@ -149,7 +146,6 @@
      * @param spec - the receive interaction spec
      * @param input - the input record
      * @param output - the output record
-     * @throws EISException
      */
     protected void executeReceiveInteraction(CciJMSReceiveInteractionSpec spec, CciJMSRecord input, CciJMSRecord output) throws EISException {
         try {
@@ -189,7 +185,6 @@
      * @param spec - the send/receive interaction spec
      * @param input - the input record
      * @param output - the output record
-     * @throws EISException
      */
     protected void executeSendReceiveInteraction(CciJMSSendReceiveInteractionSpec spec, CciJMSRecord input, CciJMSRecord output) throws EISException {
         // verify input record
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteractionSpec.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteractionSpec.java
index b9a68f9..ba8b4c3 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteractionSpec.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSInteractionSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,6 @@
      * Set the name of the destination to be used.  This is required if JNDI is
      * not being used to lookup the destination.
      *
-     * @param dest
      */
     public void setDestination(String dest) {
         destination = dest;
@@ -89,7 +88,6 @@
      * will set the JMSCorrelationID of the reponse message using the JMSMessageID of
      * the request messsage.
      *
-     * @param selector
      */
     public void setMessageSelector(String selector) {
         messageSelector = selector;
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSReceiveInteractionSpec.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSReceiveInteractionSpec.java
index 4663815..38657d2 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSReceiveInteractionSpec.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSReceiveInteractionSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,6 @@
      * Set the length of time to wait for a response.  A setting of 0 indicates
      * infinite wait time.
      *
-     * @param timeout
      */
     public void setTimeout(String timeout) {
         this.timeout = Long.parseLong(timeout);
@@ -47,7 +46,6 @@
      * Set the length of time to wait for a response.  A setting of 0 indicates
      * infinite wait time.
      *
-     * @param timeout
      */
     public void setTimeout(long timeout) {
         this.timeout = timeout;
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSRecord.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSRecord.java
index ccc1a9f..3be06e7 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSRecord.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,7 +64,6 @@
     /**
      * Set the description for this record.
      *
-     * @param theDescription
      */
     @Override
     public void setRecordShortDescription(String theDescription) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSSendReceiveInteractionSpec.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSSendReceiveInteractionSpec.java
index 40a4b93..0e53d95 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSSendReceiveInteractionSpec.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSSendReceiveInteractionSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -73,7 +73,6 @@
      * Since we are doing a send/receive in one interaction, we know that this value
      * indicates the response queue as well.
      *
-     * @param url
      */
     public void setReplyToDestinationURL(String url) {
         replyToDestinationURL = url;
@@ -100,7 +99,6 @@
      * Since we are doing a send/receive in one interaction, we know that this value
      * indicates the response queue as well.
      *
-     * @param dest
      */
     public void setReplyToDestination(String dest) {
         replyToDestination = dest;
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSTransaction.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSTransaction.java
index 9bd034f..b18e3f7 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSTransaction.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/internal/eis/adapters/jms/CciJMSTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,7 +40,6 @@
     /**
      * Record that a transaction has begun.
      *
-     * @throws EISException
      */
     @Override
     public void begin() throws EISException {
@@ -67,7 +66,6 @@
     /**
      * Write each of the transactional DOM records back to their files.
      *
-     * @throws EISException
      */
     @Override
     public void commit() throws EISException {
@@ -82,7 +80,6 @@
     /**
      * Throw away each of the DOM records in the transactional cache.
      *
-     * @throws EISException
      */
     @Override
     public void rollback() throws EISException {
diff --git a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java
index c67fdf4..4fbfcd5 100644
--- a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java
+++ b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java
@@ -43,7 +43,7 @@
 import oracle.AQ.AQDequeueOption;
 
 /**
- * Tests based on {@link Order} and {@AAddress} entities and {@code raw_order_queue} model.
+ * Tests based on {@link Order} and {@link Address} entities and {@code raw_order_queue} model.
  */
 public class OrderQueueTest {
 
diff --git a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle10Platform.java b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle10Platform.java
index b97c762..fa962fb 100644
--- a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle10Platform.java
+++ b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle10Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,8 +34,6 @@
      * Build the hint string used for first rows.
      *
      * Allows it to be overridden
-     * @param max
-     * @return
      */
     @Override
     protected String buildFirstRowsHint(int max){
diff --git a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle9Platform.java b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle9Platform.java
index 900019b..b4b1ea9 100644
--- a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle9Platform.java
+++ b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle9Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -339,8 +339,6 @@
      * Build the hint string used for first rows.
      *
      * Allows it to be overridden
-     * @param max
-     * @return
      */
     @Override
     protected String buildFirstRowsHint(int max){
diff --git a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/xml/xdk/XDKPlatform.java b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/xml/xdk/XDKPlatform.java
index 2183590..c688ec9 100644
--- a/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/xml/xdk/XDKPlatform.java
+++ b/foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/xml/xdk/XDKPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,11 +75,6 @@
 
     /**
      * Execute advanced XPath statements that are required for TopLink EIS.
-     * @param contextNode
-     * @param xPath
-     * @param xmlNamespaceResolver
-     * @return
-     * @throws XMLPlatformException
      */
     @Override
     public Node selectSingleNodeAdvanced(Node contextNode, String xPath, XMLNamespaceResolver xmlNamespaceResolver) throws XMLPlatformException {
@@ -100,7 +95,6 @@
      *         namespaceResolver used to resolve namespace prefixes
      *         to the corresponding namespace URI
      * @return the XPath result
-     * @throws XMLPlatformException
      */
     @Override
     public NodeList selectNodesAdvanced(Node contextNode, String xPath, XMLNamespaceResolver xmlNamespaceResolver) throws XMLPlatformException {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/concurrency/TestConcurrencyPersistence.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/concurrency/TestConcurrencyPersistence.java
index d14dcdb..11070fd 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/concurrency/TestConcurrencyPersistence.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/concurrency/TestConcurrencyPersistence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -47,8 +47,7 @@
      * This test spins up threads and runs them multiple times to replicate the race condition. 
      * This test should pass everytime it's run, but there exists the possibility that it 
      * passes when none of the threads actually test the collision.
-     * 
-     * @throws Exception
+     *
      */
     @Test
     public void testInsertConcurrency() throws Exception {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/criteria/TestCriteriaBuilder.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/criteria/TestCriteriaBuilder.java
index 174f455..0312ae4 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/criteria/TestCriteriaBuilder.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/criteria/TestCriteriaBuilder.java
@@ -55,8 +55,7 @@
     /**
      * Merging ElementCollections on Oracle fails when EclipseLink generates 
      * a DELETE SQL statement with a WHERE clause containing a CLOB.
-     * 
-     * @throws Exception
+     *
      */
     @Test
     public void testCriteriaCompoundSelectionModel() throws Exception {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/framework/EmfRunnerInjector.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/framework/EmfRunnerInjector.java
index 8a3af46..a675bfc 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/framework/EmfRunnerInjector.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/framework/EmfRunnerInjector.java
@@ -64,7 +64,6 @@
     /**
      * This method will create / inject EntityManagerFactory and SQLListeners into test instances
      *
-     * @param testInstance
      */
     public void inject(Object testInstance) throws Exception {
         if (testInstance == null) {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/lob/TestLobMerge.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/lob/TestLobMerge.java
index 7277afa..4cbe712 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/lob/TestLobMerge.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/lob/TestLobMerge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -44,8 +44,7 @@
     /**
      * Merging ElementCollections on Oracle fails when EclipseLink generates 
      * a DELETE SQL statement with a WHERE clause containing a CLOB.
-     * 
-     * @throws Exception
+     *
      */
     @Test
     public void testLobMerge() throws Exception {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestPessimisticLocking.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestPessimisticLocking.java
index aefef67..9a31077 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestPessimisticLocking.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestPessimisticLocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2019 IBM Corporation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -218,9 +218,7 @@
      * This test verifies that aggregate queries will not fail with locking
      * set.
      *
-     * @see
-     *      org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite
-     *      .testQueryPESSIMISTIC_FORCE_INCREMENTLock()
+     * @see org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite#testQueryPESSIMISTIC_FORCE_INCREMENTLock()
      */
     @Test
     public void testAggregateResultPessimisticForceIncrement() {
@@ -245,9 +243,7 @@
      * This test verifies that queries that return non-Entity results will not
      * fail up with locking set.
      *
-     * @see
-     *      org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite
-     *      .testQueryPESSIMISTIC_FORCE_INCREMENTLock()
+     * @see org.eclipse.persistence.testing.tests.jpa.jpql.AdvancedQueryTestSuite#testQueryPESSIMISTIC_FORCE_INCREMENTLock()
      */
     @Test
     public void testObjectQueryPessimisticForceIncrement() {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestTimestampVersionLocking.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestTimestampVersionLocking.java
index e7a60e6..3783ab2 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestTimestampVersionLocking.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/locking/TestTimestampVersionLocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -62,8 +62,7 @@
     /**
      * Check that setting the property "true" will get the local system time
      * instead of the default behavior of contacting the server.
-     * 
-     * @throws Exception
+     *
      */
     @Test
     public void testLocalTimestampProperty() throws Exception {
@@ -98,8 +97,7 @@
     /**
      * Check that setting the property "false" will get the server system time
      * just like the default behavior.
-     * 
-     * @throws Exception
+     *
      */
     @Test
     public void testLocalTimestampPropertyFalse() throws Exception {
@@ -134,8 +132,7 @@
     /**
      * Check that setting the value SERVER on the OptimisticLockingPolicy in a
      * DescriptorCustomizer will override the persistence property value.
-     * 
-     * @throws Exception
+     *
      */
     @Test
     public void testLocalTimestampPropertyCustomizer() throws Exception {
@@ -172,8 +169,7 @@
     /**
      * Check that setting the value LOCAL on the OptimisticLockingPolicy in a
      * DescriptorCustomizer will override the persistence property value.
-     * 
-     * @throws Exception
+     *
      */
     @Test
     public void testLocalTimestampPropertyFalseCustomizer() throws Exception {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/performance2/Populate.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/performance2/Populate.java
index 7241639..e34030d 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/performance2/Populate.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/models/jpa/performance2/Populate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -617,8 +617,6 @@
      * Verify that the provided entity type has no rows in the database using a
      * native ReportQuery.
      *
-     * @param entityClass
-     * @param count
      */
     public void assertCount(EntityManager em, Class entityClass, int count) {
         CriteriaBuilder cb = em.getCriteriaBuilder();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java
index f26c94c..57d5a1f 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/CacheImplJUnitTest.java
@@ -70,7 +70,6 @@
     /**
      * Note: These tests are setup with ID generation - but it is not used.
      * We set the Id manually so we can test cache operations like eviction properly.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite();
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/NamedNativeQueryJUnitTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/NamedNativeQueryJUnitTest.java
index bd88b52..bf2f66b 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/NamedNativeQueryJUnitTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/advanced/NamedNativeQueryJUnitTest.java
@@ -54,8 +54,6 @@
 
     /**
      * Adds test, similar to suite() but without adding a setup.  used from JUnitNativeQueryTestSuite
-     * @param suite
-     * @return
      */
     public static Test addNamedNativeQueryTests(TestSuite suite){
         suite.setName("NamedNativeQueryJUnitTest");
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java
index 5bb303f..9befc67 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/ddlgeneration/DDLGenerationJUnitTestSuite.java
@@ -1458,7 +1458,6 @@
 
     /**
      * Returns a List of strings representing the lines within the fileName.
-     * @param fileName
      * @return {@code List<String>}
      */
     public List<String> getDDLFile(String fileName){
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/QuerySQLTracker.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/QuerySQLTracker.java
index 2314c7f..44d7bc8 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/QuerySQLTracker.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/QuerySQLTracker.java
@@ -50,7 +50,6 @@
     /**
      * Constructs and installs the event listener and sql tracking session log
      *
-     * @param session
      */
     private QuerySQLTracker(Session session) {
         session.getEventManager().addListener(this);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fetchgroups/FetchGroupAssert.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fetchgroups/FetchGroupAssert.java
index fd5a392..8431617 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fetchgroups/FetchGroupAssert.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/fetchgroups/FetchGroupAssert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -159,9 +159,6 @@
      * Assert that the entity provided has the attributes defined in the
      * FetchGroup loaded.
      *
-     * @param emf
-     * @param entity
-     * @param fetchGroup
      */
     public static void assertFetched(EntityManagerFactory emf, Object entity, FetchGroup fetchGroup) {
         assertNotNull("Null entity", entity);
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java
index d865d27..ab636c8 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/jpql/JUnitJPQLValidationTestSuite.java
@@ -970,7 +970,6 @@
      * This is a known error in the MySQL db, and this method will be removed
      * when this error is resolved.
      *
-     * @param exception
      * @return true if this exception is a specific known MySQL failure
      */
     public boolean isKnownMySQLIssue(Throwable exception) {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/metamodel/MetamodelMetamodelTest.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/metamodel/MetamodelMetamodelTest.java
index 1d938b3..cc3ccab 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/metamodel/MetamodelMetamodelTest.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/metamodel/MetamodelMetamodelTest.java
@@ -314,8 +314,6 @@
     /**
      * Perform a test by "Not" caching the EMF and letting the test close the EMF to
      * verify variant use cases that may throw an IAE on a closed EntityManger
-     * @param overrideEMFCachingForTesting
-     * @return
      */
     private EntityManager privateTestSetup(boolean overrideEMFCachingForTesting) {
         EntityManagerFactory emf = null;
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/validation/ValidationTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/validation/ValidationTestSuite.java
index 493d2d1..7f0ba3b 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/validation/ValidationTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/validation/ValidationTestSuite.java
@@ -76,7 +76,6 @@
     /**
      * This test assumes the persistence unit has the following property set:
      *       <pre>{@code </pre><property name="eclipselink.cache.shared.default" value="false"/>}</pre>
-     * @throws Exception
      */
 
     public void testCacheIsolation_XMLDefault_Config() throws Exception {
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsDynamicAdvancedJUnitTestCase.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsDynamicAdvancedJUnitTestCase.java
index c71ee08..e991d8b 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsDynamicAdvancedJUnitTestCase.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/xml/advanced/EntityMappingsDynamicAdvancedJUnitTestCase.java
@@ -218,7 +218,6 @@
 
     /**
      * Return the dynamic test suite.
-     * @return
      */
     public static Test suite() {
         // This test suite should only be called when we are using the
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/server/Notification.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/server/Notification.java
index e7ac6a1..fb8e91b 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/server/Notification.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/server/Notification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2005, 2015 SAP. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -26,7 +26,6 @@
 
     /**
      * Notify a run notifier of this notification.
-     * @param notifier
      */
     public void notify(RunNotifier notifier);
 
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/QueryTest.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/QueryTest.java
index fc864b1..11a66c6 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/QueryTest.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/QueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2005, 2015 SAP. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -46,9 +46,6 @@
     }
 
     /**
-     * @param queryString
-     * @param parameters
-     * @param em
      */
     private void executeQueryWithParameters(String queryString, Set<InputParameterHolder> parameters, EntityManager em) {
         Query query = em.createQuery(queryString);
@@ -59,8 +56,6 @@
     }
 
     /**
-     * @param query
-     * @param holder
      */
     private void setParameterHolder(Query query, InputParameterHolder holder) {
         if (holder.isTemporal()) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java
index 02aa9bb..435a739 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java
@@ -4433,9 +4433,6 @@
         /**
          * Validates
          *
-         * @param expression
-         * @param index
-         * @return
          */
         abstract boolean validateSeparator(CollectionExpression expression, int index);
 
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java
index 35f884c..75ffe38 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java
@@ -518,7 +518,6 @@
      * identification variable declarations.
      *
      * @param expression The {@link AbstractFromClause} to validate
-     * @param visitor
      */
     protected void validateAbstractFromClause(AbstractFromClause expression,
                                               FirstDeclarationVisitor visitor) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java
index 510b947..ec99eff 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java
@@ -905,7 +905,6 @@
         /**
          * Sets
          *
-         * @param bypassCompound
          */
         public void setBypassCompound(boolean bypassCompound) {
             this.bypassCompound = bypassCompound;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java
index 3c88b9a..5044ec9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java
@@ -134,7 +134,6 @@
     /**
      * Determines
      *
-     * @return
      */
     protected boolean isCollection() {
         return false;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Expression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Expression.java
index 6c0072b..61ad1a3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Expression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Expression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -668,7 +668,6 @@
     /**
      * The constant for 'WHERE'.
      *
-     * @version 2.5
      */
     String START_WITH = "START WITH";
 
@@ -882,7 +881,7 @@
     /**
      * Returns a string representation of this {@link Expression} and its children. The expression
      * should contain whitespace even if the beautified version would not have any. For instance,
-     * "SELECT e " should be returned where {@link Expression#toParsedText()} would return "SELECT e".
+     * "SELECT e " should be returned where {@link Expression#toActualText()} would return "SELECT e".
      *
      * @return The string representation of this {@link Expression}
      */
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java
index ace4ac1..df1d0df 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java
@@ -1915,8 +1915,6 @@
     /**
      * Determines whether
      *
-     * @param expression
-     * @return
      */
     protected boolean isAppendableToCollection(Expression expression) {
         IncompleteCollectionExpressionVisitor visitor = getIncompleteCollectionExpressionVisitor();
@@ -2213,7 +2211,6 @@
      * Determines whether the given {@link Expression} part is an expression of the given query BNF.
      *
      * @param expression The {@link Expression} to validate based on the query BNF
-     * @param queryBNF
      * @return <code>true</code> if the {@link Expression} part is a child of the given query BNF;
      * <code>false</code> otherwise
      */
@@ -2232,7 +2229,6 @@
      * Determines whether the given {@link Expression} part is an expression of the given query BNF.
      *
      * @param expression The {@link Expression} to validate based on the query BNF
-     * @param queryBNFId
      * @return <code>true</code> if the {@link Expression} part is a child of the given query BNF;
      * <code>false</code> otherwise
      */
@@ -4535,7 +4531,6 @@
      * Visits the given {@link AbstractSelectStatement} and checks to see if the identifiers of the
      * following clauses can be added a valid proposals.
      *
-     * @param expression
      * @param helper This helper handles one clause from the given <code><b>SELECT</b></code> statement
      */
     @SuppressWarnings("unchecked")
@@ -7003,7 +6998,6 @@
         /**
          * Returns the new {@link QueryPosition} that was created.
          *
-         * @return
          */
         public QueryPosition getQueryPosition() {
             return queryPosition;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/ContentAssistExtension.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/ContentAssistExtension.java
index 171ff57..97a0512 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/ContentAssistExtension.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/ContentAssistExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,6 @@
      *
      * @param tableName The name of the table to retrieve the name of its columns, which is never
      * <code>null</code>
-     * @param prefix
      * @return The column names
      */
     Iterable<String> columnNames(String tableName, String prefix);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java
index 8f0c9c5..493016d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java
@@ -169,7 +169,6 @@
     /**
      * Creates
      *
-     * @return
      */
     protected abstract AbstractRangeVariableDeclarationStateObject buildRangeVariableDeclarationStateObject();
 
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java
index bc2ed12..f75ca75 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java
@@ -266,7 +266,6 @@
     /**
      * Returns
      *
-     * @return
      */
     public IManagedType getManagedType() {
         if (managedType == null) {
@@ -278,7 +277,6 @@
     /**
      * Returns
      *
-     * @return
      */
     public IMapping getMapping() {
         resolveMappings();
@@ -437,7 +435,6 @@
     /**
      * Resolves
      *
-     * @return
      */
     protected abstract IManagedType resolveManagedType();
 
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java
index a1d62a8..8e85b2e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java
@@ -89,11 +89,8 @@
      * Creates a new <code>CollectionMemberExpressionStateObject</code>.
      *
      * @param parent The parent of this state object, which cannot be <code>null</code>
-     * @param entityStateObject
      * @param not Determines whether the <code><b>NOT</b></code> identifier is part of the expression
      * or not
-     * @param of
-     * @param collectionValuedPath
      * @exception NullPointerException The given parent cannot be <code>null</code>
      */
     public CollectionMemberExpressionStateObject(StateObject parent,
@@ -113,8 +110,6 @@
      * Creates a new <code>CollectionMemberExpressionStateObject</code>.
      *
      * @param parent The parent of this state object, which cannot be <code>null</code>
-     * @param entityStateObject
-     * @param collectionValuedPath
      * @exception NullPointerException The given parent cannot be <code>null</code>
      */
     public CollectionMemberExpressionStateObject(StateObject parent,
@@ -236,7 +231,6 @@
     /**
      * Sets
      *
-     * @param entityStateObject
      */
     public void setEntityStateObject(StateObject entityStateObject) {
         StateObject oldEntityStateObject = entityStateObject;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java
index 824c9d4..b5ac79d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java
@@ -164,7 +164,6 @@
     /**
      * Returns
      *
-     * @return
      */
     public IMapping getMapping() {
         if ((managedType == null) && (mapping == null)) {
@@ -235,7 +234,6 @@
     /**
      * Resolves
      *
-     * @return
      */
     protected IMapping resolveMapping() {
         return null;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java
index 3021369..2cf2c09 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java
@@ -95,7 +95,6 @@
      * Creates a new <code>InExpressionStateObject</code>.
      *
      * @param parent The parent of this state object, which cannot be <code>null</code>
-     * @param path
      * @param not Determines whether the <code><b>NOT</b></code> identifier is part of the expression
      * or not
      * @param items The list of JPQL fragments that will be parsed and converted into {@link
@@ -115,7 +114,6 @@
      * Creates a new <code>InExpressionStateObject</code>.
      *
      * @param parent The parent of this state object, which cannot be <code>null</code>
-     * @param path
      * @param not Determines whether the <code><b>NOT</b></code> identifier is part of the expression
      * or not
      * @param parameter The
@@ -136,10 +134,8 @@
      * Creates a new <code>InExpressionStateObject</code>.
      *
      * @param parent The parent of this state object, which cannot be <code>null</code>
-     * @param stateObject
      * @param not Determines whether the <code><b>NOT</b></code> identifier is part of the expression
      * or not
-     * @param items
      * @exception NullPointerException The given parent cannot be <code>null</code>
      */
     public InExpressionStateObject(StateObject parent,
@@ -156,8 +152,6 @@
      * Creates a new <code>InExpressionStateObject</code>.
      *
      * @param parent The parent of this state object, which cannot be <code>null</code>
-     * @param stateFieldPath
-     * @param items
      * @exception NullPointerException The given parent cannot be <code>null</code>
      */
     public InExpressionStateObject(StateObject parent,
@@ -171,7 +165,6 @@
      * Creates a new <code>InExpressionStateObject</code>.
      *
      * @param parent The parent of this state object, which cannot be <code>null</code>
-     * @param path
      * @param items The list of JPQL fragments that will be parsed and converted into {@link
      * StateObject}
      * @exception NullPointerException The given parent cannot be <code>null</code>
@@ -216,7 +209,6 @@
     /**
      * Returns
      *
-     * @return
      */
     public StateObject getStateObject() {
         return stateObject;
@@ -235,7 +227,6 @@
     /**
      * Determines whether
      *
-     * @return
      */
     public boolean hasStateObject() {
         return stateObject != null;
@@ -327,7 +318,6 @@
     /**
      * Sets
      *
-     * @param stateObject
      */
     public void setStateObject(StateObject stateObject) {
         StateObject oldStateObject = this.stateObject;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java
index 613dfc1..476e76b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java
@@ -108,7 +108,6 @@
     /**
      * Returns
      *
-     * @return
      */
     public StateObject getSelectItem() {
         return stateObject;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateObject.java
index c694a2c..97ba840 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -184,7 +184,7 @@
      * debugging purposes.
      * <p>
      * <b>Important:</b> If this {@link StateObject} is decorated by another one, then {@link
-     * #toString(Appendable)} from that decorator is invoked, otherwise the information contained in
+     * #toText(Appendable)} from that decorator is invoked, otherwise the information contained in
      * this one will be printed out.
      *
      * @param writer The writer used to print out the string representation
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java
index 66577ec..359f42b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java
@@ -177,7 +177,6 @@
     /**
      * Returns
      *
-     * @return
      */
     public StateFieldPathExpressionStateObject getStateFieldPath() {
         return stateFieldPath;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java
index fa2530d..c3aa868 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java
@@ -97,7 +97,6 @@
      * @param parent The parent of this resolver, which is never <code>null</code>
      * @param queryContext The context used to query information about the application metadata and
      * cached information
-     * @param subquery
      * @exception NullPointerException If the parent is <code>null</code>
      */
     public FromSubqueryResolver(Resolver parent,
@@ -318,9 +317,6 @@
         /**
          * Creates
          *
-         * @param name
-         * @param resolver
-         * @return
          */
         protected IMapping buildMapping(String name, Resolver resolver) {
             return new VirtualMapping(parent, name, resolver, mappingType);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/spi/IManagedTypeProvider.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/spi/IManagedTypeProvider.java
index 92b2c42..a7323ed 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/spi/IManagedTypeProvider.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/spi/IManagedTypeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +36,7 @@
      * Returns the collection of possible abstract schema types.
      *
      * @return The {@link IEntity entities} defined in the persistence context
-     * @version 2.4
+     * @since 2.4
      */
     Iterable<IEntity> entities();
 
@@ -102,7 +102,7 @@
      *
      * @param typeName The fully qualified type name of the {@link IManagedType} to retrieve
      * @return The {@link IManagedType} for the given type, if one exists, <code>null</code> otherwise
-     * @version 2.4
+     * @since 2.4
      */
     IManagedType getManagedType(String typeName);
 
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/CollectionTools.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/CollectionTools.java
index 2ae7bf7..a204235 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/CollectionTools.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/CollectionTools.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -133,7 +133,6 @@
      *
      * @param array The array to convert into a {@link List}
      * @return An instance of a {@link List} containing the elements of the given array
-     * @param <E>
      * @since 2.5
      */
     public static <E> List<E> list(E... array) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java
index d1e003f..ff1915a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java
@@ -51,8 +51,6 @@
     /**
      * Creates a new <code>JavaORMConfiguration</code>.
      *
-     * @param mappingBuilder
-     * @param ormXmlFileName
      */
     public JavaORMConfiguration(IMappingBuilder<Member> mappingBuilder, String ormXmlFileName) {
         super(mappingBuilder);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBuilder.java
index 83d3c43..a3b9d1b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBuilder.java
@@ -174,8 +174,6 @@
      *
      * @param jpqlQuery The string to format
      * @param jpqlGrammar The {@link JPQLGrammar} is used to properly format the string
-     * @param exactMatch
-     * @param style
      * @return The formatted JPQL query
      * @see #toActualText(String, JPQLGrammar)
      * @see #toParsedText(String, JPQLGrammar)
diff --git a/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java b/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java
index 23eb83c..6abe984 100644
--- a/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java
+++ b/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java
@@ -209,7 +209,6 @@
      * @param pu persistence unit {@code String}
      * @param haveMsgs there should be logging messages in the output or not
      * @param options compiler options
-     * @throws Exception
      */
     private void verifyLogging(final String testName, final String pu, final boolean haveMsgs, final String... options) throws Exception {
         File runDir = new File(System.getProperty("run.dir"), testName);
diff --git a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/BaseJparsTest.java b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/BaseJparsTest.java
index f46cc20..9a9fb7d 100644
--- a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/BaseJparsTest.java
+++ b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/BaseJparsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -85,7 +85,6 @@
      * @param rel       link 'rel'
      * @param href       link 'href'
      * @return true if link is found
-     * @throws URISyntaxException
      */
     protected boolean checkLinkXml(String response, String rel, String href) throws URISyntaxException {
         final String link = "<links rel=\"" + rel + "\" href=\"" + getServerURI() + href + "\"/>";
@@ -99,7 +98,6 @@
      * @param rel       link 'rel'
      * @param href       link 'href'
      * @return true if link is found
-     * @throws URISyntaxException
      */
     protected boolean checkLinkJson(String response, String rel, String href) throws URISyntaxException {
         final String link = "{\"rel\":\"" + rel + "\",\"href\":\"" + getServerURI() + href + "\"}";
@@ -112,7 +110,6 @@
      * @param response  JSON response string
      * @param rel       link 'rel'
      * @return true if link is found
-     * @throws URISyntaxException
      */
     protected boolean checkLinkJson(String response, String rel) throws URISyntaxException {
         return response.contains("{\"rel\":\"" + rel);
diff --git a/pom.xml b/pom.xml
index c3d3841..b5290e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
     <properties>
         <!-- TOOL Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdoc.doclint>all</jdoc.doclint>
+        <jdoc.doclint>all,-missing</jdoc.doclint>
         <!-- exclude big groups from the Xlint -->
         <comp.xlint>-Xlint:all,-rawtypes,-unchecked,-serial</comp.xlint>
         <!-- -Xdoclint:-missing does not seem to work properly on the infra -->
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java
index 761cca7..1ee26f4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java
@@ -23,7 +23,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java
index 071acec..2243371 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java
@@ -545,8 +545,6 @@
      */
     /**
      *
-     * @param currentDO
-     * @param isCSonAncestor
      */
     public void assertChangeSummaryStatusIfClearedIfCSIsAncestor(DataObject currentDO, boolean isCSonAncestor) {
         if (currentDO != null) {
@@ -585,9 +583,6 @@
 
     /**
      *
-     * @param aChangeSummary
-     * @param undoneDO
-     * @param originalDO
      */
     protected void assertUndoChangesEqualToOriginal(ChangeSummary aChangeSummary,//
     DataObject undoneDO, DataObject originalDO) {
@@ -609,7 +604,6 @@
 
     /**
      *
-     * @param aRootObject
      */
     // test undo when logging is off (with previous changes)
     protected void assertValueStoresInitializedAfterLoggingOn(DataObject aRootObject) {
@@ -625,8 +619,6 @@
 
     /**
      *
-     * @param aRootObject
-     * @param aCurrentValueStoreAfterLoggingFirstOnParam
      */
     protected void assertValueStoresCopiedAndSwappedAfterFirstModifyOperation(DataObject aRootObject, ValueStore aCurrentValueStoreAfterLoggingFirstOnParam) {
         // verify logging is on
@@ -652,8 +644,6 @@
 
     /**
      *
-     * @param aRootObject
-     * @param aCurrentValueStoreAfterLoggingFirstOnParam
      */
     protected void assertValueStoresReturnedToStartStateAfterUndoChanges(DataObject aRootObject, ValueStore aCurrentValueStoreAfterLoggingFirstOnParam) {
         // verify logging is on
@@ -668,8 +658,6 @@
 
     /**
      *
-     * @param aRootObject
-     * @param aCurrentSequenceAfterLoggingFirstOnParam
      */
     protected void assertSequencesReturnedToStartStateAfterUndoChanges(DataObject aRootObject, Sequence aCurrentSequenceAfterLoggingFirstOnParam) {
         // verify logging is on
@@ -691,10 +679,6 @@
      * values are ignored but should be defaults. Note: A setting object should
      * handle its own isEqual() behavior
      *
-     * @param aSequence
-     * @param aSequenceCopy
-     * @param isDeep
-     * @return
      */
     public boolean compareSequences(SDOSequence aSequence, SDOSequence aSequenceCopy, boolean isDeep) {
         // corner case: isSequenced set to true after type definition had not
@@ -815,8 +799,6 @@
      * suite on windows without assertEquals() failing. Use the system property
      * -DignoreCRLF=true
      *
-     * @param control
-     * @param test
      * @param removeCRLF
      *            void
      *
@@ -832,11 +814,6 @@
 
     /**
      *
-     * @param parentType
-     * @param name
-     * @param propType
-     * @param isContainment
-     * @return
      */
     protected DataObject addProperty(DataObject parentType, String name, Type propType, boolean isContainment) {
         DataObject newProperty = addProperty(parentType, name, propType);
@@ -846,12 +823,6 @@
 
     /**
      *
-     * @param parentType
-     * @param name
-     * @param propType
-     * @param isContainment
-     * @param isMany
-     * @return
      */
     protected DataObject addProperty(DataObject parentType, String name, Type propType, boolean isContainment, boolean isMany) {
         DataObject newProperty = addProperty(parentType, name, propType, isContainment);
@@ -902,9 +873,6 @@
 
     /**
      *
-     * @param uri
-     * @param name
-     * @return
      */
     protected DataObject defineType(String uri, String name) {
         DataObject newType = aHelperContext.getDataFactory().create(SDO_URL, TYPE);
@@ -1047,10 +1015,6 @@
      * Write to the output stream and return a success flag if no exceptions
      * thrown
      *
-     * @param anObject
-     * @param uri
-     * @param typename
-     * @param aStream
      * @return success flag
      */
     public boolean writeXML(DataObject anObject, String uri, String typename, OutputStream aStream) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java
index 010c522..934bc42 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java
@@ -26,7 +26,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -35,8 +34,7 @@
     /**
     *  Inherited suite method for generating all test cases.
     *  When not running via Ant
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDO Tests");
         SDOHelperTestSuite htsu = new SDOHelperTestSuite();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTestCases.java
index 62c4e54..6f92842 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,8 +58,6 @@
     /**
      * This wrapper function around the ObjectOutputStream.writeObject(object) method
      * will invoke the Externalizable framework
-     * @param anObject
-     * @param filename
      * @throws IOException
      *             void
      *
@@ -115,8 +113,6 @@
      * Use our SDO DataObjectInputStream class in order to pass in a custom context
      * so we have type preservation across JVM instances.
      *
-     * @param filename
-     * @return
      * @throws IOException
      *             SDODataObject
      */
@@ -199,7 +195,6 @@
 
     /**
      * Write an object representation of the SDODataObject to the stream
-     * @param anObject
      * @return
      * String
      *
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java
index e5ca054..eb53245 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java
@@ -35,7 +35,6 @@
 
     /**
      *  Inherited suite method for generating all test cases.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("All Helper Tests");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java
index 0cc6aea..5e29f62 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java
@@ -108,9 +108,6 @@
 
     /**
      * Spec 8.4 "Properties that are bi-directional require that no more than one end has containment=true"
-     * @param oppositeProperty1
-     * @param oppositeProperty2
-     * @return
      */
     private boolean areBothBidirectionalOppositePropertiesContainmentTrue(//
     SDOProperty oppositeProperty1, SDOProperty oppositeProperty2) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestSuite.java
index 1399530..2b82cd0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,16 +23,14 @@
 
     /**
     *
-    * @param args
-    */
+     */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
     }
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All CopyHelper Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/SDODataHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/SDODataHelperTestSuite.java
index 52d3676..e92ee8f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/SDODataHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/SDODataHelperTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,7 +24,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -32,8 +31,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataHelper Tests");
         suite.addTest(new TestSuite(DataHelperToDateTest.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java
index a64f797..271ee03 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java
@@ -42,7 +42,6 @@
     /**
      * The main schema simply has a DOCTYPE definition that will trigger the resolveEntity method on the
      * internal SchemaResolver class
-     * @return
      */
     private String getSchema() {
         return "<?xml version='1.0' encoding='UTF-8'?>\n" + "<!DOCTYPE xs:schema PUBLIC \"-//W3C//DTD XMLSCHEMA 200102//EN\" \"SomeSchema.dtd\" []>\n"
@@ -52,7 +51,6 @@
     /**
      * The schema dtd simply has an ENTITY declaration that will trigger the resolveEntity method on the
      * internal SchemaResolver class
-     * @return
      */
     private String getSchemaDtd() {
         return "<!ENTITY % xs-datatypes PUBLIC 'somedatatypes' 'SomeDatatypes.dtd' >\n" + "%xs-datatypes;";
@@ -60,7 +58,6 @@
 
     /**
      * The datatype dtd simply has an ENTITY declaration that affects nothing
-     * @return
      */
     private String getDatatypesDtd() {
         return "<!ENTITY % simpleThings \"\">";
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestSuite.java
index 8961b1b..a9b9dd1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,6 @@
 
     /**
      * Inherited suite method for generating all test cases.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("Entity Resolver Test Suite");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTestSuite.java
index 818df3d..f3721db 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,16 +23,14 @@
 
     /**
     *
-    * @param args
-    */
+     */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
     }
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All CopyHelper Tests");
         suite.addTest(new TestSuite(SDOEqualityHelperTest.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java
index c71de4b..8e21863 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java
@@ -102,7 +102,6 @@
 
     /**
      * Write an object representation of the SDODataObject to the stream
-     * @param anObject
      * @return
      * String
      */
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java
index 3d9460a..a1576f0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java
@@ -25,7 +25,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -33,7 +32,6 @@
 
     /**
      * Inherited suite method for generating all test cases.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("All TypHelper Tests");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexDefineTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexDefineTestSuite.java
index f1a98f7..82d496a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexDefineTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexDefineTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,8 +27,7 @@
 
     /**
     *  Inherited suite method for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All complex define Tests");
         suite.addTest(new TestSuite(PurchaseOrderComplexDefineTestCases.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java
index e01bba8..e99ca35 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java
@@ -108,8 +108,6 @@
          * Satisfy EntityResolver interface implementation.
          * Allow resolution of external entities.
          *
-         * @param publicId
-         * @param systemId
          * @return null
          */
         @Override
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java
index ebbb9b1..c0c1df1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java
@@ -166,8 +166,6 @@
          * Satisfy EntityResolver interface implementation.
          * Allow resolution of external entities.
          *
-         * @param publicId
-         * @param systemId
          * @return null
          */
         @Override
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/SDOAttributeXSDTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/SDOAttributeXSDTestSuite.java
index 05b7e94..2183dcc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/SDOAttributeXSDTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/attributes/SDOAttributeXSDTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,8 +27,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All XSDAttribute Tests");
         suite.addTest(new TestSuite(XSDHelperAttributeTestCases.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/SDOComplexTypeXSDTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/SDOComplexTypeXSDTestSuite.java
index 6862a81..d944776 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/SDOComplexTypeXSDTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/SDOComplexTypeXSDTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,8 +28,7 @@
 
     /**
     *  Inherited suite method for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All XSDComplexType Tests");
         suite.addTest(new TestSuite(XSDHelperComplexTypeTestCases.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/SDOElementXSDTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/SDOElementXSDTestSuite.java
index 3c0ceaf..62ce151 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/SDOElementXSDTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/SDOElementXSDTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,8 +27,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All XSDElement Tests");
         suite.addTest(new TestSuite(XSDHelperElementTestCases.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/SDOSimpleTypeXSDTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/SDOSimpleTypeXSDTestSuite.java
index c02af08..478b2ae 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/SDOSimpleTypeXSDTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/SDOSimpleTypeXSDTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -31,8 +30,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All XSDHelper Tests");
         suite.addTest(new TestSuite(XSDHelperSimpleTypeTestCases.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java
index 42ea048..02e8afb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java
@@ -111,7 +111,6 @@
      * by using the standard spec SDODataObject generation method on page
      *
      * The existing getControlTypes() uses non-public Property constructors
-     * @throws Exception
      */
     public void testDefineAndGenerateUsingSpecMethod() throws Exception {
         boolean useXSD = false;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/XSDHelperGenerateTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/XSDHelperGenerateTestSuite.java
index bfbc34e..da21ec6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/XSDHelperGenerateTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/XSDHelperGenerateTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,8 +28,7 @@
 
     /**
     *  Inherited suite method for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All XSDHelper Generate Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java
index f5590ab..142c13e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java
@@ -36,7 +36,6 @@
 
     /**
      *  Inherited suite mthod for generating all test cases.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("All Helper Tests");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTestCases.java
index a109be2..1b2f65f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -101,7 +101,6 @@
 
     /**
      * Write an object representation of the SDODataObject to the stream
-     * @param anObject
      * @return
      * String
      */
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuite.java
index a832a25..6a53024 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -35,8 +34,7 @@
 
     /**
     *  Inherited suite method for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All ChangeSummary Tests");
         suite.addTest(new TestSuite(ChangeSummaryExceptionTestCases.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuiteForMATS.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuiteForMATS.java
index 2f195a0..5ecc6e9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuiteForMATS.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestSuiteForMATS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -32,8 +31,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All ChangeSummary Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnChildTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnChildTestSuite.java
index c6bd06a..9257f33 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnChildTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnChildTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -32,8 +31,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("ChangeSummary XSD Child Test Cases");
         suite.addTest(new TestSuite(ChangeSummaryXSDWithCSonChildDeleteComplexSingleBelowRootTest.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnRootTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnRootTestSuite.java
index 6ad72c4..7705175 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnRootTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSOnRootTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -32,8 +31,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("ChangeSummary XSD Root Test Cases");
         suite.addTest(new TestSuite(ChangeSummaryXSDWithCSonRootDeleteComplexManyBelowRootTest.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java
index 793c22a..cf05c32 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java
@@ -69,7 +69,6 @@
      * by using the standard spec SDODataObject generation method on page
      *
      * The existing getControlTypes() uses non-public Property constructors
-     * @throws Exception
      */
     public DataObject createRootObject(List<Type> types) {
         DataObject aRoot = null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphTestSuite.java
index 15df384..93ed927 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,7 +24,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -32,8 +31,7 @@
 
     /**
     *  Inherited suite method for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataGraph Tests");
         suite.addTest(new TestSuite(SDODataGraphDataObjectBackPointerTest.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIndexTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIndexTestSuite.java
index a7a4454..14e024f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIndexTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIndexTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -39,8 +38,7 @@
 
     /**
     *  Inherited suite method for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataObject Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathConversionTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathConversionTestSuite.java
index 31e875d..842917a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathConversionTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathConversionTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -39,8 +38,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataObject Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTestSuite.java
index 754a480..1217b21 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -39,8 +38,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataObject Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetTestSuite.java
index a7c76c2..11ad63f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -39,8 +38,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataObject Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java
index ed992e3..3471b07 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java
@@ -1291,7 +1291,6 @@
 
     /**
      * Write an object representation of the SDODataObject to the stream
-     * @param anObject
      * @return
      * String
      *
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuite.java
index b7ae52a..3758df6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -39,8 +38,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataObject Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuiteForMATS.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuiteForMATS.java
index 526aa3c..7f66af5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuiteForMATS.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestSuiteForMATS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@
 
     /**
      *
-     * @param args
      */
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -39,8 +38,7 @@
 
     /**
     *  Inherited suite mthod for generating all test cases.
-    * @return
-    */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All SDODataHelper Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestSuite.java
index 0d765c8..2109f8d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,7 +28,6 @@
 
     /**
      *  Inherited suite method for generating all test cases.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("All DataObject Containment Tests");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectXPathPositionalTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectXPathPositionalTestSuite.java
index ad90ae4..a9bae41 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectXPathPositionalTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectXPathPositionalTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,7 +32,6 @@
 
     /**
      *  Inherited suite mthod for generating all test cases.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("All Helper Tests");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectXPathQueryTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectXPathQueryTestSuite.java
index 98ced2e..6ee4600 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectXPathQueryTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectXPathQueryTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,8 +30,7 @@
 
     /**
          *  Inherited suite mthod for generating all test cases.
-         * @return
-         */
+     */
     public static Test suite() {
         TestSuite suite = new TestSuite("All Helper Tests");
 
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/property/SDOPropertyEqualityTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/property/SDOPropertyEqualityTestSuite.java
index 3b68038..93616ce 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/property/SDOPropertyEqualityTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/property/SDOPropertyEqualityTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,7 +23,6 @@
 
     /**
      * Inherited suite method for generating all test cases.
-     * @return
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("SDOProperty Equality Test Suite");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java
index f283f6a..31e0d26 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java
@@ -121,7 +121,6 @@
      * by using the standard spec SDODataObject generation method on page
      *
      * The existing getControlTypes() uses non-public Property constructors
-     * @throws Exception
      */
     public DataObject createRootObject(boolean viaXML, List types) {
         DataObject aRoot = null;
@@ -403,7 +402,6 @@
      * Updates through DataObject and the Lists or Sequences returned
      * from DataObject operate on the same data.
      * When getType().isSequencedType() == false, null is returned.
-     * @return the <code>Sequence</code> or null.
      */
     public void testSequenceReturnFrom_SDODataObject_getSequence() {
         getRootViaDefineViaDataObjectandLoadViaDataFactory();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java
index 35dcfaf..b07e3d6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java
@@ -131,7 +131,6 @@
      * by using the standard spec SDODataObject generation method on page
      *
      * The existing getControlTypes() uses non-public Property constructors
-     * @throws Exception
      */
     public DataObject createRootObject(boolean viaXML, List types) {
         DataObject aRoot = null;
@@ -501,7 +500,6 @@
 
     /**
      * Invoke a get() call to finish the lazy initialization of this map
-     * @param aCS
      */
     public Map verifyOldSequences(SDOChangeSummary aCS) {
         return aCS.getOldSequences();
@@ -509,7 +507,6 @@
 
     /**
      * Invoke a get() call to finish the lazy initialization of this map
-     * @param aCS
      */
     public Map verifyOriginalSequences(SDOChangeSummary aCS) {
         return aCS.getOriginalSequences();
@@ -1040,7 +1037,6 @@
      * Updates through DataObject and the Lists or Sequences returned
      * from DataObject operate on the same data.
      * When getType().isSequencedType() == false, null is returned.
-     * @return the <code>Sequence</code> or null.
      */
     public void testSequenceReturnFrom_SDODataObject_getSequence() {
         defineAndLoadRoot(false, false);
@@ -1050,7 +1046,6 @@
     /**
      * Returns the value of a <code>Sequence</code> property identified by the specified path.
      * @param path the path to a valid object and property.
-     * @return the <code>Sequence</code> value of the specified property.
      * @see #get(String)
      * @deprecated in 2.1.0.
      */
@@ -1085,7 +1080,6 @@
     /**
      * Returns the value of a <code>Sequence</code> property identified by the specified property index.
      * @param propertyIndex the index of the property.
-     * @return the <code>Sequence</code> value of the specified property.
      * @see #get(int)
      * @deprecated in 2.1.0.
      */
@@ -1169,7 +1163,6 @@
     /**
      * Returns the value of the specified <code>Sequence</code> property.
      * @param property the property to get.
-     * @return the <code>Sequence</code> value of the specified property.
      * @see #get(Property)
      * @deprecated in 2.1.0.
      */
@@ -1290,7 +1283,6 @@
 
     /**
      * Returns the number of entries in the sequence.
-     * @return the number of entries.
      */
     public void test_intReturnFrom_size() {
     }
@@ -3570,7 +3562,6 @@
      * Returns the property for the given entry index.
      * Returns <code>null</code> for mixed text entries.
      * @param index the index of the entry.
-     * @return the property or <code>null</code> for the given entry index.
      */
     public void test_PropertyReturnFrom_getProperty() {
         // int index) {
@@ -3615,7 +3606,6 @@
     /**
      * Returns the property value for the given entry index.
      * @param index the index of the entry.
-     * @return the value for the given entry index.
      */
     public void test_ObjectReturnFrom_getValue() {
         // int index) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java
index 7724faa..025423f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java
@@ -131,7 +131,6 @@
      * by using the standard spec SDODataObject generation method on page
      *
      * The existing getControlTypes() uses non-public Property constructors
-     * @throws Exception
      */
     public DataObject createRootObject(boolean viaXML, List types, boolean withChangeSummary) {
         DataObject aRoot = null;
@@ -1249,7 +1248,6 @@
      * Updates through DataObject and the Lists or Sequences returned
      * from DataObject operate on the same data.
      * When getType().isSequencedType() == false, null is returned.
-     * @return the <code>Sequence</code> or null.
      */
     public void testSequenceReturnFrom_SDODataObject_getSequence() {
         defineAndLoadRoot(false, false);
@@ -1259,7 +1257,6 @@
     /**
      * Returns the value of a <code>Sequence</code> property identified by the specified path.
      * @param path the path to a valid object and property.
-     * @return the <code>Sequence</code> value of the specified property.
      * @see #get(String)
      * @deprecated in 2.1.0.
      */
@@ -1294,7 +1291,6 @@
     /**
      * Returns the value of a <code>Sequence</code> property identified by the specified property index.
      * @param propertyIndex the index of the property.
-     * @return the <code>Sequence</code> value of the specified property.
      * @see #get(int)
      * @deprecated in 2.1.0.
      */
@@ -1378,7 +1374,6 @@
     /**
      * Returns the value of the specified <code>Sequence</code> property.
      * @param property the property to get.
-     * @return the <code>Sequence</code> value of the specified property.
      * @see #get(Property)
      * @deprecated in 2.1.0.
      */
@@ -1499,7 +1494,6 @@
 
     /**
      * Returns the number of entries in the sequence.
-     * @return the number of entries.
      */
     public void test_intReturnFrom_size() {
     }
@@ -3966,7 +3960,6 @@
      * Returns the property for the given entry index.
      * Returns <code>null</code> for mixed text entries.
      * @param index the index of the entry.
-     * @return the property or <code>null</code> for the given entry index.
      */
     public void test_PropertyReturnFrom_getProperty() {
         // int index) {
@@ -4011,7 +4004,6 @@
     /**
      * Returns the property value for the given entry index.
      * @param index the index of the entry.
-     * @return the value for the given entry index.
      */
     public void test_ObjectReturnFrom_getValue() {
         // int index) {
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java
index 093992c..175da8f 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DMLMethod.java
@@ -24,7 +24,7 @@
     /**
      * Construct a Method that is a DML (which returns an int)
      * <br>
-     * m_isBatched {@literal<}= isBatched
+     * m_isBatched {@literal <}= isBatched
      */
     public DMLMethod(String name, int modifiers, String sqlStmt, boolean isBatched,
         SqlReflector reflector) throws SQLException,
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderName.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderName.java
index 10dea92..7def937 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderName.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,7 +28,6 @@
      *
      * * @param schema
      *
-     * @param type
      * @param parentType
      *            The PL/SQL package type that references to the SqlType for which the SqlName is
      *            created for
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlRecordName.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlRecordName.java
index 92a65e5..cd3f9bc 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlRecordName.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlRecordName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,6 @@
      *
      * * @param schema
      *
-     * @param type
      * @param parentType
      *            The PL/SQL package type that references to the SqlType for which the SqlName is
      *            created for
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableName.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableName.java
index d33adae..9d18eb7 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableName.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,7 +29,6 @@
      *
      * * @param schema
      *
-     * @param type
      * @param parentType
      *            The PL/SQL package type that references to the SqlType for which the SqlName is
      *            created for
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableType.java
index 491fcd1..1206e42 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlTableType.java
@@ -164,19 +164,8 @@
      * Create a PL/SQL table type. If -plsqlindexbytable is set and whenever possible, the method
      * will return predefined scalar index-by table types, which will be mapped into Java arrays.
      *
-     * @param sqlName
-     * @param typeCode
-     * @param elemInfo
-     * @param elemType
-     * @param details
-     * @param generateMe
-     * @param parentType
-     * @param isGrandparent
-     * @param reflector
      * @return either a newly defined PL/SQL Table type or a predefined scalar PL/SQL index-by table
      *         type
-     * @throws SQLException
-     * @throws PublisherException
      */
 
     public static SqlType newInstance(SqlName sqlName, int typeCode, ElemInfo elemInfo,
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java
index f44b0a6..ac4b56e 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlName.java
@@ -136,8 +136,6 @@
      * Create a SqlName instance for a PL/SQL type, which requires extra identifying information,
      * such the names for the package and method that mentions this PL/SQL type.
      *
-     * @param schema
-     * @param type
      * @param parentType
      *            The PL/SQL package type that references to the SqlType for which the SqlName is
      *            created for
diff --git a/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/PackageRenamer.java b/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/PackageRenamer.java
index b4355ec..2969f05 100644
--- a/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/PackageRenamer.java
+++ b/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/PackageRenamer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -362,9 +362,6 @@
 
     /**
      *
-     * @param srcRoot
-     * @param properties
-     * @return
      */
     private void initialize(File srcRoot, Properties properties) {
         for (Object key : properties.keySet()) {
@@ -407,8 +404,6 @@
 
     /**
      *
-     * @param folder
-     * @param ignoreFiles
      */
     private void addIgnoreFolder(File folder, List<File> ignoreFiles) {
         File[] files = folder.listFiles();
diff --git a/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/ExcludePatterns.java b/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/ExcludePatterns.java
index a6c1529..04184ec 100644
--- a/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/ExcludePatterns.java
+++ b/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/ExcludePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,7 +70,6 @@
 
     /**
      * Load the exclude patterns
-     * @throws IOException
      */
     void initialize() throws IOException {
         this.patterns = new ArrayList<String>();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java
index 06f09fe..f28eb7d 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java
@@ -187,7 +187,6 @@
     /**
      * This method is to be used when sessions xml should not be generated.
      *
-     * @throws WSDLException
      */
     public static void setUp() throws WSDLException {
         setUp(null, false);
@@ -198,7 +197,6 @@
      * to DBWS_SESSION_STREAM.
      *
      * @param stageDir sessions xml will be generated and written out if non-null
-     * @throws WSDLException
      */
     public static void setUp(String stageDir) throws WSDLException {
         setUp(stageDir, false);
@@ -209,7 +207,6 @@
      * to DBWS_SESSION_STREAM.
      *
      * @param stageDir sessions xml will be generated and written out if non-null
-     * @throws WSDLException
      */
     public static void setUp(String stageDir, boolean useLogger) throws WSDLException {
         comparer.setIgnoreOrder(true);
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/ProcedureOperationModel.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/ProcedureOperationModel.java
index 82af89f..8450253 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/ProcedureOperationModel.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/ProcedureOperationModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -141,7 +141,6 @@
      * List. It is also assumed the each entry in a given DatabaseType[] corresponds
      * to an argument in the associated stored procedure at the same index.
      *
-     * @param dbTypes
      */
     public void addArgumentTypes(DatabaseType[] dbTypes) {
         if (argumentTypes == null) {
@@ -157,7 +156,6 @@
      * List. It is also assumed the each entry in a given DatabaseType[] corresponds
      * to an argument in the associated stored procedure at the same index.
      *
-     * @param argumentTypes
      */
     public void setArgumentTypes(List<DatabaseType[]> argumentTypes) {
         this.argumentTypes = argumentTypes;
@@ -175,7 +173,6 @@
     /**
      * Set the DatabaseType of the stored function's return argument.
      *
-     * @param dbStoredFunctionReturnType
      */
     public void setDbStoredFunctionReturnType(DatabaseType dbStoredFunctionReturnType) {
         this.dbStoredFunctionReturnType = dbStoredFunctionReturnType;
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java
index 69e4b88..07e7142 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java
@@ -389,7 +389,6 @@
     /**
      * Build the inline schema that will make up the content of the
      * {@code <wsdl:types>} section of the WSDL.
-     * @return
      */
     @SuppressWarnings("unchecked")
     private org.w3c.dom.Element createInlineSchema() {
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java
index 9c16977..308d79f 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java
@@ -475,7 +475,6 @@
      * If an invalid log level is set, a warning will be thrown
      * and the default level "fine" will be set.
      *
-     * @param logLevel
      */
     private boolean isValidLogLevel(String logLevel) {
         return (logLevel.equalsIgnoreCase(OFF)
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java
index 385995b..00f5973 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java
@@ -1054,7 +1054,6 @@
      * If set to true, NamedNativeQueryMetadata for CRUD operations (create, findAll, findByPk,
      * update and delete) will be generated for each Entity.  The default is false.
      *
-     * @param generateCRUDOps
      */
     protected void setGenerateCRUDOps(boolean generateCRUDOps) {
         this.generateCRUDOps = generateCRUDOps;