You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by po...@apache.org on 2024/03/13 16:08:20 UTC

(incubator-kie-drools) branch main updated: [kie-issues#1007] Update headers in DRL and DMN files to Apache headers (#5780)

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

porcelli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git


The following commit(s) were added to refs/heads/main by this push:
     new 92c23cfb75 [kie-issues#1007] Update headers in DRL and DMN files to Apache headers (#5780)
92c23cfb75 is described below

commit 92c23cfb75bf029219c8071d150b692362ddc853
Author: Tibor Zimányi <ti...@ibm.com>
AuthorDate: Wed Mar 13 17:08:15 2024 +0100

    [kie-issues#1007] Update headers in DRL and DMN files to Apache headers (#5780)
    
    * Remove Red Hat copyrights from dmn and drl files.
    
    * Fix VerifierComponentTest.
    
    * Fix more line number tests.
    
    * Remove duplicate license header in DMN files.
---
 .../src/test/resources/com/sample/from.drl         |  28 ++---
 .../src/test/resources/com/sample/reference.drl    |  28 ++---
 .../jboss/qa/brms/persistence/cep-lifecycle.drl    |  28 ++---
 .../org/jboss/qa/brms/persistence/lifecycle.drl    |  28 ++---
 .../org/drools/decisiontable/changeset1Test.drl    |  28 ++---
 .../org/drools/decisiontable/changeset2Test.drl    |  28 ++---
 .../test/resources/templates/test_integration.drl  |  28 ++---
 .../src/test/resources/templates/test_pricing1.drl |  28 ++---
 .../src/test/resources/templates/test_pricing2.drl |  28 ++---
 .../test/resources/templates/test_template1.drl    |  28 ++---
 .../test/resources/templates/test_template2.drl    |  28 ++---
 .../test/resources/templates/test_template3.drl    |  28 ++---
 .../test/resources/templates/test_template4.drl    |  28 ++---
 .../src/main/resources/defaultkiesession/Hal1.drl  |  28 ++---
 .../src/main/resources/kiebaseinclusion/Hal2.drl   |  28 ++---
 .../src/main/resources/org/other/pkg/rule3.drl     |  28 ++---
 .../src/main/resources/org/some/pkg/rule1.drl      |  28 ++---
 .../src/main/resources/org/some/pkg2/rule2.drl     |  28 ++---
 .../multiple-kbases/src/main/resources/rule0.drl   |  28 ++---
 .../src/main/resources/namedkiesession/Hal1.drl    |  28 ++---
 .../main/resources/reactivekiesession/reactive.drl |  28 ++---
 .../resources/org/drools/benchmark/waltz/waltz.drl |  27 ++---
 .../org/drools/benchmark/waltzdb/waltzdb.drl       |  27 ++---
 .../examples/backwardchaining/BC-Example.drl       |  28 ++---
 .../org/drools/examples/banking/Example1.drl       |  27 ++---
 .../org/drools/examples/banking/Example2.drl       |  27 ++---
 .../org/drools/examples/banking/Example3.drl       |  27 ++---
 .../org/drools/examples/banking/Example4.drl       |  27 ++---
 .../org/drools/examples/banking/Example5.drl       |  27 ++---
 .../org/drools/examples/banking/Example6.drl       |  27 ++---
 .../resources/org/drools/examples/birdsfly/fly.drl |  28 ++---
 .../org/drools/examples/buspass/bad/BusPassBad.drl |  28 ++---
 .../drools/examples/buspass/good/BusPassGood.drl   |  28 ++---
 .../org/drools/examples/buspass/good/Policy.drl    |  28 ++---
 .../drools/examples/buspass/jtms/BusPassJTMS.drl   |  28 ++---
 .../org/drools/examples/buspass/jtms/Policy.drl    |  28 ++---
 .../org/drools/examples/cashflow/CashFlow.drl      |  28 ++---
 .../org/drools/examples/circularTms/circular.drl   |  28 ++---
 .../drools/examples/diagnostics/CarWontStart.drl   |  28 ++---
 .../org/drools/examples/fibonacci/Fibonacci.drl    |  27 ++---
 .../drools/examples/fire/logical/FireLogical.drl   |  28 ++---
 .../org/drools/examples/fire/simple/Fire.drl       |  28 ++---
 .../resources/org/drools/examples/golfing/golf.drl |  27 ++---
 .../org/drools/examples/helloworld/HelloWorld.drl  |  27 ++---
 .../examples/honestpolitician/HonestPolitician.drl |  27 ++---
 .../resources/org/drools/examples/pacman/base.drl  |  27 ++---
 .../org/drools/examples/pacman/key-handlers.drl    |  27 ++---
 .../org/drools/examples/pacman/monster.drl         |  27 ++---
 .../org/drools/examples/pacman/pacman.drl          |  27 ++---
 .../org/drools/examples/petstore/PetStore.drl      |  27 ++---
 .../org/drools/examples/shopping/Shopping.drl      |  27 ++---
 .../agendagroup/StateExampleUsingAgendaGroup.drl   |  27 ++---
 .../state/salience/StateExampleUsingSalience.drl   |  27 ++---
 .../org/drools/examples/sudoku/sudoku.drl          |  28 ++---
 .../org/drools/examples/sudoku/validate.drl        |  28 ++---
 .../org/drools/examples/traits/multipleTraits.drl  |  28 ++---
 .../org/drools/examples/traits/noTraits.drl        |  28 ++---
 .../org/drools/examples/traits/traits.drl          |  28 ++---
 .../org/drools/examples/traits/traitsDon.drl       |  28 ++---
 .../org/drools/examples/traits/traitsMixins.drl    |  28 ++---
 .../org/drools/examples/traits/traitsShed.drl      |  28 ++---
 .../examples/troubleticket/TroubleTicket.drl       |  27 ++---
 .../org/drools/games/adventures/Commands.drl       |  28 ++---
 .../org/drools/games/adventures/Events.drl         |  28 ++---
 .../org/drools/games/adventures/Model.drl          |  28 ++---
 .../org/drools/games/adventures/Queries.drl        |  28 ++---
 .../org/drools/games/adventures/UiView.drl         |  28 ++---
 .../resources/org/drools/games/invaders1/Main.drl  |  28 ++---
 .../resources/org/drools/games/invaders2/Draw.drl  |  28 ++---
 .../resources/org/drools/games/invaders2/Init.drl  |  28 ++---
 .../resources/org/drools/games/invaders2/Main.drl  |  28 ++---
 .../resources/org/drools/games/invaders3/Draw.drl  |  28 ++---
 .../resources/org/drools/games/invaders3/Init.drl  |  28 ++---
 .../resources/org/drools/games/invaders3/Main.drl  |  28 ++---
 .../resources/org/drools/games/invaders3/Move.drl  |  28 ++---
 .../resources/org/drools/games/invaders4/Draw.drl  |  28 ++---
 .../resources/org/drools/games/invaders4/Init.drl  |  28 ++---
 .../resources/org/drools/games/invaders4/Main.drl  |  28 ++---
 .../resources/org/drools/games/invaders4/Move.drl  |  28 ++---
 .../resources/org/drools/games/invaders5/Draw.drl  |  28 ++---
 .../resources/org/drools/games/invaders5/Init.drl  |  28 ++---
 .../resources/org/drools/games/invaders5/Main.drl  |  28 ++---
 .../resources/org/drools/games/invaders5/Move.drl  |  28 ++---
 .../org/drools/games/invaders6/Bullet.drl          |  28 ++---
 .../resources/org/drools/games/invaders6/Draw.drl  |  28 ++---
 .../resources/org/drools/games/invaders6/Init.drl  |  28 ++---
 .../resources/org/drools/games/invaders6/Main.drl  |  28 ++---
 .../resources/org/drools/games/invaders6/Move.drl  |  28 ++---
 .../main/resources/org/drools/games/keys/keys.drl  |  28 ++---
 .../org/drools/games/numberguess/NumberGuess.drl   |  28 ++---
 .../resources/org/drools/games/pong/collision.drl  |  28 ++---
 .../main/resources/org/drools/games/pong/game.drl  |  28 ++---
 .../main/resources/org/drools/games/pong/init.drl  |  28 ++---
 .../main/resources/org/drools/games/pong/main.drl  |  28 ++---
 .../main/resources/org/drools/games/pong/move.drl  |  28 ++---
 .../org/drools/games/wumpus/client/client.drl      |  28 ++---
 .../org/drools/games/wumpus/server/commands.drl    |  28 ++---
 .../org/drools/games/wumpus/server/init.drl        |  28 ++---
 .../org/drools/games/wumpus/server/main.drl        |  28 ++---
 .../org/drools/games/wumpus/server/reset.drl       |  28 ++---
 .../org/drools/games/wumpus/server/score.drl       |  28 ++---
 .../org/drools/games/wumpus/server/sensorArray.drl |  28 ++---
 .../org/drools/games/wumpus/server/shoot.drl       |  28 ++---
 .../drools/games/wumpus/server/view/paintCave.drl  |  28 ++---
 .../games/wumpus/server/view/paintSensor.drl       |  28 ++---
 .../org/drools/games/wumpus/server/view/ui.drl     |  28 ++---
 .../integrationtests/drl/test_ImportFunctions.drl  |  28 ++---
 .../mvel/integrationtests/simple_query_test.drl    |  28 ++---
 .../drools/model/project/codegen/pkg1/file1.drl    |  25 +++--
 .../drools/model/project/codegen/pkg1/file2.drl    |  25 +++--
 .../drools/model/project/codegen/pkg2/file3.drl    |  25 +++--
 .../test/resources/org/drools/simple/broken.drl    |  25 +++--
 .../test/resources/org/drools/simple/cep/cep.drl   |  25 +++--
 .../rule/builder/dialect/mvel/mvel_rule.drl        |  28 ++---
 .../src/test/resources/agenda-groups.drl           |  28 ++---
 .../src/test/resources/cdiexample/test.drl         |  28 ++---
 .../org/drools/persistence/command/empty.drl       |  28 ++---
 .../kie/persistence/session/collect_rules.drl      |  28 ++---
 .../kie/persistence/session/family_rules.drl       |  28 ++---
 .../src/test/resources/ruleflow-groups.drl         |  28 ++---
 .../src/test/resources/ruleflowgroup_rollback.drl  |  28 ++---
 .../src/test/resources/rules.txt                   |  27 ++---
 .../ruleunit/examples/reactive/AlertingRules.drl   |  27 ++---
 .../org/drools/ruleunits/impl/AgendaGroupUnit.drl  |  25 +++--
 .../org/drools/ruleunits/impl/HelloWorld.drl       |  25 +++--
 .../org/drools/ruleunits/impl/Locations.drl        |  27 ++---
 .../org/drools/ruleunits/impl/LogicalAdd.drl       |  25 +++--
 .../drools/ruleunits/impl/LogicalAddByElement.drl  |  25 +++--
 .../org/drools/ruleunits/impl/NotTestUnit.drl      |  25 +++--
 .../org/drools/ruleunits/impl/OOPathTest.drl       |  25 +++--
 .../org/drools/ruleunits/impl/RuleName.drl         |  25 +++--
 .../org/drools/ruleunits/impl/StockTick.drl        |  25 +++--
 .../resources/org/drools/ruleunits/impl/Update.drl |  25 +++--
 .../org/drools/ruleunits/impl/UpdateNoDS.drl       |  25 +++--
 .../org/drools/ruleunits/impl/WronglyTypedUnit.drl |  25 +++--
 .../resources/folderToTest/simple-item-def.dmn     |  25 +++--
 .../serialization/protobuf/simple_query_test.drl   |  28 ++---
 .../protobuf/test_AccumulateSerialization.drl      |  28 ++---
 .../serialization/protobuf/test_Dynamic1.drl       |  28 ++---
 .../serialization/protobuf/test_Dynamic1_0.drl     |  28 ++---
 .../serialization/protobuf/test_Dynamic1_1.drl     |  28 ++---
 .../serialization/protobuf/test_Dynamic1_2.drl     |  28 ++---
 .../serialization/protobuf/test_Dynamic3.drl       |  28 ++---
 .../serialization/protobuf/test_Dynamic3_0.drl     |  28 ++---
 .../protobuf/test_LogicalInsertionWithExists.drl   |  28 ++---
 .../protobuf/test_LogicalInsertions.drl            |  28 ++---
 .../protobuf/test_LogicalInsertions2.drl           |  28 ++---
 .../test_LogicalInsertionsAccumulatorPattern.drl   |  28 ++---
 .../protobuf/test_LogicalInsertionsBacking.drl     |  28 ++---
 .../protobuf/test_LogicalInsertionsDynamicRule.drl |  28 ++---
 .../test_LogicalInsertionsDynamicRule2.drl         |  28 ++---
 ...odifySameRuleGivesDifferentLogicalInsertion.drl |  28 ++---
 .../protobuf/test_LogicalInsertionsNot.drl         |  28 ++---
 .../protobuf/test_LogicalInsertionsWithUpdate.drl  |  28 ++---
 .../serialization/protobuf/test_Serializable.drl   |  28 ++---
 .../serialization/protobuf/test_Serializable2.drl  |  28 ++---
 .../protobuf/test_SerializableAccumulate.drl       |  28 ++---
 .../protobuf/test_logicalInsertions3.drl           |  28 ++---
 .../resources/templates/test_template_invalid1.drl |  28 ++---
 .../resources/templates/test_template_invalid2.drl |  28 ++---
 .../resources/templates/test_template_invalid3.drl |  28 ++---
 .../resources/templates/test_template_invalid4.drl |  28 ++---
 .../drools/mvel/compiler/lang/RuleParserTest.java  |  16 +--
 .../drools/mvel/integrationtests/ParserTest.java   |   4 +-
 .../compiler/integrationtests/test_Accumulate.drl  |  28 ++---
 .../integrationtests/test_AccumulateAverage.drl    |  28 ++---
 .../test_AccumulateAverageMVEL.drl                 |  28 ++---
 .../test_AccumulateCollectList.drl                 |  28 ++---
 .../test_AccumulateCollectListMVEL.drl             |  28 ++---
 .../integrationtests/test_AccumulateCollectSet.drl |  28 ++---
 .../test_AccumulateCollectSetMVEL.drl              |  28 ++---
 .../integrationtests/test_AccumulateCount.drl      |  28 ++---
 .../integrationtests/test_AccumulateCountMVEL.drl  |  28 ++---
 .../integrationtests/test_AccumulateMVEL.drl       |  28 ++---
 .../integrationtests/test_AccumulateMax.drl        |  28 ++---
 .../integrationtests/test_AccumulateMaxMVEL.drl    |  28 ++---
 .../integrationtests/test_AccumulateMin.drl        |  28 ++---
 .../integrationtests/test_AccumulateMinMVEL.drl    |  28 ++---
 .../test_AccumulateMultiPattern.drl                |  28 ++---
 .../test_AccumulateMultiPatternFunctionJava.drl    |  28 ++---
 .../test_AccumulateMultiPatternFunctionMVEL.drl    |  28 ++---
 .../test_AccumulateMultiPatternMVEL.drl            |  28 ++---
 .../test_AccumulateMultipleFunctions.drl           |  28 ++---
 .../test_AccumulateMultipleFunctionsConstraint.drl |  28 ++---
 .../test_AccumulateMultipleFunctionsMVEL.drl       |  28 ++---
 .../test_AccumulateReverseModifyInsertLogical2.drl |  28 ++---
 .../integrationtests/test_AccumulateSum.drl        |  28 ++---
 .../integrationtests/test_AccumulateSumMVEL.drl    |  28 ++---
 .../test_CEP_AfterOperatorDates.drl                |  28 ++---
 .../test_CEP_AssertBehaviorOnEntryPoints.drl       |  28 ++---
 .../integrationtests/test_CEP_BeforeOperator.drl   |  28 ++---
 .../test_CEP_BeforeOperatorDates.drl               |  28 ++---
 .../test_CEP_CoincidesOperatorDates.drl            |  28 ++---
 .../test_CEP_CollectWithWindows.drl                |  28 ++---
 .../integrationtests/test_CEP_ComplexOperator.drl  |  28 ++---
 .../integrationtests/test_CEP_MetByOperator.drl    |  28 ++---
 .../test_CEP_SimpleEventAssertion.drl              |  28 ++---
 .../test_CEP_SimpleLengthWindow.drl                |  28 ++---
 .../integrationtests/test_CEP_SimpleTimeWindow.drl |  28 ++---
 .../test_CEP_TimeRelationalOperators.drl           |  28 ++---
 .../integrationtests/test_ConstraintConnectors.drl |  28 ++---
 .../integrationtests/test_EntryPointReference.drl  |  28 ++---
 .../integrationtests/test_GeneratedBeans.drl       |  28 ++---
 .../integrationtests/test_GeneratedBeansMVEL.drl   |  28 ++---
 .../test_MultiRestrictionFieldConstraint.drl       |  28 ++---
 .../test_NullFieldOnCompositeSink.drl              |  28 ++---
 .../compiler/integrationtests/test_SubNetworks.drl |  28 ++---
 .../integrationtests/test_Timer_With_Not.drl       |  28 ++---
 .../integrationtests/test_consequenceOffset.drl    |  28 ++---
 .../integrationtests/test_consequenceOffset2.drl   |  28 ++---
 .../test_consequenceOffsetImports.drl              |  28 ++---
 .../compiler/beliefsystem/defeasible/defeat.drl    |  28 ++---
 .../defeasible/defeatDefeaterRetract.drl           |  28 ++---
 .../beliefsystem/defeasible/defeaterOnly.drl       |  28 ++---
 .../beliefsystem/defeasible/defeaterRetract.drl    |  28 ++---
 .../beliefsystem/defeasible/defeatersPosNeg.drl    |  28 ++---
 .../beliefsystem/defeasible/multiDefeat.drl        |  28 ++---
 .../beliefsystem/defeasible/negDefeatPos.drl       |  28 ++---
 .../compiler/beliefsystem/defeasible/strict.drl    |  28 ++---
 .../beliefsystem/defeasible/strictOverride.drl     |  28 ++---
 .../beliefsystem/defeasible/strictRetract.drl      |  28 ++---
 .../compiler/beliefsystem/jtms/posNegConflict.drl  |  28 ++---
 .../mvel/compiler/beliefsystem/jtms/posNegTms.drl  |  28 ++---
 .../drools/mvel/compiler/builder/impl/bad_rule.drl |  28 ++---
 .../drools/mvel/compiler/compiler/java5_rule.drl   |  28 ++---
 .../mvel/compiler/compiler/largeRuleNumber.drl     |  28 ++---
 .../mvel/compiler/compiler/largeRuleNumberMVEL.drl |  28 ++---
 .../compiler/xml/changeset/changeset1Test.drl      |  28 ++---
 .../compiler/xml/changeset/changeset2Test.drl      |  28 ++---
 .../mvel/compiler/lang/Rule_with_Extends.drl       |  28 ++---
 .../mvel/compiler/lang/Rule_with_Metadata.drl      |  28 ++---
 .../mvel/compiler/lang/Rule_with_nested_LHS.drl    |  28 ++---
 .../org/drools/mvel/compiler/lang/accumulate.drl   |  28 ++---
 .../compiler/lang/accumulateExternalFunction.drl   |  28 ++---
 .../compiler/lang/accumulateMultipleFunctions.drl  |  28 ++---
 .../lang/accumulateMultipleFunctionsConstraint.drl |  28 ++---
 .../mvel/compiler/lang/accumulateReverse.drl       |  28 ++---
 .../compiler/lang/accumulate_multi_pattern.drl     |  28 ++---
 .../compiler/lang/accumulate_with_bindings.drl     |  28 ++---
 .../compiler/lang/accumulate_with_nested_from.drl  |  28 ++---
 .../mvel/compiler/lang/almost_empty_rule.drl       |  28 ++---
 .../org/drools/mvel/compiler/lang/and_or_rule.drl  |  28 ++---
 .../drools/mvel/compiler/lang/application-data.drl |  28 ++---
 .../org/drools/mvel/compiler/lang/autofocus.drl    |  28 ++---
 .../drools/mvel/compiler/lang/basic_binding.drl    |  28 ++---
 .../org/drools/mvel/compiler/lang/bindings.drl     |  28 ++---
 .../mvel/compiler/lang/brackets_precedence.drl     |  28 ++---
 .../org/drools/mvel/compiler/lang/cheese-rules.drl |  28 ++---
 .../org/drools/mvel/compiler/lang/collect.drl      |  28 ++---
 .../compiler/lang/collect_with_nested_from.drl     |  28 ++---
 .../org/drools/mvel/compiler/lang/comma_misuse.drl |  28 ++---
 .../org/drools/mvel/compiler/lang/comment.drl      |  28 ++---
 .../compiler/lang/declaration-in-consequence.drl   |  28 ++---
 .../compiler/lang/declare_type_with_fields.drl     |  28 ++---
 .../org/drools/mvel/compiler/lang/empty_rule.drl   |  28 ++---
 .../org/drools/mvel/compiler/lang/enumeration.drl  |  28 ++---
 .../mvel/compiler/lang/eol_funny_business.drl      |  28 ++---
 .../drools/mvel/compiler/lang/escaped-string.drl   |  28 ++---
 .../drools/mvel/compiler/lang/eval_multiple.drl    |  28 ++---
 .../org/drools/mvel/compiler/lang/eval_parsing.drl |  28 ++---
 .../mvel/compiler/lang/eval_with_newline.drl       |  28 ++---
 .../mvel/compiler/lang/eval_with_semicolon.drl     |  28 ++---
 .../compiler/lang/exist_instead_of_exists_test.drl |  28 ++---
 .../mvel/compiler/lang/extra_lhs_newline.drl       |  28 ++---
 .../org/drools/mvel/compiler/lang/forall.drl       |  28 ++---
 .../drools/mvel/compiler/lang/forallwithfrom.drl   |  28 ++---
 .../org/drools/mvel/compiler/lang/from.drl         |  28 ++---
 .../drools/mvel/compiler/lang/function_arrays.drl  |  28 ++---
 .../org/drools/mvel/compiler/lang/functions.drl    |  28 ++---
 .../org/drools/mvel/compiler/lang/globals.drl      |  28 ++---
 .../org/drools/mvel/compiler/lang/groupBy.drl      |  29 +++---
 .../org/drools/mvel/compiler/lang/import_event.drl |  28 ++---
 .../drools/mvel/compiler/lang/in_operator_test.drl |  28 ++---
 .../drools/mvel/compiler/lang/invalid_syntax.drl   |  28 ++---
 .../org/drools/mvel/compiler/lang/lex_error.drl    |  28 ++---
 .../mvel/compiler/lang/lhs_semicolon_delim.drl     |  28 ++---
 .../compiler/lang/literal_bool_and_negative.drl    |  28 ++---
 .../mvel/compiler/lang/misplaced_parenthesis.drl   |  28 ++---
 .../drools/mvel/compiler/lang/multiple_errors.drl  |  28 ++---
 .../drools/mvel/compiler/lang/multiple_rules.drl   |  28 ++---
 .../compiler/lang/nested_conditional_elements.drl  |  28 ++---
 .../org/drools/mvel/compiler/lang/no-loop.drl      |  28 ++---
 .../mvel/compiler/lang/no_eol_on_comment.drl       |  28 ++---
 .../mvel/compiler/lang/not_exist_with_brackets.drl |  28 ++---
 .../mvel/compiler/lang/not_pluggable_operator.drl  |  28 ++---
 .../mvel/compiler/lang/not_with_binding_error.drl  |  28 ++---
 .../mvel/compiler/lang/not_with_constraint.drl     |  28 ++---
 .../mvel/compiler/lang/notin_operator_test.drl     |  28 ++---
 .../drools/mvel/compiler/lang/npe_on_parser.drl    |  28 ++---
 .../org/drools/mvel/compiler/lang/one-rule.drl     |  28 ++---
 .../org/drools/mvel/compiler/lang/or_binding.drl   |  28 ++---
 .../mvel/compiler/lang/or_binding_complex.drl      |  28 ++---
 .../compiler/lang/or_binding_with_brackets.drl     |  28 ++---
 .../org/drools/mvel/compiler/lang/or_ce.drl        |  28 ++---
 .../org/drools/mvel/compiler/lang/or_nesting.drl   |  28 ++---
 .../drools/mvel/compiler/lang/package-imports.drl  |  28 ++---
 .../org/drools/mvel/compiler/lang/package.drl      |  28 ++---
 .../mvel/compiler/lang/package_attributes.drl      |  28 ++---
 .../drools/mvel/compiler/lang/package_garbage.drl  |  28 ++---
 .../drools/mvel/compiler/lang/pattern_partial.drl  |  28 ++---
 .../mvel/compiler/lang/pluggable_operators.drl     |  28 ++---
 .../mvel/compiler/lang/qualified_classname.drl     |  28 ++---
 .../drools/mvel/compiler/lang/query_and_rule.drl   |  28 ++---
 .../mvel/compiler/lang/quoted_string_name_rule.drl |  28 ++---
 .../mvel/compiler/lang/restrictions_test.drl       |  28 ++---
 .../drools/mvel/compiler/lang/rule_attributes.drl  |  28 ++---
 .../drools/mvel/compiler/lang/rule_attributes2.drl |  28 ++---
 .../mvel/compiler/lang/rule_attributes_alt.drl     |  28 ++---
 .../compiler/lang/rule_calendars_attribute.drl     |  28 ++---
 .../compiler/lang/rule_calendars_attribute2.drl    |  28 ++---
 .../compiler/lang/rule_duration_expression.drl     |  28 ++---
 .../mvel/compiler/lang/rule_enabled_expression.drl |  28 ++---
 .../compiler/lang/rule_names_number_prefix.drl     |  28 ++---
 .../org/drools/mvel/compiler/lang/rule_not.drl     |  28 ++---
 .../drools/mvel/compiler/lang/ruleflowgroup.drl    |  28 ++---
 .../org/drools/mvel/compiler/lang/semicolon.drl    |  28 ++---
 .../drools/mvel/compiler/lang/simple_expander.drl  |  28 ++---
 .../org/drools/mvel/compiler/lang/simple_query.drl |  28 ++---
 .../org/drools/mvel/compiler/lang/simple_rule.drl  |  28 ++---
 .../mvel/compiler/lang/soundslike_operator.drl     |  28 ++---
 .../mvel/compiler/lang/statement_ordering_1.drl    |  28 ++---
 .../mvel/compiler/lang/template_test_error.drl     |  28 ++---
 .../mvel/compiler/lang/ternary_expression.drl      |  28 ++---
 .../lang/test_CommentLineNumbersInConsequence.drl  |  28 ++---
 .../lang/test_ComplexChainedCallWithFrom.drl       |  28 ++---
 .../mvel/compiler/lang/test_EmptyPattern.drl       |  28 ++---
 .../drools/mvel/compiler/lang/test_EndPosition.drl |  28 ++---
 .../mvel/compiler/lang/test_FunctionImport.drl     |  28 ++---
 .../lang/test_SimpleAccessorArgWithFrom.drl        |  28 ++---
 .../compiler/lang/test_SimpleAccessorWithFrom.drl  |  28 ++---
 .../lang/test_SimpleFunctionCallWithFrom.drl       |  28 ++---
 .../lang/test_SimpleMethodCallWithFrom.drl         |  28 ++---
 .../drools/mvel/compiler/lang/type_with_meta.drl   |  28 ++---
 .../org/drools/mvel/compiler/lang/with_eval.drl    |  28 ++---
 .../drools/mvel/compiler/lang/with_predicate.drl   |  28 ++---
 .../org/drools/mvel/compiler/lang/with_retval.drl  |  28 ++---
 .../dialect/java/nestedConditionalElements.drl     |  28 ++---
 .../compiler/rule/builder/dialect/javaonly.drl     |  28 ++---
 .../rule/builder/dialect/mvel/mvel_rule.drl        |  28 ++---
 .../rule/builder/dialect/mveljavarules.drl         |  28 ++---
 .../compiler/rule/builder/dialect/mvelonly.drl     |  28 ++---
 .../drools/mvel/compiler/test_NestedAccessors.drl  |  28 ++---
 .../drools/mvel/integrationtests/MVEL_soundex.drl  |  28 ++---
 .../mvel/integrationtests/MVEL_soundexNPE2500.drl  |  28 ++---
 .../org/drools/mvel/integrationtests/Sample.drl    |  28 ++---
 .../mvel/integrationtests/drl/HelloWorld.drl       |  28 ++---
 .../integrationtests/drl/test_DeclarationUsage.drl |  28 ++---
 .../mvel/integrationtests/drl/test_Dumpers.drl     |  28 ++---
 .../integrationtests/drl/test_ImportFunctions.drl  |  28 ++---
 .../org/drools/mvel/integrationtests/empty.drl     |  28 ++---
 .../mvel/integrationtests/errors_in_rule.drl       |  28 ++---
 .../integrationtests/errors_parser_multiple.drl    |  28 ++---
 .../eventgenerator/example_scenario.drl            |  28 ++---
 .../eventgenerator/test_eventGenerator.drl         |  28 ++---
 .../mvel/integrationtests/exists_rule_test.drl     |  28 ++---
 .../mvel/integrationtests/extend_rule_test.drl     |  28 ++---
 .../mvel/integrationtests/globals_rule_test.drl    |  28 ++---
 .../drools/mvel/integrationtests/literal_rule.drl  |  28 ++---
 .../mvel/integrationtests/multiple_rules_rule.drl  |  28 ++---
 .../org/drools/mvel/integrationtests/no-loop.drl   |  28 ++---
 .../mvel/integrationtests/no-loop_with_modify.drl  |  28 ++---
 .../drools/mvel/integrationtests/not_rule_test.drl |  28 ++---
 .../not_with_bindings_rule_test.drl                |  28 ++---
 .../mvel/integrationtests/null_behaviour.drl       |  28 ++---
 .../mvel/integrationtests/null_constraint.drl      |  28 ++---
 .../mvel/integrationtests/parallel_compilation.drl |  28 ++---
 .../mvel/integrationtests/processescapes.drl       |  28 ++---
 .../mvel/integrationtests/processescapesoff.drl    |  28 ++---
 .../drools/mvel/integrationtests/rf_test_rules.drl |  28 ++---
 .../rf_test_rules_different_pkg.drl                |  28 ++---
 .../drools/mvel/integrationtests/ruleflowgroup.drl |  28 ++---
 .../mvel/integrationtests/ruleflowgroup2.drl       |  28 ++---
 .../sequential/sequentialProfile.drl               |  28 ++---
 .../sequential/sequentialProfileMVEL.drl           |  28 ++---
 .../integrationtests/sequential/simpleSalience.drl |  28 ++---
 .../sequential/simpleSequential.drl                |  28 ++---
 .../integrationtests/session/assert_retract.drl    |  28 ++---
 .../mvel/integrationtests/session/delete_test.drl  |  28 ++---
 .../session/statelessSessionTest.drl               |  28 ++---
 .../test_CrossProductRemovingIdentityEquals.drl    |  28 ++---
 .../integrationtests/session/test_EventModel.drl   |  28 ++---
 .../integrationtests/session/test_FinalClass.drl   |  28 ++---
 .../session/test_InsertionOrder.drl                |  28 ++---
 .../session/test_IterateObjects.drl                |  28 ++---
 .../session/test_JavaModifyBlock.drl               |  28 ++---
 .../session/test_JoinNodeModifyObject.drl          |  28 ++---
 .../session/test_JoinNodeModifyTuple.drl           |  28 ++---
 .../integrationtests/session/test_LatinLocale.drl  |  28 ++---
 .../integrationtests/session/test_ModifyBlock.drl  |  28 ++---
 .../session/test_ModifyBlockWithFrom.drl           |  28 ++---
 .../session/test_ModifyBlockWithPolymorphism.drl   |  28 ++---
 .../session/test_ModifyRetractInsert.drl           |  28 ++---
 .../session/test_ModifyWithLockOnActive.drl        |  28 ++---
 .../session/test_NotInStatelessSession.drl         |  28 ++---
 .../session/test_RetractModifyWithFunction.drl     |  28 ++---
 .../session/test_RuntimeTypeCoercion.drl           |  28 ++---
 .../session/test_RuntimeTypeCoercion2.drl          |  28 ++---
 .../mvel/integrationtests/session/update_test.drl  |  28 ++---
 .../mvel/integrationtests/several_kie_sessions.drl |  28 ++---
 .../mvel/integrationtests/simple_query_test.drl    |  28 ++---
 .../mvel/integrationtests/strevaluator_test.drl    |  28 ++---
 .../testStatelessKnowledgeSessionInOutParams.drl   |  28 ++---
 .../test_AccumulateReturningNullMVEL.drl           |  28 ++---
 .../test_AccumulateWithFromChaining.drl            |  28 ++---
 .../test_ActivationCancellation.drl                |  28 ++---
 .../integrationtests/test_ActivationGroups.drl     |  28 ++---
 .../integrationtests/test_AddRemoveListeners.drl   |  28 ++---
 .../mvel/integrationtests/test_AgendaGroups.drl    |  28 ++---
 .../drools/mvel/integrationtests/test_Channels.drl |  28 ++---
 .../drools/mvel/integrationtests/test_Collect.drl  |  28 ++---
 .../test_CollectAlphaRestriction.drl               |  28 ++---
 .../test_CollectContainsOperator.drl               |  28 ++---
 .../integrationtests/test_CollectDynamicRules1.drl |  28 ++---
 .../test_CollectDynamicRules1a.drl                 |  28 ++---
 .../integrationtests/test_CollectDynamicRules2.drl |  28 ++---
 .../test_CollectFromMVELAfterOr.drl                |  28 ++---
 .../test_CollectMemberOfOperator.drl               |  28 ++---
 .../test_CollectResultConstraints.drl              |  28 ++---
 .../test_CollectResultsBetaConstraint.drl          |  28 ++---
 .../test_CollectWithNestedFrom.drl                 |  28 ++---
 .../test_DefaultBetaConstraint.drl                 |  28 ++---
 .../test_DoubleQueryWithExists.drl                 |  28 ++---
 .../test_DuplicateLocalVariableMVELConsequence.drl |  28 ++---
 .../drools/mvel/integrationtests/test_Dynamic1.drl |  28 ++---
 .../drools/mvel/integrationtests/test_Dynamic2.drl |  28 ++---
 .../drools/mvel/integrationtests/test_Dynamic3.drl |  28 ++---
 .../drools/mvel/integrationtests/test_Dynamic4.drl |  28 ++---
 .../integrationtests/test_DynamicFunction1.drl     |  28 ++---
 .../integrationtests/test_DynamicFunction2.drl     |  28 ++---
 .../integrationtests/test_DynamicFunction3.drl     |  28 ++---
 .../mvel/integrationtests/test_DynamicNotNode.drl  |  28 ++---
 .../mvel/integrationtests/test_DynamicRules.drl    |  28 ++---
 .../mvel/integrationtests/test_DynamicRules2.drl   |  28 ++---
 .../mvel/integrationtests/test_DynamicRulesEd.drl  |  28 ++---
 .../integrationtests/test_DynamicRulesFred.drl     |  28 ++---
 .../mvel/integrationtests/test_DynamicRulesTom.drl |  28 ++---
 .../test_DynamicRulesWithNotSubnetwork.drl         |  28 ++---
 .../test_DynamicRulesWithSubnetwork.drl            |  28 ++---
 .../test_DynamicRulesWithSubnetwork1.drl           |  28 ++---
 .../test_DynamicRulesWithSubnetwork2.drl           |  28 ++---
 .../test_DynamicWithEntryPoint.drl                 |  28 ++---
 .../mvel/integrationtests/test_EffectiveDate.drl   |  28 ++---
 .../integrationtests/test_EnumSerialization.drl    |  28 ++---
 .../drools/mvel/integrationtests/test_Enums.drl    |  28 ++---
 .../integrationtests/test_ExistsWithBindings.drl   |  28 ++---
 .../integrationtests/test_Exists_JBRULES_2810.drl  |  28 ++---
 .../org/drools/mvel/integrationtests/test_Ext1.drl |  28 ++---
 .../org/drools/mvel/integrationtests/test_Ext2.drl |  28 ++---
 .../org/drools/mvel/integrationtests/test_Ext3.drl |  28 ++---
 .../org/drools/mvel/integrationtests/test_Ext4.drl |  28 ++---
 .../mvel/integrationtests/test_ExtFieldInit.drl    |  28 ++---
 .../mvel/integrationtests/test_ExtHierarchy.drl    |  28 ++---
 .../mvel/integrationtests/test_ExtLegacy.drl       |  28 ++---
 .../integrationtests/test_ExtLegacyIllegal.drl     |  28 ++---
 .../drools/mvel/integrationtests/test_Extends.drl  |  28 ++---
 .../mvel/integrationtests/test_FinalClass2.drl     |  28 ++---
 .../drools/mvel/integrationtests/test_Forall.drl   |  28 ++---
 .../drools/mvel/integrationtests/test_Forall2.drl  |  28 ++---
 .../integrationtests/test_ForallSinglePattern.drl  |  28 ++---
 .../integrationtests/test_ForallSinglePattern2.drl |  28 ++---
 .../test_ForallSinglePatternWithExists.drl         |  28 ++---
 .../integrationtests/test_ForallSlidingWindow.drl  |  28 ++---
 .../drools/mvel/integrationtests/test_From2.drl    |  28 ++---
 .../test_FromInsideNotAndExists.drl                |  28 ++---
 .../mvel/integrationtests/test_FromWithOr.drl      |  28 ++---
 .../integrationtests/test_FunctionException.drl    |  28 ++---
 .../test_FunctionInConsequence.drl                 |  28 ++---
 .../test_FunctionWithPrimitives.drl                |  28 ++---
 .../mvel/integrationtests/test_GeneratedBeans.drl  |  28 ++---
 .../mvel/integrationtests/test_GeneratedBeans2.drl |  28 ++---
 .../integrationtests/test_GeneratedBeansMVEL.drl   |  28 ++---
 .../test_GeneratedBeansSerializable.drl            |  28 ++---
 .../mvel/integrationtests/test_I18nPerson_utf8.drl |  28 ++---
 ...I18nPerson_utf8_forTestNewClassPathResource.drl |  28 ++---
 .../test_Insert_Retract_Noloop.drl                 |  28 ++---
 .../mvel/integrationtests/test_JBRULES_2206_1.drl  |  28 ++---
 .../mvel/integrationtests/test_JBRULES_2206_2.drl  |  28 ++---
 .../mvel/integrationtests/test_JBRules2055.drl     |  28 ++---
 .../mvel/integrationtests/test_JBRules2140.drl     |  28 ++---
 .../mvel/integrationtests/test_JBRules2369.drl     |  28 ++---
 .../integrationtests/test_KnowledgeContextJava.drl |  28 ++---
 .../integrationtests/test_KnowledgeContextMVEL.drl |  28 ++---
 .../mvel/integrationtests/test_LRUnlinking.drl     |  28 ++---
 .../test_LocalVariableMVELConsequence.drl          |  28 ++---
 .../mvel/integrationtests/test_LockOnActive.drl    |  28 ++---
 .../test_LockOnActiveWithModify.drl                |  28 ++---
 .../test_LockOnActiveWithUpdate.drl                |  28 ++---
 .../drools/mvel/integrationtests/test_Logger.drl   |  28 ++---
 .../integrationtests/test_LogicalInsertOrder.drl   |  28 ++---
 .../test_LogicalInsertionsLoop.drl                 |  28 ++---
 .../test_LogicalInsertionsNoLoop.drl               |  28 ++---
 .../test_LogicalInsertionsNotPingPong.drl          |  28 ++---
 .../test_LogicalInsertionsSelfreferencing.drl      |  28 ++---
 .../test_LogicalInsertionsUpdateEqual.drl          |  28 ++---
 .../mvel/integrationtests/test_MVELCollect.drl     |  28 ++---
 .../mvel/integrationtests/test_MVELGlobalDebug.drl |  28 ++---
 .../mvel/integrationtests/test_MVELrewrite.drl     |  28 ++---
 .../mvel/integrationtests/test_MapAccess.drl       |  28 ++---
 .../test_MapAccessWithVariable.drl                 |  28 ++---
 .../mvel/integrationtests/test_MemoryLeak.drl      |  28 ++---
 .../test_MergePackageWithSameRuleNames1.drl        |  28 ++---
 .../test_MergePackageWithSameRuleNames2.drl        |  28 ++---
 .../test_ModifyWithRuleflowAndSubNetwork.drl       |  28 ++---
 .../test_MultithreadDateStringConstraints.drl      |  28 ++---
 .../test_MultithreadFiringCheck.drl                |  28 ++---
 .../test_MultithreadRulebaseSharing.drl            |  28 ++---
 .../test_NestedCorrelatedRulesWithForall.drl       |  28 ++---
 .../test_NullFieldOnCompositeSink.drl              |  28 ++---
 .../mvel/integrationtests/test_NullHandling.drl    |  28 ++---
 .../mvel/integrationtests/test_NullHashing.drl     |  28 ++---
 .../integrationtests/test_NullValuesIndexing.drl   |  28 ++---
 .../test_OrCEFollowedByCollect.drl                 |  28 ++---
 .../test_OrCEFollowedByMultipleEval.drl            |  28 ++---
 .../test_OrCEFollowedByMultipleEval2.drl           |  28 ++---
 .../mvel/integrationtests/test_OrNesting.drl       |  28 ++---
 .../mvel/integrationtests/test_OutOfMemory.drl     |  28 ++---
 .../integrationtests/test_OutOfMemoryError.drl     |  28 ++---
 .../test_PropertyChangeTypeDecl.drl                |  28 ++---
 .../drools/mvel/integrationtests/test_Query.drl    |  28 ++---
 .../mvel/integrationtests/test_QueryMemoryLeak.drl |  28 ++---
 .../mvel/integrationtests/test_QueryWithParams.drl |  28 ++---
 .../mvel/integrationtests/test_RemovePackage.drl   |  28 ++---
 .../test_RepetitiveUpdatesOnSameFacts.drl          |  28 ++---
 .../mvel/integrationtests/test_RuleExtend.drl      |  28 ++---
 .../integrationtests/test_RuleNameClashes1.drl     |  28 ++---
 .../integrationtests/test_RuleNameClashes2.drl     |  28 ++---
 .../mvel/integrationtests/test_Serialization1.drl  |  28 ++---
 .../test_ShadowProxyInHierarchies.drl              |  28 ++---
 .../test_ShadowProxyOnCollections.drl              |  28 ++---
 .../test_ShadowProxyOnCollections2.drl             |  28 ++---
 .../mvel/integrationtests/test_SubNetworks.drl     |  28 ++---
 .../integrationtests/test_TestMapVariableRef.drl   |  28 ++---
 .../mvel/integrationtests/test_TwoQuerries.drl     |  28 ++---
 .../mvel/integrationtests/test_UnbalancedTrees.drl |  28 ++---
 .../test_UpdateActivationCreationNoLoop.drl        |  28 ++---
 .../mvel/integrationtests/test_UpdateNoloop.drl    |  28 ++---
 .../integrationtests/test_collectNodeSharing.drl   |  28 ++---
 .../drools/mvel/integrationtests/test_exists.drl   |  28 ++---
 .../mvel/integrationtests/test_fireLimit.drl       |  28 ++---
 .../test_functionCallingFunction.drl               |  28 ++---
 .../integrationtests/test_globalCustomResolver.drl |  28 ++---
 .../integrationtests/test_globalsAsConstraints.drl |  28 ++---
 .../org/drools/mvel/integrationtests/test_halt.drl |  28 ++---
 .../integrationtests/test_mapNullConstraints.drl   |  28 ++---
 .../org/drools/mvel/integrationtests/test_mvel.drl |  28 ++---
 .../mvel/integrationtests/test_nullBindings.drl    |  28 ++---
 .../test_removeIdentitiesSubNetwork.drl            |  28 ++---
 .../test_salienceExpressionRule.drl                |  28 ++---
 .../integrationtests/test_salienceIntegerRule.drl  |  28 ++---
 .../mvel/integrationtests/test_skipModify.drl      |  28 ++---
 .../mvel/integrationtests/thread_class_test.drl    |  28 ++---
 .../org/drools/mvel/integrationtests/varargs.drl   |  28 ++---
 .../org/drools/mvel/integrationtests/varargs2.drl  |  28 ++---
 .../drools/mvel/integrationtests/waltz/waltz.drl   |  28 ++---
 .../integrationtests/ruleunits/HelloJar.drl        |  25 +++--
 .../testcoverage/functional/activation-group.drl   |  27 ++---
 .../drools/testcoverage/functional/aggregation.drl |  27 ++---
 .../functional/declarative-agenda-block.drl        |  27 ++---
 .../functional/declarative-agenda-cancel.drl       |  27 ++---
 .../functional/declarative-agenda-count.drl        |  27 ++---
 .../functional/declarative-agenda-simple-block.drl |  27 ++---
 .../functional/declarative-agenda-unblockall.drl   |  27 ++---
 .../functional/logicalInsertFromCollectionTest.drl |  27 ++---
 .../testcoverage/functional/oopath/oopath.drl      |  27 ++---
 .../functional/parser/drl/BRMS-395.drl             |  27 ++---
 .../functional/parser/drl/asterisk-imports.drl     |  27 ++---
 .../functional/parser/drl/end-comment.drl          |  27 ++---
 .../functional/parser/drl/str-operator.drl         |  27 ++---
 .../functional/parser/drl/whitespaces.drl          |  27 ++---
 .../testcoverage/functional/parser/dsl/basic.dslr  |  27 ++---
 .../functional/parser/dsl/dslQuery.dslr            |  27 ++---
 .../functional/parser/dsl/miscelaneous.dslr        |  27 ++---
 .../testcoverage/functional/parser/dsl/sample.dslr |  27 ++---
 .../testcoverage/functional/parser/smoke/cep.drl   |  27 ++---
 .../functional/parser/smoke/conditionals.drl       |  27 ++---
 .../functional/parser/smoke/declared.drl           |  27 ++---
 .../functional/parser/smoke/drools-5.2.drl         |  27 ++---
 .../functional/parser/smoke/imports.drl            |  27 ++---
 .../functional/parser/smoke/operators.drl          |  27 ++---
 .../testcoverage/functional/parser/smoke/query.drl |  27 ++---
 .../testcoverage/functional/parser/smoke/rhs.drl   |  27 ++---
 .../functional/query-bad-parametr-access.drl       |  27 ++---
 .../testcoverage/functional/query-same-name-1.drl  |  27 ++---
 .../testcoverage/functional/query-same-name-2.drl  |  27 ++---
 .../functional/query-two-same-names.drl            |  27 ++---
 .../testcoverage/functional/query-without-name.drl |  27 ++---
 .../org/drools/testcoverage/functional/query.drl   |  27 ++---
 .../drools/testcoverage/functional/rule-name.drl   |  27 ++---
 .../org/drools/testcoverage/functional/sample.dslr |  27 ++---
 .../drools/testcoverage/functional/template_1.drl  |  27 ++---
 .../drools/testcoverage/functional/template_2.drl  |  27 ++---
 .../org/drools/testcoverage/functional/unicode.drl |  27 ++---
 .../drools/testcoverage/functional/unicode.dslr    |  27 ++---
 .../drools/testcoverage/regression/BRMS-364.drl    |  27 ++---
 .../drools/testcoverage/regression/BRMS-580.drl    |  27 ++---
 .../testcoverage/regression/DroolsGcCausesNPE.drl  |  27 ++---
 .../testcoverage/regression/JBRULES-3075.drl       |  27 ++---
 .../abstractCompositeRestrictionTest.drl           |  27 ++---
 .../drools/testcoverage/regression/bz1019473.drl   |  27 ++---
 .../regression/fusionAfterBeforeTest.drl           |  27 ++---
 .../testcoverage/regression/logical-insertion.drl  |  27 ++---
 .../regression/propertyListenerTest.drl            |  27 ++---
 .../regression/serializableGeneratedTypesTest.drl  |  27 ++---
 .../regression/sessionInsertMultithreadingTest.drl |  27 ++---
 .../drools/testcoverage/regression/star_import.drl |  27 ++---
 .../testcoverage/regression/test_concurrency.drl   |  28 ++---
 .../regression/unwantedStringConversionTest.drl    |  27 ++---
 .../factmodel/traits/testComplexDonShed.drl        |  28 ++---
 .../factmodel/traits/testDeclaredFactTrait.drl     |  28 ++---
 .../factmodel/traits/testPojoFactTrait.drl         |  28 ++---
 .../factmodel/traits/testTraitCollections.drl      |  28 ++---
 .../compiler/factmodel/traits/testTraitDon.drl     |  28 ++---
 .../factmodel/traits/testTraitDonMultiple.drl      |  28 ++---
 .../compiler/factmodel/traits/testTraitIsA.drl     |  28 ++---
 .../compiler/factmodel/traits/testTraitIsA2.drl    |  28 ++---
 .../factmodel/traits/testTraitIsAWithBC.drl        |  28 ++---
 .../factmodel/traits/testTraitLegacyCore.drl       |  28 ++---
 .../factmodel/traits/testTraitLegacyTrait.drl      |  28 ++---
 .../compiler/factmodel/traits/testTraitMixin.drl   |  28 ++---
 .../factmodel/traits/testTraitOverride.drl         |  28 ++---
 .../compiler/factmodel/traits/testTraitShed.drl    |  28 ++---
 .../factmodel/traits/testTraitWithEquality.drl     |  28 ++---
 .../factmodel/traits/testTraitWrapping.drl         |  28 ++---
 .../traits/testTraitWrappingPrimitives.drl         |  28 ++---
 .../factmodel/traits/testTraitedAliasing.drl       |  28 ++---
 .../org/drools/verifier/alwaysFalse/Patterns.drl   |  27 ++---
 .../org/drools/verifier/alwaysFalse/Rules.drl      |  27 ++---
 .../org/drools/verifier/alwaysTrue/Patterns.drl    |  27 ++---
 .../org/drools/verifier/alwaysTrue/Rules.drl       |  27 ++---
 .../org/drools/verifier/bootstrap-essentials.drl   |  27 ++---
 .../drools/verifier/consequence/Consequence.drl    |  27 ++---
 .../verifier/consequence/NamedConsequences.drl     |  27 ++---
 .../org/drools/verifier/incoherence/Patterns.drl   |  27 ++---
 .../drools/verifier/incoherence/Restrictions.drl   |  27 ++---
 .../drools/verifier/incompatibility/Patterns.drl   |  27 ++---
 .../verifier/incompatibility/Restrictions.drl      |  27 ++---
 .../verifier/missingEquality/MissingEquality.drl   |  27 ++---
 .../org/drools/verifier/opposites/Patterns.drl     |  27 ++---
 .../org/drools/verifier/opposites/Restrictions.drl |  27 ++---
 .../org/drools/verifier/opposites/Rules.drl        |  27 ++---
 .../drools/verifier/optimisation/PatternOrder.drl  |  27 ++---
 .../verifier/optimisation/RestrictionOrder.drl     |  27 ++---
 .../org/drools/verifier/overlaps/Restrictions.drl  |  27 ++---
 .../org/drools/verifier/rangeChecks/Clean.drl      |  27 ++---
 .../org/drools/verifier/rangeChecks/Dates.drl      |  27 ++---
 .../org/drools/verifier/rangeChecks/Doubles.drl    |  27 ++---
 .../org/drools/verifier/rangeChecks/Integers.drl   |  27 ++---
 .../drools/verifier/rangeChecks/NumberPatterns.drl |  27 ++---
 .../org/drools/verifier/rangeChecks/Variables.drl  |  27 ++---
 .../org/drools/verifier/redundancy/Notes.drl       |  27 ++---
 .../org/drools/verifier/redundancy/Redundancy.drl  |  27 ++---
 .../org/drools/verifier/redundancy/Warnings.drl    |  27 ++---
 .../drools/verifier/reports/RangeCheckReports.drl  |  27 ++---
 .../drools/verifier/subsumption/Consequences.drl   |  27 ++---
 .../drools/verifier/subsumption/Restrictions.drl   |  27 ++---
 .../drools/verifier/subsumption/SubPatterns.drl    |  27 ++---
 .../org/drools/verifier/subsumption/SubRules.drl   |  27 ++---
 .../verifier/visitor/VerifierComponentTest.java    |  88 ++++++++--------
 .../drools/verifier/ConditionalBranchDescrTest.drl |  27 ++---
 .../test/resources/org/drools/verifier/Enums.drl   |  27 ++---
 .../resources/org/drools/verifier/FindPatterns.drl |  27 ++---
 .../test/resources/org/drools/verifier/Misc.drl    |  27 ++---
 .../test/resources/org/drools/verifier/Misc2.drl   |  27 ++---
 .../test/resources/org/drools/verifier/Misc3.drl   |  27 ++---
 .../org/drools/verifier/MissingRangesForDates.drl  |  27 ++---
 .../drools/verifier/MissingRangesForDoubles.drl    |  27 ++---
 .../org/drools/verifier/MissingRangesForInts.drl   |  27 ++---
 .../drools/verifier/MissingRangesForVariables.drl  |  27 ++---
 .../test/resources/org/drools/verifier/Overlap.drl |  27 ++---
 .../resources/org/drools/verifier/RangeTest.drl    |  27 ++---
 .../org/drools/verifier/VerifyingScope.drl         |  27 ++---
 .../verifier/alwaysFalse/AlwaysFalseTest.drl       |  27 ++---
 .../verifier/consequence/ConsequenceTest.drl       |  27 ++---
 .../verifier/consequence/ConsequenceTest2.drl      |  27 ++---
 .../resources/org/drools/verifier/doc/simple.drl   |  27 ++---
 .../verifier/equivalence/EquivalentRules.drl       |  27 ++---
 .../test/resources/org/drools/verifier/imports.drl |  27 ++---
 .../org/drools/verifier/importsAndDeclarations.drl |  27 ++---
 .../drools/verifier/incoherence/PatternsTest.drl   |  27 ++---
 .../verifier/incoherence/RestrictionsTest.drl      |  27 ++---
 .../drools/verifier/misc/DrlPackageTestData.drl    |  27 ++---
 .../missingEquality/MissingEqualityTest.drl        |  27 ++---
 .../optimisation/OptimisationPatternOrderTest.drl  |  27 ++---
 .../OptimisationRestrictionOrderTest.drl           |  27 ++---
 .../drools/verifier/overlaps/RestrictionsTest.drl  |  27 ++---
 .../redundancy/ConsequenceRedundancyTest.drl       |  27 ++---
 .../verifier/redundancy/PatternRedundancyTest.drl  |  27 ++---
 .../RedundancyLiteralRestrictionTest.drl           |  27 ++---
 .../verifier/redundancy/RedundantRestrictions.drl  |  27 ++---
 .../drools/verifier/redundancy/RedundantRules1.drl |  27 ++---
 .../SubsumptionVariableRestrictionTest.drl         |  27 ++---
 .../drools/verifier/report/components/Causes.drl   |  27 ++---
 .../subsumption/SubsumptantRestriction1.drl        |  27 ++---
 .../subsumption/SubsumptantRestriction2.drl        |  27 ++---
 .../subsumption/SubsumptantRestriction3.drl        |  27 ++---
 .../subsumption/SubsumptantRestriction4.drl        |  27 ++---
 .../subsumption/SubsumptantSubPatterns1.drl        |  27 ++---
 .../subsumption/SubsumptantSubPatterns2.drl        |  27 ++---
 .../subsumption/SubsumptantSubPatterns3.drl        |  27 ++---
 .../subsumption/SubsumptantSubPatterns4.drl        |  27 ++---
 .../subsumption/SubsumptantSubPatterns5.drl        |  27 ++---
 .../verifier/subsumption/SubsumptantSubRules1.drl  |  27 ++---
 .../verifier/visitor/ExprConstraintDescr1.drl      |  28 ++---
 .../verifier/visitor/ExprConstraintDescr2.drl      |  28 ++---
 .../verifier/visitor/ExprConstraintDescr3.drl      |  28 ++---
 .../org/drools/verifier/visitor/NestedPatterns.drl |  27 ++---
 .../verifier/visitor/PatternDescrVisitorTest.drl   |  28 ++---
 .../verifier/visitor/PatternDescrVisitorTest2.drl  |  28 ++---
 .../org/drools/verifier/visitor/SubPattern.drl     |  27 ++---
 .../src/main/resources/rules.drl                   |  24 +++--
 .../src/main/resources/rules.drl                   |  24 +++--
 .../src/main/resources/rules.drl.yaml              |  24 +++--
 .../test/resources/builder/simple_query_test.drl   |  28 ++---
 kie-ci/src/test/resources/builder/test/empty.drl   |  28 ++---
 .../test/resources/builder/test/literal_rule.drl   |  28 ++---
 .../org/kie/dmn/core/0001-input-data-item-def.dmn  |  25 +++--
 ...001-input-data-string-artificial-attributes.dmn |  25 +++--
 .../kie/dmn/core/0001-input-data-string-itIT.dmn   |  25 +++--
 .../org/kie/dmn/core/0001-input-data-string.dmn    |  25 +++--
 .../org/kie/dmn/core/0002-input-data-number.dmn    |  25 +++--
 .../core/0003-input-data-string-allowed-values.dmn |  25 +++--
 .../kie/dmn/core/0004-simpletable-A-non-equal.dmn  |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-A.dmn        |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-C-count.dmn  |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-C-max.dmn    |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-C-min.dmn    |  38 +++----
 .../0004-simpletable-C-sum-multiple-outputs.dmn    |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-C-sum.dmn    |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-C.dmn        |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-F.dmn        |  38 +++----
 .../core/0004-simpletable-O-multiple-outputs.dmn   |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-O.dmn        |  38 +++----
 ...simpletable-P-multiple-outputs-wrong-output.dmn |  38 +++----
 .../core/0004-simpletable-P-multiple-outputs.dmn   |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-P.dmn        |  38 +++----
 .../org/kie/dmn/core/0004-simpletable-R.dmn        |  38 +++----
 .../kie/dmn/core/DTABLE_PRIORITY_ONE_OUTVAL.dmn    |  38 +++----
 .../org/kie/dmn/core/FunctionDefinition.dmn        |  25 +++--
 .../resources/org/kie/dmn/core/InvalidInput.dmn    |  25 +++--
 .../test/resources/org/kie/dmn/core/Recursive.dmn  |  25 +++--
 .../alphanetwork/an-simpletable-multipletests.dmn  |  38 +++----
 .../dmn/core/alternative_feel_ns_declaration.dmn   |  25 +++--
 .../business-knowledge-model-required-input.dmn    |  25 +++--
 .../org/kie/dmn/core/compilationThrowsNPE.dmn      |  25 +++--
 .../0001-input-data-string-with-extensions.dmn     |  25 +++--
 .../kie/dmn/core/decisiontable-default-value.dmn   |  38 +++----
 .../dmn/core/duplicate.0001-input-data-string.dmn  |  25 +++--
 .../org/kie/dmn/core/invalid-variable-names.dmn    |  25 +++--
 .../resources/org/kie/dmn/core/list-expression.dmn |  25 +++--
 .../resources/org/kie/dmn/core/null_values.dmn     |  25 +++--
 .../org/kie/dmn/core/out-of-order-items.dmn        |  25 +++--
 .../core/questionmarkunarytest/qmarkAsString.dmn   |  25 +++--
 .../core/questionmarkunarytest/qmarkAsString2.dmn  |  25 +++--
 .../core/questionmarkunarytest/qmarkAsString3.dmn  |  25 +++--
 .../qmarkInNonBooleanFunction.dmn                  |  25 +++--
 .../questionmarkunarytest/qmarkInWithUnaryTest.dmn |  25 +++--
 .../core/questionmarkunarytest/qmarkInstanceOf.dmn |  25 +++--
 .../core/questionmarkunarytest/qmarkMultivalue.dmn |  25 +++--
 .../qmarkMultivalueWithBrackets.dmn                |  25 +++--
 .../questionmarkunarytest/qmarkVsQmarkString.dmn   |  25 +++--
 .../core/questionmarkunarytest/qmarkWithAnd.dmn    |  25 +++--
 .../questionmarkunarytest/qmarkWithForExpr.dmn     |  25 +++--
 .../questionmarkunarytest/qmarkWithFuncDef.dmn     |  25 +++--
 .../core/questionmarkunarytest/qmarkWithNot.dmn    |  25 +++--
 .../qmarkWithQuantifiedExpr.dmn                    |  25 +++--
 .../core/questionmarkunarytest/qmarkWithRange.dmn  |  25 +++--
 .../dmn/core/questionmarkunarytest/qmarkonly.dmn   |  25 +++--
 .../org/kie/dmn/core/relation-expression.dmn       |  25 +++--
 .../resources/org/kie/dmn/core/simple-item-def.dmn |  25 +++--
 .../kie/dmn/core/variableLeadingTrailingSpaces.dmn |  25 +++--
 .../tests/core/v1_1/0001-input-data-item-def.dmn   |  25 +++--
 ...001-input-data-string-artificial-attributes.dmn |  25 +++--
 .../core/v1_1/0001-input-data-string-itIT.dmn      |  25 +++--
 .../tests/core/v1_1/0001-input-data-string.dmn     |  25 +++--
 .../tests/core/v1_1/0002-input-data-number.dmn     |  25 +++--
 .../v1_1/0003-input-data-string-allowed-values.dmn |  25 +++--
 .../core/v1_1/0004-simpletable-A-non-equal.dmn     |  25 +++--
 .../legacy/tests/core/v1_1/0004-simpletable-A.dmn  |  25 +++--
 .../tests/core/v1_1/0004-simpletable-C-count.dmn   |  25 +++--
 .../tests/core/v1_1/0004-simpletable-C-max.dmn     |  25 +++--
 .../tests/core/v1_1/0004-simpletable-C-min.dmn     |  25 +++--
 .../0004-simpletable-C-sum-multiple-outputs.dmn    |  25 +++--
 .../tests/core/v1_1/0004-simpletable-C-sum.dmn     |  25 +++--
 .../legacy/tests/core/v1_1/0004-simpletable-C.dmn  |  25 +++--
 .../legacy/tests/core/v1_1/0004-simpletable-F.dmn  |  25 +++--
 .../v1_1/0004-simpletable-O-multiple-outputs.dmn   |  25 +++--
 .../legacy/tests/core/v1_1/0004-simpletable-O.dmn  |  25 +++--
 ...simpletable-P-multiple-outputs-wrong-output.dmn |  25 +++--
 .../v1_1/0004-simpletable-P-multiple-outputs.dmn   |  25 +++--
 .../legacy/tests/core/v1_1/0004-simpletable-P.dmn  |  25 +++--
 .../legacy/tests/core/v1_1/0004-simpletable-R.dmn  |  25 +++--
 .../tests/core/v1_1/DTABLE_PRIORITY_ONE_OUTVAL.dmn |  25 +++--
 .../legacy/tests/core/v1_1/FunctionDefinition.dmn  |  25 +++--
 .../dmn/legacy/tests/core/v1_1/InvalidInput.dmn    |  25 +++--
 .../kie/dmn/legacy/tests/core/v1_1/Recursive.dmn   |  25 +++--
 .../core/v1_1/alternative_feel_ns_declaration.dmn  |  25 +++--
 .../business-knowledge-model-required-input.dmn    |  25 +++--
 .../tests/core/v1_1/compilationThrowsNPE.dmn       |  25 +++--
 .../0001-input-data-string-with-extensions.dmn     |  25 +++--
 .../core/v1_1/decisiontable-default-value.dmn      |  25 +++--
 .../core/v1_1/duplicate.0001-input-data-string.dmn |  25 +++--
 .../tests/core/v1_1/invalid-variable-names.dmn     |  25 +++--
 .../dmn/legacy/tests/core/v1_1/list-expression.dmn |  25 +++--
 .../kie/dmn/legacy/tests/core/v1_1/null_values.dmn |  25 +++--
 .../legacy/tests/core/v1_1/out-of-order-items.dmn  |  25 +++--
 .../legacy/tests/core/v1_1/relation-expression.dmn |  25 +++--
 .../dmn/legacy/tests/core/v1_1/simple-item-def.dmn |  25 +++--
 .../core/v1_1/variableLeadingTrailingSpaces.dmn    |  25 +++--
 .../tests/validation/v1_1/DRGELEM_NOT_UNIQUE.dmn   |  25 +++--
 .../legacy/tests/validation/v1_1/DROOLS-1447.dmn   |  25 +++--
 .../validation/v1_1/FORMAL_PARAM_DUPLICATED.dmn    |  25 +++--
 .../v1_1/INVOCATION_INCONSISTENT_PARAM_NAMES.dmn   | 104 +++++++++---------
 .../validation/v1_1/INVOCATION_MISSING_EXPR.dmn    |  98 ++++++++---------
 .../validation/v1_1/INVOCATION_MISSING_TARGET.dmn  | 104 +++++++++---------
 .../v1_1/INVOCATION_MISSING_TARGETbis.dmn          | 104 +++++++++---------
 .../v1_1/INVOCATION_WRONG_PARAM_COUNT.dmn          | 116 +++++++++++----------
 .../tests/validation/v1_1/ITEMCOMP_DUPLICATED.dmn  |  25 +++--
 .../tests/validation/v1_1/ITEMDEF_NOT_UNIQUE.dmn   |  25 +++--
 .../v1_1/ITEMDEF_NOT_UNIQUE_DROOLS-1450.dmn        |  25 +++--
 .../legacy/tests/validation/v1_1/NAME_IS_VALID.dmn |  25 +++--
 .../tests/validation/v1_1/RELATION_DUP_COLUMN.dmn  | 110 +++++++++----------
 .../v1_1/RELATION_ROW_CELLCOUNTMISMATCH.dmn        | 106 ++++++++++---------
 .../v1_1/RELATION_ROW_CELL_NOTLITERAL.dmn          | 106 ++++++++++---------
 .../tests/validation/v1_1/UNKNOWN_VARIABLE.dmn     |  25 +++--
 .../v1_1/VARIABLE_LEADING_TRAILING_SPACES.dmn      |  25 +++--
 .../v1_1/artifact/ASSOC_REFERENCES_NOT_EMPTY.dmn   |  25 +++--
 .../AUTHREQ_DEP_REQ_DEC_NOT_DECISION.dmn           |  25 +++--
 .../AUTHREQ_DEP_REQ_INPUT_NOT_INPUT.dmn            |  25 +++--
 .../AUTHREQ_MISSING_DEPENDENCY_REQ_AUTH.dmn        |  25 +++--
 .../AUTHREQ_MISSING_DEPENDENCY_REQ_DEC.dmn         |  25 +++--
 .../AUTHREQ_MISSING_DEPENDENCY_REQ_INPUT.dmn       |  25 +++--
 .../ORG_UNIT_DECISION_MADE_WRONG_TYPE.dmn          |  25 +++--
 .../ORG_UNIT_DECISION_OWNED_WRONG_TYPE.dmn         |  25 +++--
 .../PERF_INDICATOR_IMP_DECISION_WRONG_TYPE.dmn     |  25 +++--
 .../businessknowledgemodel/BKM_MISMATCH_VAR.dmn    |  25 +++--
 .../businessknowledgemodel/BKM_MISSING_EXPR.dmn    |  25 +++--
 .../businessknowledgemodel/BKM_MISSING_VAR.dmn     |  25 +++--
 .../validation/v1_1/context/CONTEXT_DUP_ENTRY.dmn  |  25 +++--
 .../context/CONTEXT_ENTRY_MISSING_VARIABLE.dmn     |  25 +++--
 .../v1_1/context/CONTEXT_ENTRY_NOTYPEREF.dmn       |  25 +++--
 .../v1_1/context/CONTEXT_MISSING_ENTRIES.dmn       |  25 +++--
 .../v1_1/context/CONTEXT_MISSING_EXPR.dmn          |  25 +++--
 .../v1_1/decision/DECISION_CYCLIC_DEPENDENCY.dmn   |  25 +++--
 .../DECISION_CYCLIC_DEPENDENCY_SELF_REFERENCE.dmn  |  25 +++--
 .../v1_1/decision/DECISION_DEADLY_DIAMOND.dmn      |  25 +++--
 .../v1_1/decision/DECISION_DEADLY_KITE.dmn         |  25 +++--
 .../DECISION_DECISION_MAKER_WRONG_TYPE.dmn         |  25 +++--
 .../DECISION_DECISION_OWNER_WRONG_TYPE.dmn         |  25 +++--
 .../v1_1/decision/DECISION_MISMATCH_VAR.dmn        |  25 +++--
 .../v1_1/decision/DECISION_MISSING_EXPR.dmn        |  25 +++--
 .../v1_1/decision/DECISION_MISSING_VAR.dmn         |  25 +++--
 .../v1_1/decision/DECISION_MISSING_VARbis.dmn      |  25 +++--
 .../decision/DECISION_MULTIPLE_EXPRESSIONS.dmn     |  25 +++--
 .../DECISION_PERF_INDICATOR_WRONG_TYPE.dmn         |  25 +++--
 .../INFOREQ_DECISION_NOT_DECISION.dmn              |  25 +++--
 .../INFOREQ_INPUT_NOT_INPUTDATA.dmn                |  25 +++--
 .../INFOREQ_MISSING_DECISION.dmn                   |  25 +++--
 .../INFOREQ_MISSING_INPUT.dmn                      |  25 +++--
 .../v1_1/inputdata/INPUTDATA_MISMATCH_VAR.dmn      |  25 +++--
 .../v1_1/inputdata/INPUTDATA_MISSING_VAR.dmn       |  25 +++--
 .../legacy/tests/validation/v1_1/invalidXml.dmn    |  25 +++--
 .../knowledgerequirement/KNOWREQ_MISSING_BKM.dmn   |  25 +++--
 .../KNOWREQ_REQ_DECISION_NOT_BKM.dmn               |  25 +++--
 .../knowledgesource/KNOW_SOURCE_MISSING_OWNER.dmn  |  25 +++--
 .../KNOW_SOURCE_OWNER_NOT_ORG_UNIT.dmn             |  25 +++--
 .../v1_1/typeref/TYPEREF_NOT_FEEL_NOT_DEF.dmn      |  25 +++--
 .../typeref/TYPEREF_NOT_FEEL_NOT_DEF_valid.dmn     |  25 +++--
 .../v1_1/typeref/TYPEREF_NO_FEEL_TYPE.dmn          |  25 +++--
 .../validation/v1_1/typeref/TYPEREF_NO_NS.dmn      |  25 +++--
 .../DMNv1_1/dmn-validation-rules-typeref.drl       |  28 ++---
 .../DMNv1_2/dmn-validation-rules-dmndi.drl         |  28 ++---
 .../DMNv1_2/dmn-validation-rules-typeref.drl       |  28 ++---
 .../DMNv1x/dmn-validation-rules-auth-req.drl       |  28 ++---
 .../validation/DMNv1x/dmn-validation-rules-bkm.drl |  28 ++---
 .../dmn-validation-rules-business-context.drl      |  28 ++---
 .../DMNv1x/dmn-validation-rules-context.drl        |  28 ++---
 .../DMNv1x/dmn-validation-rules-decision.drl       |  28 ++---
 .../dmn-validation-rules-decisionservice.drl       |  28 ++---
 .../DMNv1x/dmn-validation-rules-dmnelementref.drl  |  28 ++---
 .../DMNv1x/dmn-validation-rules-dtable.drl         |  28 ++---
 .../DMNv1x/dmn-validation-rules-info-req.drl       |  28 ++---
 .../DMNv1x/dmn-validation-rules-inputdata.drl      |  28 ++---
 .../DMNv1x/dmn-validation-rules-know-req.drl       |  28 ++---
 .../DMNv1x/dmn-validation-rules-know-source.drl    |  28 ++---
 .../dmn/validation/DMNv1x/dmn-validation-rules.drl |  28 ++---
 .../org/kie/dmn/validation/DRGELEM_NOT_UNIQUE.dmn  |  25 +++--
 .../org/kie/dmn/validation/DROOLS-1447.dmn         |  25 +++--
 .../kie/dmn/validation/FORMAL_PARAM_DUPLICATED.dmn |  25 +++--
 .../INVOCATION_INCONSISTENT_PARAM_NAMES.dmn        |  25 +++--
 .../kie/dmn/validation/INVOCATION_MISSING_EXPR.dmn |  25 +++--
 .../dmn/validation/INVOCATION_MISSING_TARGET.dmn   |  25 +++--
 .../validation/INVOCATION_MISSING_TARGETbis.dmn    |  25 +++--
 .../validation/INVOCATION_WRONG_PARAM_COUNT.dmn    |  25 +++--
 .../org/kie/dmn/validation/ITEMCOMP_DUPLICATED.dmn |  25 +++--
 .../org/kie/dmn/validation/ITEMDEF_NOT_UNIQUE.dmn  |  25 +++--
 .../validation/ITEMDEF_NOT_UNIQUE_DROOLS-1450.dmn  |  25 +++--
 .../org/kie/dmn/validation/NAME_IS_VALID.dmn       |  25 +++--
 .../org/kie/dmn/validation/RELATION_DUP_COLUMN.dmn |  25 +++--
 .../validation/RELATION_ROW_CELLCOUNTMISMATCH.dmn  |  25 +++--
 .../validation/RELATION_ROW_CELL_NOTLITERAL.dmn    |  25 +++--
 .../org/kie/dmn/validation/UNKNOWN_VARIABLE.dmn    |  25 +++--
 .../VARIABLE_LEADING_TRAILING_SPACES.dmn           |  25 +++--
 .../artifact/ASSOC_REFERENCES_NOT_EMPTY.dmn        |  25 +++--
 .../AUTHREQ_DEP_REQ_DEC_NOT_DECISION.dmn           |  25 +++--
 .../AUTHREQ_DEP_REQ_INPUT_NOT_INPUT.dmn            |  25 +++--
 .../AUTHREQ_MISSING_DEPENDENCY_REQ_AUTH.dmn        |  25 +++--
 .../AUTHREQ_MISSING_DEPENDENCY_REQ_DEC.dmn         |  25 +++--
 .../AUTHREQ_MISSING_DEPENDENCY_REQ_INPUT.dmn       |  25 +++--
 .../ORG_UNIT_DECISION_MADE_WRONG_TYPE.dmn          |  25 +++--
 .../ORG_UNIT_DECISION_OWNED_WRONG_TYPE.dmn         |  25 +++--
 .../PERF_INDICATOR_IMP_DECISION_WRONG_TYPE.dmn     |  25 +++--
 .../businessknowledgemodel/BKM_MISMATCH_VAR.dmn    |  25 +++--
 .../businessknowledgemodel/BKM_MISSING_EXPR.dmn    |  25 +++--
 .../businessknowledgemodel/BKM_MISSING_VAR.dmn     |  25 +++--
 .../dmn/validation/context/CONTEXT_DUP_ENTRY.dmn   |  25 +++--
 .../context/CONTEXT_ENTRY_MISSING_VARIABLE.dmn     |  25 +++--
 .../validation/context/CONTEXT_ENTRY_NOTYPEREF.dmn |  25 +++--
 .../validation/context/CONTEXT_MISSING_ENTRIES.dmn |  25 +++--
 .../validation/context/CONTEXT_MISSING_EXPR.dmn    |  25 +++--
 .../decision/DECISION_CYCLIC_DEPENDENCY.dmn        |  25 +++--
 .../DECISION_CYCLIC_DEPENDENCY_SELF_REFERENCE.dmn  |  25 +++--
 .../decision/DECISION_DEADLY_DIAMOND.dmn           |  25 +++--
 .../validation/decision/DECISION_DEADLY_KITE.dmn   |  25 +++--
 .../DECISION_DECISION_MAKER_WRONG_TYPE.dmn         |  25 +++--
 .../DECISION_DECISION_OWNER_WRONG_TYPE.dmn         |  25 +++--
 .../validation/decision/DECISION_MISMATCH_VAR.dmn  |  25 +++--
 .../validation/decision/DECISION_MISSING_EXPR.dmn  |  25 +++--
 .../validation/decision/DECISION_MISSING_REQ.dmn   |  25 +++--
 .../validation/decision/DECISION_MISSING_VAR.dmn   |  25 +++--
 .../decision/DECISION_MISSING_VARbis.dmn           |  25 +++--
 .../decision/DECISION_MULTIPLE_EXPRESSIONS.dmn     |  25 +++--
 .../DECISION_PERF_INDICATOR_WRONG_TYPE.dmn         |  25 +++--
 .../INFOREQ_DECISION_NOT_DECISION.dmn              |  25 +++--
 .../INFOREQ_INPUT_NOT_INPUTDATA.dmn                |  25 +++--
 .../INFOREQ_MISSING_DECISION.dmn                   |  25 +++--
 .../INFOREQ_MISSING_INPUT.dmn                      |  25 +++--
 .../inputdata/INPUTDATA_MISMATCH_VAR.dmn           |  25 +++--
 .../validation/inputdata/INPUTDATA_MISSING_VAR.dmn |  25 +++--
 .../org/kie/dmn/validation/invalidXml.dmn          |  25 +++--
 .../knowledgerequirement/KNOWREQ_MISSING_BKM.dmn   |  25 +++--
 .../KNOWREQ_REQ_DECISION_NOT_BKM.dmn               |  25 +++--
 .../knowledgesource/KNOW_SOURCE_MISSING_OWNER.dmn  |  25 +++--
 .../KNOW_SOURCE_OWNER_NOT_ORG_UNIT.dmn             |  25 +++--
 .../typeref/TYPEREF_NOT_FEEL_NOT_DEF.dmn           |  25 +++--
 .../typeref/TYPEREF_NOT_FEEL_NOT_DEF_valid.dmn     |  25 +++--
 .../validation/typeref/TYPEREF_NO_FEEL_TYPE.dmn    |  25 +++--
 .../kie/dmn/validation/typeref/TYPEREF_NO_NS.dmn   |  25 +++--
 .../drools/model/project/codegen/pkg1/file1.drl    |  25 +++--
 .../drools/model/project/codegen/pkg1/file2.drl    |  25 +++--
 .../drools/model/project/codegen/pkg2/file3.drl    |  25 +++--
 .../org/drools/ruleunit/example/RuleUnitQuery.drl  |  25 +++--
 .../drools/model/project/codegen/pkg1/file1.drl    |  25 +++--
 .../drools/model/project/codegen/pkg1/file2.drl    |  25 +++--
 .../drools/model/project/codegen/pkg2/file3.drl    |  25 +++--
 .../org/drools/ruleunit/example/RuleUnitQuery.drl  |  25 +++--
 .../drools/model/project/codegen/pkg1/file1.drl    |  25 +++--
 .../drools/model/project/codegen/pkg1/file2.drl    |  25 +++--
 .../drools/model/project/codegen/pkg2/file3.drl    |  25 +++--
 .../src/main/resources/org/simplekjar/rules.drl    |  28 ++---
 .../src/main/resources/org/simplekjar/rules.drl    |  28 ++---
 .../src/main/resources/org/simplekjar/rules.drl    |  28 ++---
 .../src/main/resources/org/simplekjar/rules.drl    |  28 ++---
 .../resources/org/compiledalphanetwork/rules.drl   |  28 ++---
 .../org/drools/ruleunit/example/RuleUnitQuery.drl  |  25 +++--
 .../main/resources/AllResourceTypes/simple-dmn.dmn |  25 +++--
 .../resources/AllResourceTypes/simple-rules.drl    |  28 ++---
 .../src/main/resources/simple-dmn.dmn              |  25 +++--
 .../src/main/resources/simple-dmn.dmn              |  25 +++--
 .../src/main/resources/org/declaredtype/decB.drl   |  28 ++---
 .../src/main/resources/org/declaredtype/rules.drl  |  28 ++---
 .../src/main/resources/org/declaredtype/decB.drl   |  28 ++---
 .../src/main/resources/org/declaredtype/rules.drl  |  28 ++---
 972 files changed, 15219 insertions(+), 11992 deletions(-)

diff --git a/drools-compiler/src/test/resources/com/sample/from.drl b/drools-compiler/src/test/resources/com/sample/from.drl
index 3a75b2724d..a7b2490afe 100644
--- a/drools-compiler/src/test/resources/com/sample/from.drl
+++ b/drools-compiler/src/test/resources/com/sample/from.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package com.sample
  
diff --git a/drools-compiler/src/test/resources/com/sample/reference.drl b/drools-compiler/src/test/resources/com/sample/reference.drl
index 187f7e2501..5a7603f64f 100644
--- a/drools-compiler/src/test/resources/com/sample/reference.drl
+++ b/drools-compiler/src/test/resources/com/sample/reference.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package com.sample
  
diff --git a/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/cep-lifecycle.drl b/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/cep-lifecycle.drl
index fbaaa94501..dcb35be442 100644
--- a/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/cep-lifecycle.drl
+++ b/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/cep-lifecycle.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.jboss.qa.brms.persistence
 
diff --git a/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/lifecycle.drl b/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/lifecycle.drl
index 25c2c6a1a4..341a2684c7 100644
--- a/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/lifecycle.drl
+++ b/drools-compiler/src/test/resources/org/jboss/qa/brms/persistence/lifecycle.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.jboss.qa.brms.persistence
 
diff --git a/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset1Test.drl b/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset1Test.drl
index 5620113e15..214d04f7fc 100644
--- a/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset1Test.drl
+++ b/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset1Test.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.kie.test
 
diff --git a/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset2Test.drl b/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset2Test.drl
index d7711d1cfe..512277ab1b 100644
--- a/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset2Test.drl
+++ b/drools-decisiontables/src/test/resources/org/drools/decisiontable/changeset2Test.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.kie.test
 
diff --git a/drools-decisiontables/src/test/resources/templates/test_integration.drl b/drools-decisiontables/src/test/resources/templates/test_integration.drl
index 22685e06b8..7dd7c3d5f9 100644
--- a/drools-decisiontables/src/test/resources/templates/test_integration.drl
+++ b/drools-decisiontables/src/test/resources/templates/test_integration.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 age: Long
diff --git a/drools-decisiontables/src/test/resources/templates/test_pricing1.drl b/drools-decisiontables/src/test/resources/templates/test_pricing1.drl
index 294a8ba2db..c5ec51eecc 100644
--- a/drools-decisiontables/src/test/resources/templates/test_pricing1.drl
+++ b/drools-decisiontables/src/test/resources/templates/test_pricing1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 age[]
diff --git a/drools-decisiontables/src/test/resources/templates/test_pricing2.drl b/drools-decisiontables/src/test/resources/templates/test_pricing2.drl
index 5325d7272a..79f025e8dd 100644
--- a/drools-decisiontables/src/test/resources/templates/test_pricing2.drl
+++ b/drools-decisiontables/src/test/resources/templates/test_pricing2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 age[]
diff --git a/drools-decisiontables/src/test/resources/templates/test_template1.drl b/drools-decisiontables/src/test/resources/templates/test_template1.drl
index 0166a9e367..ace712e5ed 100644
--- a/drools-decisiontables/src/test/resources/templates/test_template1.drl
+++ b/drools-decisiontables/src/test/resources/templates/test_template1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 name
diff --git a/drools-decisiontables/src/test/resources/templates/test_template2.drl b/drools-decisiontables/src/test/resources/templates/test_template2.drl
index 030d734387..45e57726e4 100644
--- a/drools-decisiontables/src/test/resources/templates/test_template2.drl
+++ b/drools-decisiontables/src/test/resources/templates/test_template2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 colour
diff --git a/drools-decisiontables/src/test/resources/templates/test_template3.drl b/drools-decisiontables/src/test/resources/templates/test_template3.drl
index c30dc03a06..85be44708b 100644
--- a/drools-decisiontables/src/test/resources/templates/test_template3.drl
+++ b/drools-decisiontables/src/test/resources/templates/test_template3.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 colour
diff --git a/drools-decisiontables/src/test/resources/templates/test_template4.drl b/drools-decisiontables/src/test/resources/templates/test_template4.drl
index 8b6239e285..8e9275fa28 100644
--- a/drools-decisiontables/src/test/resources/templates/test_template4.drl
+++ b/drools-decisiontables/src/test/resources/templates/test_template4.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 colour
diff --git a/drools-examples-api/default-kiesession/src/main/resources/defaultkiesession/Hal1.drl b/drools-examples-api/default-kiesession/src/main/resources/defaultkiesession/Hal1.drl
index 93bde32ad5..7f7ac4b834 100644
--- a/drools-examples-api/default-kiesession/src/main/resources/defaultkiesession/Hal1.drl
+++ b/drools-examples-api/default-kiesession/src/main/resources/defaultkiesession/Hal1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.example.api.defaultkiesession
 
diff --git a/drools-examples-api/kiebase-inclusion/src/main/resources/kiebaseinclusion/Hal2.drl b/drools-examples-api/kiebase-inclusion/src/main/resources/kiebaseinclusion/Hal2.drl
index c0e326e14d..a7a3d6ffa8 100644
--- a/drools-examples-api/kiebase-inclusion/src/main/resources/kiebaseinclusion/Hal2.drl
+++ b/drools-examples-api/kiebase-inclusion/src/main/resources/kiebaseinclusion/Hal2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.example.api.kiebaseinclusion
 
diff --git a/drools-examples-api/multiple-kbases/src/main/resources/org/other/pkg/rule3.drl b/drools-examples-api/multiple-kbases/src/main/resources/org/other/pkg/rule3.drl
index f32d933e82..4ac0983e2f 100644
--- a/drools-examples-api/multiple-kbases/src/main/resources/org/other/pkg/rule3.drl
+++ b/drools-examples-api/multiple-kbases/src/main/resources/org/other/pkg/rule3.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 global java.util.List list
 
diff --git a/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg/rule1.drl b/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg/rule1.drl
index fb837f00aa..4855742150 100644
--- a/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg/rule1.drl
+++ b/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg/rule1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 global java.util.List list
 
diff --git a/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg2/rule2.drl b/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg2/rule2.drl
index 137ad3cde8..c17e71382d 100644
--- a/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg2/rule2.drl
+++ b/drools-examples-api/multiple-kbases/src/main/resources/org/some/pkg2/rule2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 global java.util.List list
 
diff --git a/drools-examples-api/multiple-kbases/src/main/resources/rule0.drl b/drools-examples-api/multiple-kbases/src/main/resources/rule0.drl
index 8fc96b9791..ee38e57cd5 100644
--- a/drools-examples-api/multiple-kbases/src/main/resources/rule0.drl
+++ b/drools-examples-api/multiple-kbases/src/main/resources/rule0.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 global java.util.List list
 
diff --git a/drools-examples-api/named-kiesession/src/main/resources/namedkiesession/Hal1.drl b/drools-examples-api/named-kiesession/src/main/resources/namedkiesession/Hal1.drl
index 1bfa01fc6b..369a0491cf 100644
--- a/drools-examples-api/named-kiesession/src/main/resources/namedkiesession/Hal1.drl
+++ b/drools-examples-api/named-kiesession/src/main/resources/namedkiesession/Hal1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.example.api.namedkiesession
 
diff --git a/drools-examples-api/reactive-kiesession/src/main/resources/reactivekiesession/reactive.drl b/drools-examples-api/reactive-kiesession/src/main/resources/reactivekiesession/reactive.drl
index c6f62a9c61..c7634054db 100644
--- a/drools-examples-api/reactive-kiesession/src/main/resources/reactivekiesession/reactive.drl
+++ b/drools-examples-api/reactive-kiesession/src/main/resources/reactivekiesession/reactive.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.example.api.reactivekiesession
 
diff --git a/drools-examples/src/main/resources/org/drools/benchmark/waltz/waltz.drl b/drools-examples/src/main/resources/org/drools/benchmark/waltz/waltz.drl
index 5f9b51a296..cba91986d6 100644
--- a/drools-examples/src/main/resources/org/drools/benchmark/waltz/waltz.drl
+++ b/drools-examples/src/main/resources/org/drools/benchmark/waltz/waltz.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 //created on: 25/03/2006
diff --git a/drools-examples/src/main/resources/org/drools/benchmark/waltzdb/waltzdb.drl b/drools-examples/src/main/resources/org/drools/benchmark/waltzdb/waltzdb.drl
index b158db95bc..f444323fed 100644
--- a/drools-examples/src/main/resources/org/drools/benchmark/waltzdb/waltzdb.drl
+++ b/drools-examples/src/main/resources/org/drools/benchmark/waltzdb/waltzdb.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 //created on: 02/11/2006
diff --git a/drools-examples/src/main/resources/org/drools/examples/backwardchaining/BC-Example.drl b/drools-examples/src/main/resources/org/drools/examples/backwardchaining/BC-Example.drl
index f8e7c5c207..4b49e31fda 100644
--- a/drools-examples/src/main/resources/org/drools/examples/backwardchaining/BC-Example.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/backwardchaining/BC-Example.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.backwardchaining;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/banking/Example1.drl b/drools-examples/src/main/resources/org/drools/examples/banking/Example1.drl
index 9c4ae93ed4..4f7ed5858e 100644
--- a/drools-examples/src/main/resources/org/drools/examples/banking/Example1.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/banking/Example1.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.banking
diff --git a/drools-examples/src/main/resources/org/drools/examples/banking/Example2.drl b/drools-examples/src/main/resources/org/drools/examples/banking/Example2.drl
index 43e51046ed..6cde237702 100644
--- a/drools-examples/src/main/resources/org/drools/examples/banking/Example2.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/banking/Example2.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.banking
diff --git a/drools-examples/src/main/resources/org/drools/examples/banking/Example3.drl b/drools-examples/src/main/resources/org/drools/examples/banking/Example3.drl
index fb84446b87..32382b83f8 100644
--- a/drools-examples/src/main/resources/org/drools/examples/banking/Example3.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/banking/Example3.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.banking
diff --git a/drools-examples/src/main/resources/org/drools/examples/banking/Example4.drl b/drools-examples/src/main/resources/org/drools/examples/banking/Example4.drl
index 7a9a7b5eaf..6399456e91 100644
--- a/drools-examples/src/main/resources/org/drools/examples/banking/Example4.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/banking/Example4.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.banking
diff --git a/drools-examples/src/main/resources/org/drools/examples/banking/Example5.drl b/drools-examples/src/main/resources/org/drools/examples/banking/Example5.drl
index fec165f645..2beb85e0d8 100644
--- a/drools-examples/src/main/resources/org/drools/examples/banking/Example5.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/banking/Example5.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.banking
diff --git a/drools-examples/src/main/resources/org/drools/examples/banking/Example6.drl b/drools-examples/src/main/resources/org/drools/examples/banking/Example6.drl
index 28d4e403bd..164dd6afbe 100644
--- a/drools-examples/src/main/resources/org/drools/examples/banking/Example6.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/banking/Example6.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.banking
diff --git a/drools-examples/src/main/resources/org/drools/examples/birdsfly/fly.drl b/drools-examples/src/main/resources/org/drools/examples/birdsfly/fly.drl
index 6625524511..3dfe45153c 100644
--- a/drools-examples/src/main/resources/org/drools/examples/birdsfly/fly.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/birdsfly/fly.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.birdsfly;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/buspass/bad/BusPassBad.drl b/drools-examples/src/main/resources/org/drools/examples/buspass/bad/BusPassBad.drl
index 7915670cb6..5b6f74d09b 100644
--- a/drools-examples/src/main/resources/org/drools/examples/buspass/bad/BusPassBad.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/buspass/bad/BusPassBad.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.buspass.bad;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/buspass/good/BusPassGood.drl b/drools-examples/src/main/resources/org/drools/examples/buspass/good/BusPassGood.drl
index 581b934a82..e13e62b951 100644
--- a/drools-examples/src/main/resources/org/drools/examples/buspass/good/BusPassGood.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/buspass/good/BusPassGood.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.buspass.good;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/buspass/good/Policy.drl b/drools-examples/src/main/resources/org/drools/examples/buspass/good/Policy.drl
index 618f0af953..f202664080 100644
--- a/drools-examples/src/main/resources/org/drools/examples/buspass/good/Policy.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/buspass/good/Policy.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.buspass.good;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/BusPassJTMS.drl b/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/BusPassJTMS.drl
index 5c9669e4c3..ab97cba4fc 100644
--- a/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/BusPassJTMS.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/BusPassJTMS.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.buspass.jtms;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/Policy.drl b/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/Policy.drl
index 5d27f5b294..216294932e 100644
--- a/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/Policy.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/buspass/jtms/Policy.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.buspass.jtms;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/cashflow/CashFlow.drl b/drools-examples/src/main/resources/org/drools/examples/cashflow/CashFlow.drl
index ed58d30ad4..e4ebfa1b06 100644
--- a/drools-examples/src/main/resources/org/drools/examples/cashflow/CashFlow.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/cashflow/CashFlow.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.cashflow;
 dialect  "mvel"
diff --git a/drools-examples/src/main/resources/org/drools/examples/circularTms/circular.drl b/drools-examples/src/main/resources/org/drools/examples/circularTms/circular.drl
index d31cd8ec06..5d7ea8f25f 100644
--- a/drools-examples/src/main/resources/org/drools/examples/circularTms/circular.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/circularTms/circular.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.circularTms;
 dialect  "mvel"
diff --git a/drools-examples/src/main/resources/org/drools/examples/diagnostics/CarWontStart.drl b/drools-examples/src/main/resources/org/drools/examples/diagnostics/CarWontStart.drl
index 74a01e36e9..e56e0ca9b6 100644
--- a/drools-examples/src/main/resources/org/drools/examples/diagnostics/CarWontStart.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/diagnostics/CarWontStart.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.diagnostics;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/fibonacci/Fibonacci.drl b/drools-examples/src/main/resources/org/drools/examples/fibonacci/Fibonacci.drl
index 23b18e0e9f..071600db0c 100644
--- a/drools-examples/src/main/resources/org/drools/examples/fibonacci/Fibonacci.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/fibonacci/Fibonacci.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.fibonacci
diff --git a/drools-examples/src/main/resources/org/drools/examples/fire/logical/FireLogical.drl b/drools-examples/src/main/resources/org/drools/examples/fire/logical/FireLogical.drl
index 84d2929861..42988d4c29 100644
--- a/drools-examples/src/main/resources/org/drools/examples/fire/logical/FireLogical.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/fire/logical/FireLogical.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.fire.logical;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/fire/simple/Fire.drl b/drools-examples/src/main/resources/org/drools/examples/fire/simple/Fire.drl
index 6a3ec5f059..163e8e106d 100644
--- a/drools-examples/src/main/resources/org/drools/examples/fire/simple/Fire.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/fire/simple/Fire.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.fire.simple;
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/golfing/golf.drl b/drools-examples/src/main/resources/org/drools/examples/golfing/golf.drl
index 516ea24a66..c39df403fe 100644
--- a/drools-examples/src/main/resources/org/drools/examples/golfing/golf.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/golfing/golf.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.golfing;
diff --git a/drools-examples/src/main/resources/org/drools/examples/helloworld/HelloWorld.drl b/drools-examples/src/main/resources/org/drools/examples/helloworld/HelloWorld.drl
index c4a918180d..ed40b7d355 100644
--- a/drools-examples/src/main/resources/org/drools/examples/helloworld/HelloWorld.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/helloworld/HelloWorld.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.helloworld
diff --git a/drools-examples/src/main/resources/org/drools/examples/honestpolitician/HonestPolitician.drl b/drools-examples/src/main/resources/org/drools/examples/honestpolitician/HonestPolitician.drl
index 1784ba2cdf..8eb8ca652c 100644
--- a/drools-examples/src/main/resources/org/drools/examples/honestpolitician/HonestPolitician.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/honestpolitician/HonestPolitician.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.honestpolitician
diff --git a/drools-examples/src/main/resources/org/drools/examples/pacman/base.drl b/drools-examples/src/main/resources/org/drools/examples/pacman/base.drl
index 57770440bd..f05114b041 100644
--- a/drools-examples/src/main/resources/org/drools/examples/pacman/base.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/pacman/base.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.pacman
diff --git a/drools-examples/src/main/resources/org/drools/examples/pacman/key-handlers.drl b/drools-examples/src/main/resources/org/drools/examples/pacman/key-handlers.drl
index 482aeb62fd..2d6cce936c 100644
--- a/drools-examples/src/main/resources/org/drools/examples/pacman/key-handlers.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/pacman/key-handlers.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.pacman
diff --git a/drools-examples/src/main/resources/org/drools/examples/pacman/monster.drl b/drools-examples/src/main/resources/org/drools/examples/pacman/monster.drl
index ac1b89caa1..c8ee29c854 100644
--- a/drools-examples/src/main/resources/org/drools/examples/pacman/monster.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/pacman/monster.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.pacman
diff --git a/drools-examples/src/main/resources/org/drools/examples/pacman/pacman.drl b/drools-examples/src/main/resources/org/drools/examples/pacman/pacman.drl
index 08da323428..22cde554b6 100644
--- a/drools-examples/src/main/resources/org/drools/examples/pacman/pacman.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/pacman/pacman.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.pacman
diff --git a/drools-examples/src/main/resources/org/drools/examples/petstore/PetStore.drl b/drools-examples/src/main/resources/org/drools/examples/petstore/PetStore.drl
index 453e9c55da..213acbecfc 100644
--- a/drools-examples/src/main/resources/org/drools/examples/petstore/PetStore.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/petstore/PetStore.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.petstore
diff --git a/drools-examples/src/main/resources/org/drools/examples/shopping/Shopping.drl b/drools-examples/src/main/resources/org/drools/examples/shopping/Shopping.drl
index a68d1cbbcb..baff348c29 100644
--- a/drools-examples/src/main/resources/org/drools/examples/shopping/Shopping.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/shopping/Shopping.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.shopping
diff --git a/drools-examples/src/main/resources/org/drools/examples/state/agendagroup/StateExampleUsingAgendaGroup.drl b/drools-examples/src/main/resources/org/drools/examples/state/agendagroup/StateExampleUsingAgendaGroup.drl
index cfb8bac572..d6bdf8a938 100644
--- a/drools-examples/src/main/resources/org/drools/examples/state/agendagroup/StateExampleUsingAgendaGroup.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/state/agendagroup/StateExampleUsingAgendaGroup.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.state.agendagroup
diff --git a/drools-examples/src/main/resources/org/drools/examples/state/salience/StateExampleUsingSalience.drl b/drools-examples/src/main/resources/org/drools/examples/state/salience/StateExampleUsingSalience.drl
index 5096aff7be..1e2e693336 100644
--- a/drools-examples/src/main/resources/org/drools/examples/state/salience/StateExampleUsingSalience.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/state/salience/StateExampleUsingSalience.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.state.salience
diff --git a/drools-examples/src/main/resources/org/drools/examples/sudoku/sudoku.drl b/drools-examples/src/main/resources/org/drools/examples/sudoku/sudoku.drl
index c10ee50ea2..6aad6a792b 100644
--- a/drools-examples/src/main/resources/org/drools/examples/sudoku/sudoku.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/sudoku/sudoku.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.sudoku
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/sudoku/validate.drl b/drools-examples/src/main/resources/org/drools/examples/sudoku/validate.drl
index 6753201ca0..cad7aa286e 100644
--- a/drools-examples/src/main/resources/org/drools/examples/sudoku/validate.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/sudoku/validate.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.sudoku
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/traits/multipleTraits.drl b/drools-examples/src/main/resources/org/drools/examples/traits/multipleTraits.drl
index 43990c1148..f3628bd22a 100644
--- a/drools-examples/src/main/resources/org/drools/examples/traits/multipleTraits.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/traits/multipleTraits.drl
@@ -1,19 +1,21 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.drools.examples.traits
 
 declare Person
diff --git a/drools-examples/src/main/resources/org/drools/examples/traits/noTraits.drl b/drools-examples/src/main/resources/org/drools/examples/traits/noTraits.drl
index 8597a43817..766bcac353 100644
--- a/drools-examples/src/main/resources/org/drools/examples/traits/noTraits.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/traits/noTraits.drl
@@ -1,19 +1,21 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.drools.examples.traits
 
 declare Person
diff --git a/drools-examples/src/main/resources/org/drools/examples/traits/traits.drl b/drools-examples/src/main/resources/org/drools/examples/traits/traits.drl
index 8c797450b0..00fef9edc7 100644
--- a/drools-examples/src/main/resources/org/drools/examples/traits/traits.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/traits/traits.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.examples.traits
 
diff --git a/drools-examples/src/main/resources/org/drools/examples/traits/traitsDon.drl b/drools-examples/src/main/resources/org/drools/examples/traits/traitsDon.drl
index 44cef0f329..8d072d2168 100644
--- a/drools-examples/src/main/resources/org/drools/examples/traits/traitsDon.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/traits/traitsDon.drl
@@ -1,19 +1,21 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.drools.examples.traits
 
 declare Person
diff --git a/drools-examples/src/main/resources/org/drools/examples/traits/traitsMixins.drl b/drools-examples/src/main/resources/org/drools/examples/traits/traitsMixins.drl
index 4684067327..3045df612e 100644
--- a/drools-examples/src/main/resources/org/drools/examples/traits/traitsMixins.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/traits/traitsMixins.drl
@@ -1,19 +1,21 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.drools.examples.traits
 
 import org.drools.examples.traits.Scholar;
diff --git a/drools-examples/src/main/resources/org/drools/examples/traits/traitsShed.drl b/drools-examples/src/main/resources/org/drools/examples/traits/traitsShed.drl
index 68ccb35b5d..79477cc164 100644
--- a/drools-examples/src/main/resources/org/drools/examples/traits/traitsShed.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/traits/traitsShed.drl
@@ -1,19 +1,21 @@
-/*
- * Copyright 2011 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.drools.examples.traits
 
 import org.drools.examples.traits.Scholar;
diff --git a/drools-examples/src/main/resources/org/drools/examples/troubleticket/TroubleTicket.drl b/drools-examples/src/main/resources/org/drools/examples/troubleticket/TroubleTicket.drl
index 7402453bb5..4da53c7241 100644
--- a/drools-examples/src/main/resources/org/drools/examples/troubleticket/TroubleTicket.drl
+++ b/drools-examples/src/main/resources/org/drools/examples/troubleticket/TroubleTicket.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.examples.troubleticket
diff --git a/drools-examples/src/main/resources/org/drools/games/adventures/Commands.drl b/drools-examples/src/main/resources/org/drools/games/adventures/Commands.drl
index a8cbb22f1f..1993ad1fef 100644
--- a/drools-examples/src/main/resources/org/drools/games/adventures/Commands.drl
+++ b/drools-examples/src/main/resources/org/drools/games/adventures/Commands.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.adventures
 
diff --git a/drools-examples/src/main/resources/org/drools/games/adventures/Events.drl b/drools-examples/src/main/resources/org/drools/games/adventures/Events.drl
index b60aae1ec3..e45b652b8e 100644
--- a/drools-examples/src/main/resources/org/drools/games/adventures/Events.drl
+++ b/drools-examples/src/main/resources/org/drools/games/adventures/Events.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.adventures
 
diff --git a/drools-examples/src/main/resources/org/drools/games/adventures/Model.drl b/drools-examples/src/main/resources/org/drools/games/adventures/Model.drl
index dde288eaf2..1f3bd48b78 100644
--- a/drools-examples/src/main/resources/org/drools/games/adventures/Model.drl
+++ b/drools-examples/src/main/resources/org/drools/games/adventures/Model.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.adventures
 
diff --git a/drools-examples/src/main/resources/org/drools/games/adventures/Queries.drl b/drools-examples/src/main/resources/org/drools/games/adventures/Queries.drl
index 73e4983351..950fbe4fe1 100644
--- a/drools-examples/src/main/resources/org/drools/games/adventures/Queries.drl
+++ b/drools-examples/src/main/resources/org/drools/games/adventures/Queries.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.adventures
 
diff --git a/drools-examples/src/main/resources/org/drools/games/adventures/UiView.drl b/drools-examples/src/main/resources/org/drools/games/adventures/UiView.drl
index ceaa734d4f..4145205926 100644
--- a/drools-examples/src/main/resources/org/drools/games/adventures/UiView.drl
+++ b/drools-examples/src/main/resources/org/drools/games/adventures/UiView.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.adventures
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders1/Main.drl b/drools-examples/src/main/resources/org/drools/games/invaders1/Main.drl
index 2961dcddf1..d1b36297ff 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders1/Main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders1/Main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders1;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders2/Draw.drl b/drools-examples/src/main/resources/org/drools/games/invaders2/Draw.drl
index 45916751a7..c172e272ee 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders2/Draw.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders2/Draw.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders2;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders2/Init.drl b/drools-examples/src/main/resources/org/drools/games/invaders2/Init.drl
index ed886a13d9..aa7497091d 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders2/Init.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders2/Init.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders2;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders2/Main.drl b/drools-examples/src/main/resources/org/drools/games/invaders2/Main.drl
index fedc77671b..44bb2b74bb 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders2/Main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders2/Main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders2;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders3/Draw.drl b/drools-examples/src/main/resources/org/drools/games/invaders3/Draw.drl
index 77659bfca4..bce9bcac10 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders3/Draw.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders3/Draw.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders3;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders3/Init.drl b/drools-examples/src/main/resources/org/drools/games/invaders3/Init.drl
index bcdd297c50..57436a24b9 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders3/Init.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders3/Init.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders3;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders3/Main.drl b/drools-examples/src/main/resources/org/drools/games/invaders3/Main.drl
index f1804a4ebe..1b8784a8f6 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders3/Main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders3/Main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders3;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders3/Move.drl b/drools-examples/src/main/resources/org/drools/games/invaders3/Move.drl
index cc67b4e34a..dc45422d1a 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders3/Move.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders3/Move.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders3;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders4/Draw.drl b/drools-examples/src/main/resources/org/drools/games/invaders4/Draw.drl
index 3b66d9fe91..58126184af 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders4/Draw.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders4/Draw.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders4;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders4/Init.drl b/drools-examples/src/main/resources/org/drools/games/invaders4/Init.drl
index 528398a7d2..fa39826f09 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders4/Init.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders4/Init.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders4;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders4/Main.drl b/drools-examples/src/main/resources/org/drools/games/invaders4/Main.drl
index d414d3c987..2a0535fb45 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders4/Main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders4/Main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders4;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders4/Move.drl b/drools-examples/src/main/resources/org/drools/games/invaders4/Move.drl
index 7cf6dcbcf3..477abb2cf7 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders4/Move.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders4/Move.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders4;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders5/Draw.drl b/drools-examples/src/main/resources/org/drools/games/invaders5/Draw.drl
index cf8da1dc34..382fa904a8 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders5/Draw.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders5/Draw.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders5;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders5/Init.drl b/drools-examples/src/main/resources/org/drools/games/invaders5/Init.drl
index 6691c4eab9..6e10cb496a 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders5/Init.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders5/Init.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders5;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders5/Main.drl b/drools-examples/src/main/resources/org/drools/games/invaders5/Main.drl
index 184fb82a32..f974e99591 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders5/Main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders5/Main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders5;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders5/Move.drl b/drools-examples/src/main/resources/org/drools/games/invaders5/Move.drl
index c101fe8bdd..e9e158e632 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders5/Move.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders5/Move.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders5;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders6/Bullet.drl b/drools-examples/src/main/resources/org/drools/games/invaders6/Bullet.drl
index e799e659a4..71f574c648 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders6/Bullet.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders6/Bullet.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders6;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders6/Draw.drl b/drools-examples/src/main/resources/org/drools/games/invaders6/Draw.drl
index f8615d16e0..b6b31467ac 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders6/Draw.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders6/Draw.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders6;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders6/Init.drl b/drools-examples/src/main/resources/org/drools/games/invaders6/Init.drl
index eb9ca480a5..353b8dbd81 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders6/Init.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders6/Init.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders6;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders6/Main.drl b/drools-examples/src/main/resources/org/drools/games/invaders6/Main.drl
index fefdcfd679..a006e48661 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders6/Main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders6/Main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders6;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/invaders6/Move.drl b/drools-examples/src/main/resources/org/drools/games/invaders6/Move.drl
index a22a56b69f..999508ac69 100644
--- a/drools-examples/src/main/resources/org/drools/games/invaders6/Move.drl
+++ b/drools-examples/src/main/resources/org/drools/games/invaders6/Move.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.invaders6;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/keys/keys.drl b/drools-examples/src/main/resources/org/drools/games/keys/keys.drl
index c6786b23af..7e05dccf02 100644
--- a/drools-examples/src/main/resources/org/drools/games/keys/keys.drl
+++ b/drools-examples/src/main/resources/org/drools/games/keys/keys.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.keys
 
diff --git a/drools-examples/src/main/resources/org/drools/games/numberguess/NumberGuess.drl b/drools-examples/src/main/resources/org/drools/games/numberguess/NumberGuess.drl
index 0415224c29..ef1c7fa865 100644
--- a/drools-examples/src/main/resources/org/drools/games/numberguess/NumberGuess.drl
+++ b/drools-examples/src/main/resources/org/drools/games/numberguess/NumberGuess.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.numberguess
 
diff --git a/drools-examples/src/main/resources/org/drools/games/pong/collision.drl b/drools-examples/src/main/resources/org/drools/games/pong/collision.drl
index 9a9265e95c..61c9ed0b53 100644
--- a/drools-examples/src/main/resources/org/drools/games/pong/collision.drl
+++ b/drools-examples/src/main/resources/org/drools/games/pong/collision.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.pong
 
diff --git a/drools-examples/src/main/resources/org/drools/games/pong/game.drl b/drools-examples/src/main/resources/org/drools/games/pong/game.drl
index bb0f6c827c..0eb0c291d5 100644
--- a/drools-examples/src/main/resources/org/drools/games/pong/game.drl
+++ b/drools-examples/src/main/resources/org/drools/games/pong/game.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.pong
 
diff --git a/drools-examples/src/main/resources/org/drools/games/pong/init.drl b/drools-examples/src/main/resources/org/drools/games/pong/init.drl
index 73353cddcc..c5aeb97e18 100644
--- a/drools-examples/src/main/resources/org/drools/games/pong/init.drl
+++ b/drools-examples/src/main/resources/org/drools/games/pong/init.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.pong
 
diff --git a/drools-examples/src/main/resources/org/drools/games/pong/main.drl b/drools-examples/src/main/resources/org/drools/games/pong/main.drl
index 370a586b07..e864123b1d 100644
--- a/drools-examples/src/main/resources/org/drools/games/pong/main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/pong/main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.pong;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/pong/move.drl b/drools-examples/src/main/resources/org/drools/games/pong/move.drl
index a4c8045672..a99de573a0 100644
--- a/drools-examples/src/main/resources/org/drools/games/pong/move.drl
+++ b/drools-examples/src/main/resources/org/drools/games/pong/move.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.pong
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/client/client.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/client/client.drl
index fd7b363fd7..d1983d8391 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/client/client.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/client/client.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.client
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/commands.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/commands.drl
index 5372a0af5b..fd49d38565 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/commands.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/commands.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/init.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/init.drl
index 99de6e08ca..055d208092 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/init.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/init.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/main.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/main.drl
index 49d0d72bae..9a41529fcf 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/main.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/main.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/reset.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/reset.drl
index 5a1904b0dc..a00701743c 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/reset.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/reset.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/score.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/score.drl
index c6974e1bc4..5443e4aa38 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/score.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/score.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/sensorArray.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/sensorArray.drl
index da74f85d23..5aae263fcb 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/sensorArray.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/sensorArray.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/shoot.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/shoot.drl
index c4891fe514..fe8622004e 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/shoot.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/shoot.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server;
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintCave.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintCave.drl
index 769e138254..e2ce7f6e1e 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintCave.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintCave.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server.view
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintSensor.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintSensor.drl
index a49e18e7d4..078ed906bc 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintSensor.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/paintSensor.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server.view
 
diff --git a/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/ui.drl b/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/ui.drl
index 965c2f4f94..7ce2572392 100644
--- a/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/ui.drl
+++ b/drools-examples/src/main/resources/org/drools/games/wumpus/server/view/ui.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.games.wumpus.server.view
 
diff --git a/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/drl/test_ImportFunctions.drl b/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/drl/test_ImportFunctions.drl
index bb2f2676cd..40a316bbb9 100644
--- a/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/drl/test_ImportFunctions.drl
+++ b/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/drl/test_ImportFunctions.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/simple_query_test.drl b/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/simple_query_test.drl
index 4fa067861a..09c7da9a4d 100644
--- a/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/simple_query_test.drl
+++ b/drools-legacy-test-util/src/test/resources/org/drools/mvel/integrationtests/simple_query_test.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.mvel.compiler.test;
 
diff --git a/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file1.drl b/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file1.drl
index c455c653bb..7df6abf19d 100644
--- a/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file1.drl
+++ b/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file1.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.model.project.codegen.pkg1
 
diff --git a/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file2.drl b/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file2.drl
index c802d53408..dfc1ade56e 100644
--- a/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file2.drl
+++ b/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg1/file2.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.model.project.codegen.pkg1
 
diff --git a/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg2/file3.drl b/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg2/file3.drl
index 79eb9b5b75..43ecb72229 100644
--- a/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg2/file3.drl
+++ b/drools-model/drools-model-codegen/src/test/resources/org/drools/model/project/codegen/pkg2/file3.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.model.project.codegen.pkg2
 
diff --git a/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/broken.drl b/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/broken.drl
index 3594771c19..2877e8e5f6 100644
--- a/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/broken.drl
+++ b/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/broken.drl
@@ -1,16 +1,19 @@
 /**
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 syntax error
\ No newline at end of file
diff --git a/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/cep/cep.drl b/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/cep/cep.drl
index e54a9cf7b3..f97f813b0e 100644
--- a/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/cep/cep.drl
+++ b/drools-model/drools-model-codegen/src/test/resources/org/drools/simple/cep/cep.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.simple.cep
 
diff --git a/drools-mvel/src/test/resources/org/drools/mvel/compiler/rule/builder/dialect/mvel/mvel_rule.drl b/drools-mvel/src/test/resources/org/drools/mvel/compiler/rule/builder/dialect/mvel/mvel_rule.drl
index 25c52b1f58..701375d8ae 100644
--- a/drools-mvel/src/test/resources/org/drools/mvel/compiler/rule/builder/dialect/mvel/mvel_rule.drl
+++ b/drools-mvel/src/test/resources/org/drools/mvel/compiler/rule/builder/dialect/mvel/mvel_rule.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
 rule simple_rule 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/resources/agenda-groups.drl b/drools-persistence/drools-persistence-jpa/src/test/resources/agenda-groups.drl
index d220bd3f81..1dd667db2d 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/resources/agenda-groups.drl
+++ b/drools-persistence/drools-persistence-jpa/src/test/resources/agenda-groups.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.jbpm;
 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/resources/cdiexample/test.drl b/drools-persistence/drools-persistence-jpa/src/test/resources/cdiexample/test.drl
index 58fffee5b3..e703f89f9d 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/resources/cdiexample/test.drl
+++ b/drools-persistence/drools-persistence-jpa/src/test/resources/cdiexample/test.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.kie.test
 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/command/empty.drl b/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/command/empty.drl
index a02661deb7..0922abee8c 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/command/empty.drl
+++ b/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/command/empty.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package com.sample
 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/collect_rules.drl b/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/collect_rules.drl
index 24c85a1e73..660ce989b6 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/collect_rules.drl
+++ b/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/collect_rules.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.persistence.kie.persistence.session
 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/family_rules.drl b/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/family_rules.drl
index a1240a618c..083b9ce29b 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/family_rules.drl
+++ b/drools-persistence/drools-persistence-jpa/src/test/resources/org/drools/persistence/kie/persistence/session/family_rules.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.persistence.kie.persistence.session
 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflow-groups.drl b/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflow-groups.drl
index d308a2c7d1..463fcc26d7 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflow-groups.drl
+++ b/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflow-groups.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.jbpm;
 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflowgroup_rollback.drl b/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflowgroup_rollback.drl
index ea496f3e05..408cc380ee 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflowgroup_rollback.drl
+++ b/drools-persistence/drools-persistence-jpa/src/test/resources/ruleflowgroup_rollback.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.jbpm;
 
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/src/test/resources/rules.txt b/drools-quarkus-extension/drools-quarkus-deployment/src/test/resources/rules.txt
index 745f4498ad..5bbb7c191d 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/src/test/resources/rules.txt
+++ b/drools-quarkus-extension/drools-quarkus-deployment/src/test/resources/rules.txt
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.drools.quarkus.examples.otn;
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/org/drools/quarkus/ruleunit/examples/reactive/AlertingRules.drl b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/org/drools/quarkus/ruleunit/examples/reactive/AlertingRules.drl
index bea739f76f..72726f80c8 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/org/drools/quarkus/ruleunit/examples/reactive/AlertingRules.drl
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/org/drools/quarkus/ruleunit/examples/reactive/AlertingRules.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.quarkus.ruleunit.examples.reactive
 
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/AgendaGroupUnit.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/AgendaGroupUnit.drl
index 744ad0c087..9e0ede1bbb 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/AgendaGroupUnit.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/AgendaGroupUnit.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit AgendaGroupUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/HelloWorld.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/HelloWorld.drl
index ef5dea1e7f..d9fec6667f 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/HelloWorld.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/HelloWorld.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit HelloWorldUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Locations.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Locations.drl
index d48cc8f6ed..61dec9b2d0 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Locations.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Locations.drl
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit LocationUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAdd.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAdd.drl
index eed4df13c1..0e356a293a 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAdd.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAdd.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit LogicalAddTestUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAddByElement.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAddByElement.drl
index 7badb5d3ec..6f3a05b0b2 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAddByElement.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/LogicalAddByElement.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit LogicalAddByElementTestUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/NotTestUnit.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/NotTestUnit.drl
index 20a9620a39..f119eeaaac 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/NotTestUnit.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/NotTestUnit.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit NotTestUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/OOPathTest.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/OOPathTest.drl
index f5939b260b..aae9fa124a 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/OOPathTest.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/OOPathTest.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit OOPathTestUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/RuleName.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/RuleName.drl
index 833990939f..b1471de0d7 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/RuleName.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/RuleName.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit RuleNameUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/StockTick.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/StockTick.drl
index 4d8623bde2..3c1985ed61 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/StockTick.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/StockTick.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit StockTickUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Update.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Update.drl
index 20d96036a8..03324c2a28 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Update.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/Update.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit UpdateTestUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/UpdateNoDS.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/UpdateNoDS.drl
index b223ed57a5..b6ab501c59 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/UpdateNoDS.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/UpdateNoDS.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit UpdateNoDSTestUnit;
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/WronglyTypedUnit.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/WronglyTypedUnit.drl
index e710bf9772..3caf6f90ce 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/WronglyTypedUnit.drl
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/WronglyTypedUnit.drl
@@ -1,17 +1,20 @@
 /**
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.drools.ruleunits.impl;
 unit WronglyTypedUnit;
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/simple-item-def.dmn b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/simple-item-def.dmn
index d23c9563e4..40b040558f 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/simple-item-def.dmn
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/simple-item-def.dmn
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
+  ~   http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
   -->
 <semantic:definitions xmlns="https://github.com/kiegroup/kie-dmn/itemdef"
                       xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/"
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/simple_query_test.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/simple_query_test.drl
index 961970a2e2..a8e4c8900d 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/simple_query_test.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/simple_query_test.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_AccumulateSerialization.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_AccumulateSerialization.drl
index 7328c89a80..30e547fdaa 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_AccumulateSerialization.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_AccumulateSerialization.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1.drl
index 1238050899..0e5ebbbce2 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_0.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_0.drl
index 408d928a89..a5b8bdd9ef 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_0.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_0.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_1.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_1.drl
index 973c61cede..716cf96b47 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_1.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_2.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_2.drl
index 50244d24ff..0ec9b577c1 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_2.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic1_2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3.drl
index 1f7b977f06..50a3fe4ee2 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3_0.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3_0.drl
index a730fad376..9ac68f3078 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3_0.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Dynamic3_0.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.newtest;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionWithExists.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionWithExists.drl
index 95a8dcc763..7bd10da1bd 100755
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionWithExists.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionWithExists.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions.drl
index 00d43a9238..a324162568 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions2.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions2.drl
index 42c96f87ef..ddad1af1d9 100755
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions2.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertions2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsAccumulatorPattern.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsAccumulatorPattern.drl
index 392b882761..87a12ce5ec 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsAccumulatorPattern.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsAccumulatorPattern.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsBacking.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsBacking.drl
index a7b6c0b096..5d88bfc52b 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsBacking.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsBacking.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule.drl
index 66a0b4b0b3..fa3689ce7b 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule2.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule2.drl
index 05fd44b933..d1a390cba4 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule2.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsDynamicRule2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test2;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl
index abb1f18961..4932f3ae9b 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsNot.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsNot.drl
index de4ddccb51..1ac8ffae65 100755
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsNot.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsNot.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsWithUpdate.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsWithUpdate.drl
index 06c702c0d3..9b7b8caf79 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsWithUpdate.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_LogicalInsertionsWithUpdate.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable.drl
index 2d607051a9..bd4e757963 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable2.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable2.drl
index a6d170482e..de813308ca 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable2.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_Serializable2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_SerializableAccumulate.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_SerializableAccumulate.drl
index a72c72a71e..bbe5caa6c2 100644
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_SerializableAccumulate.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_SerializableAccumulate.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.mvel.compiler
 
diff --git a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_logicalInsertions3.drl b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_logicalInsertions3.drl
index 3bcfceaa67..ff09edaf40 100755
--- a/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_logicalInsertions3.drl
+++ b/drools-serialization-protobuf/src/test/resources/org/drools/serialization/protobuf/test_logicalInsertions3.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-templates/src/test/resources/templates/test_template_invalid1.drl b/drools-templates/src/test/resources/templates/test_template_invalid1.drl
index 58765ed03f..0f47cfaa37 100644
--- a/drools-templates/src/test/resources/templates/test_template_invalid1.drl
+++ b/drools-templates/src/test/resources/templates/test_template_invalid1.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package This_is_a_ruleset;
 
diff --git a/drools-templates/src/test/resources/templates/test_template_invalid2.drl b/drools-templates/src/test/resources/templates/test_template_invalid2.drl
index 4f5716fde5..75423e9253 100644
--- a/drools-templates/src/test/resources/templates/test_template_invalid2.drl
+++ b/drools-templates/src/test/resources/templates/test_template_invalid2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 
diff --git a/drools-templates/src/test/resources/templates/test_template_invalid3.drl b/drools-templates/src/test/resources/templates/test_template_invalid3.drl
index 301b551355..09d9fe6566 100644
--- a/drools-templates/src/test/resources/templates/test_template_invalid3.drl
+++ b/drools-templates/src/test/resources/templates/test_template_invalid3.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 name
diff --git a/drools-templates/src/test/resources/templates/test_template_invalid4.drl b/drools-templates/src/test/resources/templates/test_template_invalid4.drl
index a262cb525e..b53bc11789 100644
--- a/drools-templates/src/test/resources/templates/test_template_invalid4.drl
+++ b/drools-templates/src/test/resources/templates/test_template_invalid4.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 template header
 name
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java
index 4968c0dfa1..3ad7c622d0 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java
@@ -859,7 +859,7 @@ public class RuleParserTest {
 
         assertThat(rule.getName()).isEqualTo("simple_rule");
 
-        assertThat(rule.getConsequenceLine()).isEqualTo(22);
+        assertThat(rule.getConsequenceLine()).isEqualTo(26);
         assertThat(rule.getConsequencePattern()).isEqualTo(2);
 
         final AndDescr lhs = rule.getLhs();
@@ -952,7 +952,7 @@ public class RuleParserTest {
 
         assertThat(rule.getName()).isEqualTo("simple_rule");
 
-        assertThat(rule.getConsequenceLine()).isEqualTo(22);
+        assertThat(rule.getConsequenceLine()).isEqualTo(26);
         assertThat(rule.getConsequencePattern()).isEqualTo(2);
 
         final AndDescr lhs = rule.getLhs();
@@ -975,9 +975,9 @@ public class RuleParserTest {
         final PatternDescr third = (PatternDescr) lhs.getDescrs().get( 2 );
         assertThat(third.getObjectType()).isEqualTo("Baz");
 
-        assertThat(first.getLine()).isEqualTo(19);
-        assertThat(second.getLine()).isEqualTo(20);
-        assertThat(third.getLine()).isEqualTo(21);
+        assertThat(first.getLine()).isEqualTo(23);
+        assertThat(second.getLine()).isEqualTo(24);
+        assertThat(third.getLine()).isEqualTo(25);
     }
 
     @Test
@@ -1663,7 +1663,7 @@ public class RuleParserTest {
         assertThat(func.getReturnType()).isEqualTo("String");
         assertThat(func.getParameterNames().size()).isEqualTo(2);
         assertThat(func.getParameterTypes().size()).isEqualTo(2);
-        assertThat(func.getLine()).isEqualTo(19);
+        assertThat(func.getLine()).isEqualTo(23);
         assertThat(func.getColumn()).isEqualTo(0);
 
         assertThat(func.getParameterTypes().get(0)).isEqualTo("String");
@@ -2022,8 +2022,8 @@ public class RuleParserTest {
                                                                "test_EndPosition.drl" );
         final RuleDescr rule = pkg.getRules().get(0);
         final PatternDescr col = (PatternDescr) rule.getLhs().getDescrs().get( 0 );
-        assertThat(col.getLine()).isEqualTo(21);
-        assertThat(col.getEndLine()).isEqualTo(23);
+        assertThat(col.getLine()).isEqualTo(25);
+        assertThat(col.getEndLine()).isEqualTo(27);
     }
 
     @Test
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ParserTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ParserTest.java
index 3290126bc0..48e302c8a3 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ParserTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ParserTest.java
@@ -58,11 +58,11 @@ public class ParserTest {
         // check that its getting it from the ruleDescr
         assertThat(stiltonError.getDescr().getLine()).isEqualTo(stiltonError.getLine());
         // check the absolute error line number (there are more).
-        assertThat(stiltonError.getLine()).isEqualTo(26);
+        assertThat(stiltonError.getLine()).isEqualTo(30);
 
         final DescrBuildError poisonError = (DescrBuildError) errors[1];
         assertThat(poisonError.getMessage().contains("Poison")).isTrue();
-        assertThat(poisonError.getLine()).isEqualTo(28);
+        assertThat(poisonError.getLine()).isEqualTo(32);
 
         final KnowledgeBuilderConfigurationImpl cfg = KnowledgeBuilderFactory.newKnowledgeBuilderConfiguration().as(KnowledgeBuilderConfigurationImpl.KEY);
         final JavaConfiguration javaConf = (JavaConfiguration) cfg.getDialectConfiguration("java");
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Accumulate.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Accumulate.drl
index b20a73792a..20898f0d2e 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Accumulate.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Accumulate.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverage.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverage.drl
index 4c997d59ed..0fc594e751 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverage.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverage.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverageMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverageMVEL.drl
index 3374561fc4..5ca50fa5ef 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverageMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateAverageMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectList.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectList.drl
index 8067d49cf6..e7f46e838c 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectList.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectList.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectListMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectListMVEL.drl
index 23b6e5d70e..00e97941de 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectListMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectListMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSet.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSet.drl
index 90a19d4efe..7c47ca46f1 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSet.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSet.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSetMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSetMVEL.drl
index 2ffb140a96..bd2ba6fc36 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSetMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCollectSetMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCount.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCount.drl
index 5c8f051959..cf0b82505e 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCount.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCount.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCountMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCountMVEL.drl
index 94edb74f82..b7bb83e886 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCountMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateCountMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMVEL.drl
index f189ca546a..c2bde4414d 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMax.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMax.drl
index 6eea5533e8..672e32a6ae 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMax.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMax.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMaxMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMaxMVEL.drl
index c646ab1030..af82565c43 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMaxMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMaxMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMin.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMin.drl
index cd787912f3..b6340ae1bd 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMin.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMin.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMinMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMinMVEL.drl
index 5b49784ed7..3a3cb4ce34 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMinMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMinMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPattern.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPattern.drl
index bbc1e08fe3..4dd7928d9d 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPattern.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPattern.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionJava.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionJava.drl
index 6b641010b6..93350f2bea 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionJava.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionJava.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionMVEL.drl
index 392653a5bf..5e1aabeb10 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternFunctionMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternMVEL.drl
index f64e8db678..554229f449 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultiPatternMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctions.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctions.drl
index 6222fa6b06..fb1ac1814a 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctions.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctions.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsConstraint.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsConstraint.drl
index 68dea7cf55..9363c6d402 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsConstraint.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsConstraint.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsMVEL.drl
index dbb688d3cd..9529a4494f 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateMultipleFunctionsMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateReverseModifyInsertLogical2.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateReverseModifyInsertLogical2.drl
index c3834041e2..1395a3ec0a 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateReverseModifyInsertLogical2.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateReverseModifyInsertLogical2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSum.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSum.drl
index ae46452a35..86e003b06c 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSum.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSum.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSumMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSumMVEL.drl
index b9b77d9c01..41fc6209da 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSumMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_AccumulateSumMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AfterOperatorDates.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AfterOperatorDates.drl
index b4641ecdb7..a43e0205e7 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AfterOperatorDates.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AfterOperatorDates.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 import org.drools.testcoverage.common.model.StockTick;
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AssertBehaviorOnEntryPoints.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AssertBehaviorOnEntryPoints.drl
index e47e36149f..529bce3f84 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AssertBehaviorOnEntryPoints.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_AssertBehaviorOnEntryPoints.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 import org.drools.testcoverage.common.model.StockTick;
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperator.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperator.drl
index 48f0f2fa43..62bee3d1a1 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperator.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperator.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperatorDates.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperatorDates.drl
index b61339b423..934e481f33 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperatorDates.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_BeforeOperatorDates.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CoincidesOperatorDates.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CoincidesOperatorDates.drl
index 22940df90f..10cb1203f3 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CoincidesOperatorDates.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CoincidesOperatorDates.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CollectWithWindows.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CollectWithWindows.drl
index 0eb40824e3..18309fd34e 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CollectWithWindows.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_CollectWithWindows.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_ComplexOperator.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_ComplexOperator.drl
index b4ef7ab3bd..7c154a486a 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_ComplexOperator.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_ComplexOperator.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_MetByOperator.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_MetByOperator.drl
index 1fe8c70ce7..6e4b466821 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_MetByOperator.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_MetByOperator.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 import org.drools.testcoverage.common.model.StockTick;
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleEventAssertion.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleEventAssertion.drl
index 600aa368b4..56faa7e56e 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleEventAssertion.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleEventAssertion.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleLengthWindow.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleLengthWindow.drl
index ea039b1a41..b19a8663f6 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleLengthWindow.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleLengthWindow.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 import org.drools.testcoverage.common.model.OrderEvent;
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleTimeWindow.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleTimeWindow.drl
index 849f2fb0a4..b8c891343c 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleTimeWindow.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_SimpleTimeWindow.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_TimeRelationalOperators.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_TimeRelationalOperators.drl
index c7f2094777..3a5c415a66 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_TimeRelationalOperators.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_CEP_TimeRelationalOperators.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_ConstraintConnectors.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_ConstraintConnectors.drl
index 4e6bc33f44..2028756d5e 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_ConstraintConnectors.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_ConstraintConnectors.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_EntryPointReference.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_EntryPointReference.drl
index e2cba275a3..dc610c2b39 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_EntryPointReference.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_EntryPointReference.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeans.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeans.drl
index d237477e01..538283dd7a 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeans.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeans.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.generatedbeans;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeansMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeansMVEL.drl
index eeefa59451..a110032f45 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeansMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_GeneratedBeansMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package mortgages
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_MultiRestrictionFieldConstraint.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_MultiRestrictionFieldConstraint.drl
index 48f651fce2..c7b1c445c8 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_MultiRestrictionFieldConstraint.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_MultiRestrictionFieldConstraint.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_NullFieldOnCompositeSink.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_NullFieldOnCompositeSink.drl
index 3e2ff03b06..3f9dd5227f 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_NullFieldOnCompositeSink.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_NullFieldOnCompositeSink.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
  
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_SubNetworks.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_SubNetworks.drl
index 38c25e3f9b..4d349c4b57 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_SubNetworks.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_SubNetworks.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Timer_With_Not.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Timer_With_Not.drl
index 0e0354d2b9..11da1b7bf8 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Timer_With_Not.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_Timer_With_Not.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import java.util.Date
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset.drl
index 7c5fb0e585..aa57bda934 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package com.sample
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset2.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset2.drl
index ebb2a78f7c..3f41261438 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset2.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffset2.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package com.sample
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffsetImports.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffsetImports.drl
index b8bda4c015..32ccff9947 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffsetImports.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/compiler/integrationtests/test_consequenceOffsetImports.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package com.sample
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeat.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeat.drl
index 4992195092..118eef23f0 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeat.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeat.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatDefeaterRetract.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatDefeaterRetract.drl
index 4828b2497e..a638323467 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatDefeaterRetract.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatDefeaterRetract.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterOnly.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterOnly.drl
index e166e2ac43..92be47ce07 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterOnly.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterOnly.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterRetract.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterRetract.drl
index cf202f2788..ed2afe3edc 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterRetract.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeaterRetract.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatersPosNeg.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatersPosNeg.drl
index 5c91924528..91027f1a77 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatersPosNeg.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/defeatersPosNeg.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/multiDefeat.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/multiDefeat.drl
index 9b4c755532..e88aa73a77 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/multiDefeat.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/multiDefeat.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/negDefeatPos.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/negDefeatPos.drl
index a7661b2139..3775476073 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/negDefeatPos.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/negDefeatPos.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strict.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strict.drl
index c52c76feea..32f6cb079e 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strict.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strict.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictOverride.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictOverride.drl
index 2f08e792d2..81760f25be 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictOverride.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictOverride.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictRetract.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictRetract.drl
index dbd79dde86..f3c9a64750 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictRetract.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/defeasible/strictRetract.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegConflict.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegConflict.drl
index 1a0815ec42..e06a5add74 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegConflict.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegConflict.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.beliefsystem.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegTms.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegTms.drl
index e03b7ca777..540d6c33ba 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegTms.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/beliefsystem/jtms/posNegTms.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.beliefsystem.defeasible;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/builder/impl/bad_rule.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/builder/impl/bad_rule.drl
index df675de0d8..eb4573e755 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/builder/impl/bad_rule.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/builder/impl/bad_rule.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package HR2
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/java5_rule.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/java5_rule.drl
index d27c486074..012abf20be 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/java5_rule.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/java5_rule.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.mvel.compiler.test;
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumber.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumber.drl
index b0674f3aaa..dcdd0a367e 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumber.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumber.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 //created on: 27-Jun-2007
 package org.drools.mvel.compiler.test
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumberMVEL.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumberMVEL.drl
index e0481935c9..5edaca3731 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumberMVEL.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/largeRuleNumberMVEL.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 //created on: 27-Jun-2007
 package org.drools.mvel.compiler.test
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset1Test.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset1Test.drl
index bb44b27184..dfa480c6b6 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset1Test.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset1Test.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset2Test.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset2Test.drl
index 5cee20b6e6..b15b4e58e1 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset2Test.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/compiler/xml/changeset/changeset2Test.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler.test
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Extends.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Extends.drl
index f80499fb3a..9eb0a10a2c 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Extends.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Extends.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Metadata.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Metadata.drl
index 9af877c9df..94d799dcf0 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Metadata.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_Metadata.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
 package org.drools.compiler
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_nested_LHS.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_nested_LHS.drl
index 02202de44e..b402249284 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_nested_LHS.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/Rule_with_nested_LHS.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate.drl
index be01b70b8a..c08504d9b1 100755
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 rule "AccumulateParserTest"
 when
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateExternalFunction.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateExternalFunction.drl
index e6d7e40d5f..c661c0537e 100755
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateExternalFunction.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateExternalFunction.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 rule "AccumulateReverseParserTest"
 when
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctions.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctions.drl
index 7a9d52d3e6..c0597e6381 100755
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctions.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctions.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctionsConstraint.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctionsConstraint.drl
index 1c82896022..7a01a322db 100755
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctionsConstraint.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateMultipleFunctionsConstraint.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.drools.compiler
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateReverse.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateReverse.drl
index c81cca4226..8ee9753e61 100755
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateReverse.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulateReverse.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 rule "AccumulateReverseParserTest"
 when
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_multi_pattern.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_multi_pattern.drl
index f0efaae91b..4a6f7785df 100755
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_multi_pattern.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_multi_pattern.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 rule "AccumulateMultiPatternParserTest"
 when
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_with_bindings.drl b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_with_bindings.drl
index 5623f98cd2..0c8d3ae048 100755
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_with_bindings.drl
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/org/drools/mvel/compiler/lang/accumulate_with_bindings.drl
@@ -1,17 +1,21 @@
-/*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 
... 28481 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org