[aspectj-maven-plugin] 01/03: Merge tag 'upstream/1.7'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Oct 24 15:13:32 BST 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository aspectj-maven-plugin.

commit 18e2c30ee38a72932cfd1e6fecd56889652ad067
Merge: 87c8a81 3ca96f1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 24 15:17:00 2014 +0200

    Merge tag 'upstream/1.7'
    
    Upstream version 1.7

 LICENSE.txt                                        |  21 +
 pom.xml                                            | 460 ++++++++++
 .../invoker.properties                             |   1 +
 .../AjcTestCompilerUsingCorrectClasspath/pom.xml   |  49 ++
 .../src/main/aspect/Azpect.java                    |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 .../src/main/java/Clazz.java                       |  37 +
 .../src/test/java/foo/ATestAzpect.java             |  55 ++
 .../src/test/java/foo/ATestCase.java               |  46 +
 .../test-build-1-5.ajproperties                    |   3 +
 .../verify.groovy                                  |   4 +
 src/it/BuildAspectJ7/pom.xml                       |  40 +
 src/it/BuildAspectJ7/src/main/aspect/Azpect.java   |  47 ++
 src/it/BuildAspectJ7/src/main/java/Clazz.java      |  37 +
 .../build-1-5.ajproperties                         |   2 +
 .../BuildConfigFileAndAspectJ5/invoker.properties  |   1 +
 src/it/BuildConfigFileAndAspectJ5/pom.xml          |  41 +
 .../src/main/aspect/Azpect.java                    |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 .../src/main/java/Clazz.java                       |  37 +
 .../build-1-2-using-exclusions.ajproperties        |   2 +
 .../invoker.properties                             |   1 +
 .../BuildConfigFileExclusionsUsingOldStyle/pom.xml |  41 +
 .../src/main/aspect/Azpect.java                    |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 .../src/main/java/Clazz.java                       |  37 +
 .../build-1-2.ajproperties                         |   2 +
 .../invoker.properties                             |   1 +
 src/it/BuildConfigFileUsingOldStyle/pom.xml        |  41 +
 .../src/main/aspect/Azpect.java                    |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 .../src/main/java/Clazz.java                       |  37 +
 .../invoker.properties                             |   1 +
 .../pom.xml                                        |  41 +
 .../src/main/aspect/foo/OldStyleAspect.aj          |  40 +
 .../src/main/java/foo/Azpect.java                  |  48 ++
 .../src/main/java/foo/Clazz.java                   |  39 +
 .../verify.groovy                                  |   3 +
 .../invoker.properties                             |   1 +
 src/it/CreateCustomLoadTimeWeaveXml/pom.xml        |  41 +
 .../src/main/aspect/foo/OldStyleAspect.aj          |  40 +
 .../src/main/java/foo/Azpect.java                  |  48 ++
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/CreateCustomLoadTimeWeaveXml/verify.groovy  |   2 +
 .../invoker.properties                             |   1 +
 src/it/CreateDefaultLoadTimeWeaveXml/pom.xml       |  41 +
 .../src/main/aspect/foo/OldStyleAspect.aj          |  40 +
 .../src/main/java/foo/Azpect.java                  |  48 ++
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/CreateDefaultLoadTimeWeaveXml/verify.groovy |   2 +
 src/it/CreateReport/build-1-5.ajproperties         |   2 +
 src/it/CreateReport/invoker.properties             |   1 +
 src/it/CreateReport/pom.xml                        |  43 +
 src/it/CreateReport/src/main/aspect/Azpect.java    |  46 +
 .../CreateReport/src/main/aspect/OldStyleAspect.aj |  38 +
 src/it/CreateReport/src/main/java/Clazz.java       |  37 +
 src/it/CreateReport/verify.groovy                  |   4 +
 src/it/CreateSite/build-1-5.ajproperties           |   2 +
 src/it/CreateSite/invoker.properties               |   1 +
 src/it/CreateSite/pom.xml                          |  76 ++
 src/it/CreateSite/src/main/aspect/Azpect.java      |  46 +
 .../CreateSite/src/main/aspect/OldStyleAspect.aj   |  38 +
 src/it/CreateSite/src/main/java/Clazz.java         |  37 +
 src/it/CreateSite/verify.groovy                    |   4 +
 src/it/ExclusionsAntStyle/invoker.properties       |   1 +
 src/it/ExclusionsAntStyle/pom.xml                  |  43 +
 .../src/main/aspect/foo/OldStyleAspect.aj          |  40 +
 .../src/main/java/foo/Azpect.java                  |  48 ++
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/ExclusionsAntStyle/verify.groovy            |   5 +
 src/it/ExclusionsFullClassName/invoker.properties  |   1 +
 src/it/ExclusionsFullClassName/pom.xml             |  43 +
 .../src/main/aspect/foo/OldStyleAspect.aj          |  40 +
 .../src/main/java/foo/Azpect.java                  |  48 ++
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/ExclusionsFullClassName/verify.groovy       |   4 +
 src/it/InclusionsAntStyle/invoker.properties       |   1 +
 src/it/InclusionsAntStyle/pom.xml                  |  43 +
 .../src/main/aspect/foo/OldStyleAspect.aj          |  40 +
 .../src/main/java/foo/Azpect.java                  |  48 ++
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/InclusionsAntStyle/verify.groovy            |   5 +
 src/it/InclusionsFullClassName/invoker.properties  |   1 +
 src/it/InclusionsFullClassName/pom.xml             |  43 +
 .../src/main/aspect/foo/OldStyleAspect.aj          |  40 +
 .../src/main/java/foo/Azpect.java                  |  48 ++
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/InclusionsFullClassName/verify.groovy       |   5 +
 src/it/JavaSourcesDefault/invoker.properties       |   1 +
 src/it/JavaSourcesDefault/pom.xml                  |  37 +
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/JavaSourcesDefault/verify.groovy            |   5 +
 src/it/JavaSourcesEmpty/invoker.properties         |   3 +
 src/it/JavaSourcesEmpty/pom.xml                    |  40 +
 .../JavaSourcesEmpty/src/main/java/foo/Clazz.java  |  39 +
 src/it/JavaSourcesEmpty/verify.groovy              |   4 +
 src/it/JavaSourcesList/invoker.properties          |   1 +
 src/it/JavaSourcesList/pom.xml                     |  44 +
 src/it/JavaSourcesList/src/java/foo/Clazz.java     |  39 +
 src/it/JavaSourcesList/verify.groovy               |   5 +
 src/it/JavaSourcesNoBasedir/invoker.properties     |   1 +
 src/it/JavaSourcesNoBasedir/pom.xml                |  42 +
 .../src/main/java/foo/Clazz.java                   |  39 +
 src/it/JavaSourcesNoBasedir/verify.groovy          |   4 +
 src/it/LineNumbersInAjcWarnings/invoker.properties |   1 +
 src/it/LineNumbersInAjcWarnings/pom.xml            |  41 +
 .../src/main/aspect/Azpect.java                    |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 .../src/main/java/Clazz.java                       |  20 +
 src/it/LineNumbersInAjcWarnings/verify.groovy      |  64 ++
 src/it/MASPECT-99/pom.xml                          |  38 +
 src/it/MASPECTJ-110/invoker.properties             |   3 +
 src/it/MASPECTJ-110/pom.xml                        | 102 +++
 src/it/MASPECTJ-110/src/main/java/Clazz.java       |  36 +
 .../src/main/trivialaspects/TrivialAspect.java     |  42 +
 .../MASPECTJ-110/src/test/java/AnotherClass.java   |   7 +
 .../test/trivialtestaspects/TrivialTestAspect.java |  42 +
 src/it/MASPECTJ-110/verify.groovy                  |  90 ++
 src/it/MASPECTJ-86/invoker.properties              |   1 +
 src/it/MASPECTJ-86/pom.xml                         |  52 ++
 src/it/MASPECTJ-86/verify.groovy                   |   5 +
 src/it/MASPECTJ-96/invoker.properties              |   1 +
 src/it/MASPECTJ-96/pom.xml                         |  35 +
 src/it/MASPECTJ-96/verify.groovy                   |   2 +
 src/it/NoMainSourceWeave/invoker.properties        |   1 +
 src/it/NoMainSourceWeave/pom.xml                   |  47 ++
 .../NoMainSourceWeave/src/main/aspect/Azpect.java  |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 src/it/NoMainSourceWeave/src/main/java/Clazz.java  |  37 +
 .../src/test/java/ATestAzpect.java                 |  53 ++
 .../NoMainSourceWeave/src/test/java/ATestCase.java |  46 +
 src/it/NoSourcesAvailable/invoker.properties       |   1 +
 src/it/NoSourcesAvailable/pom.xml                  |  40 +
 src/it/TOFIX_MASPECTJ-4/invoker.properties         |   3 +
 src/it/TOFIX_MASPECTJ-4/pom.xml                    |  67 ++
 .../TOFIX_MASPECTJ-4/src/main/aspect/Azpect.java   |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 src/it/TOFIX_MASPECTJ-4/src/main/java/Clazz.java   |  37 +
 .../src/test/java/ATestAzpect.java                 |  53 ++
 .../TOFIX_MASPECTJ-4/src/test/java/ATestCase.java  |  44 +
 src/it/WrongCompilerVersion/build-1-5.ajproperties |   2 +
 src/it/WrongCompilerVersion/invoker.properties     |   2 +
 src/it/WrongCompilerVersion/pom.xml                |  41 +
 .../src/main/aspect/Azpect.java                    |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 .../WrongCompilerVersion/src/main/java/Clazz.java  |  37 +
 src/it/WrongCompilerVersion/verify.groovy          |   3 +
 src/it/Xajruntimetarget/invoker.properties         |   1 +
 src/it/Xajruntimetarget/pom.xml                    |  41 +
 .../Xajruntimetarget/src/main/aspect/Azpect.java   |  46 +
 .../src/main/aspect/OldStyleAspect.aj              |  38 +
 src/it/Xajruntimetarget/src/main/java/Clazz.java   |  37 +
 src/it/Xajruntimetarget/verify.groovy              |   5 +
 src/it/XhasMember/invoker.properties               |   1 +
 src/it/XhasMember/pom.xml                          |  41 +
 src/it/XhasMember/src/main/aspect/Azpect.java      |  46 +
 .../XhasMember/src/main/aspect/OldStyleAspect.aj   |  38 +
 src/it/XhasMember/src/main/java/Clazz.java         |  37 +
 src/it/Xlint/invoker.properties                    |   1 +
 src/it/Xlint/pom.xml                               |  41 +
 src/it/Xlint/src/main/aspect/Azpect.java           |  46 +
 src/it/Xlint/src/main/aspect/OldStyleAspect.aj     |  38 +
 src/it/Xlint/src/main/java/Clazz.java              |  36 +
 src/it/Xlintfile/invoker.properties                |   1 +
 src/it/Xlintfile/pom.xml                           |  41 +
 src/it/Xlintfile/src/main/aspect/Azpect.java       |  35 +
 .../src/main/resources/XlintTestFile.properties    |   1 +
 src/it/Xlintfile/verify.groovy                     |  11 +
 src/it/XmlConfigured/pom.xml                       |  41 +
 src/it/XmlConfigured/src/main/aspect/Azpect.aj     |  38 +
 .../XmlConfigured/src/main/java/ExcludedClazz.java |  37 +
 .../XmlConfigured/src/main/java/IncludedClazz.java |  37 +
 .../src/main/resources/aopTestExample.xml          |   8 +
 src/it/XmlConfigured/verify.groovy                 |  11 +
 src/it/Xset/invoker.properties                     |   1 +
 src/it/Xset/pom.xml                                |  44 +
 src/it/Xset/src/main/aspect/Azpect.java            |  46 +
 src/it/Xset/src/main/java/Clazz.java               |  37 +
 src/it/Xset/verify.groovy                          |   5 +
 src/it/settings.xml                                |  55 ++
 .../codehaus/mojo/aspectj/AbstractAjcCompiler.java | 939 +++++++++++++++++++++
 .../org/codehaus/mojo/aspectj/AbstractAjcMojo.java | 139 +++
 .../org/codehaus/mojo/aspectj/AjcCompileMojo.java  | 104 +++
 .../java/org/codehaus/mojo/aspectj/AjcHelper.java  | 366 ++++++++
 .../org/codehaus/mojo/aspectj/AjcReportMojo.java   | 455 ++++++++++
 .../codehaus/mojo/aspectj/AjcTestCompileMojo.java  | 131 +++
 .../mojo/aspectj/CompilationFailedException.java   |  37 +
 .../org/codehaus/mojo/aspectj/EclipseAjcMojo.java  | 327 +++++++
 .../codehaus/mojo/aspectj/MavenMessageHandler.java | 189 +++++
 .../java/org/codehaus/mojo/aspectj/Module.java     | 122 +++
 .../java/org/codehaus/mojo/aspectj/Source.java     |  39 +
 src/main/resources/aspectj-report.properties       |  26 +
 src/main/resources/aspectj-report_en.properties    |  22 +
 src/main/resources/aspectj-report_nl.properties    |  26 +
 src/main/resources/aspectj-report_sv.properties    |  26 +
 src/site/apt/ajc_reference/experimental_opts.apt   |  35 +
 src/site/apt/ajc_reference/standard_opts.apt       | 153 ++++
 .../apt/examples/differentTestAndCompile.apt.vm    |  57 ++
 src/site/apt/examples/includeExclude.apt.vm        | 111 +++
 src/site/apt/examples/libraryJars.apt.vm           |  70 ++
 src/site/apt/examples/usingReport.apt.vm           |  55 ++
 src/site/apt/examples/usingTogetherWithAJDT.apt.vm |  59 ++
 src/site/apt/examples/weaveDirectories.apt.vm      |  59 ++
 src/site/apt/examples/weaveJars.apt.vm             |  71 ++
 src/site/apt/index.apt.vm                          |  29 +
 .../apt/multimodule/multimodule_strategy.apt.vm    | 443 ++++++++++
 src/site/apt/usage.apt.vm                          |  94 +++
 src/site/site.xml                                  |  30 +
 src/site/uml/multimodule_ajc.puml                  |  31 +
 .../mojo/aspectj/AbstractAjcCompilerTest.java      | 350 ++++++++
 .../codehaus/mojo/aspectj/AjcCompilerMojoTest.java | 107 +++
 .../org/codehaus/mojo/aspectj/AjcHelperTest.java   | 108 +++
 .../mojo/aspectj/CompilerMojoTestBase.java         | 103 +++
 .../org/codehaus/mojo/aspectj/MockArtifact.java    | 340 ++++++++
 .../codehaus/mojo/aspectj/MockArtifactHandler.java |  99 +++
 src/test/projects/aspects-in-main-project/pom.xml  |  53 ++
 .../java/org/codehaus/mojo/aspectj/Azpect.java     |  43 +
 .../main/java/org/codehaus/mojo/aspectj/Clazz.java |  39 +
 .../java/org/codehaus/mojo/aspectj/ATestCase.java  |  46 +
 src/test/projects/no-main-weave-project/pom.xml    |  57 ++
 .../aspect/org/codehaus/mojo/aspectj/Azpect.java   |  48 ++
 .../org/codehaus/mojo/aspectj/OldStyleAspect.aj    |  40 +
 .../main/java/org/codehaus/mojo/aspectj/Clazz.java |  39 +
 .../org/codehaus/mojo/aspectj/ATestAzpect.java     |  55 ++
 .../java/org/codehaus/mojo/aspectj/ATestCase.java  |  46 +
 src/test/projects/no-sources-project/pom.xml       |  37 +
 .../parent-child-test-project/my-app/pom.xml       |  23 +
 .../aspect/com/mycompany/app/aspects/AppAspect.aj  |  32 +
 .../src/main/java/com/mycompany/app/App.java       |  48 ++
 .../src/test/java/com/mycompany/app/AppTest.java   |  61 ++
 .../projects/parent-child-test-project/pom.xml     |  51 ++
 .../build-1-2-using-exclusions.ajproperties        |   2 +
 .../projects/test-project/build-1-2.ajproperties   |   2 +
 .../projects/test-project/build-1-5.ajproperties   |   2 +
 src/test/projects/test-project/pom.xml             | 102 +++
 .../aspect/org/codehaus/mojo/aspectj/Azpect.java   |  48 ++
 .../org/codehaus/mojo/aspectj/OldStyleAspect.aj    |  40 +
 .../main/java/org/codehaus/mojo/aspectj/Clazz.java |  39 +
 .../org/codehaus/mojo/aspectj/ATestAzpect.java     |  55 ++
 .../java/org/codehaus/mojo/aspectj/ATestCase.java  |  46 +
 .../test-project/test-build-1-5.ajproperties       |   3 +
 241 files changed, 12097 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/aspectj-maven-plugin.git



More information about the pkg-java-commits mailing list