diff -Nru aspectj-maven-plugin-1.7/debian/changelog aspectj-maven-plugin-1.10/debian/changelog --- aspectj-maven-plugin-1.7/debian/changelog 2014-10-24 14:04:59.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/changelog 2017-08-30 22:09:19.000000000 +0000 @@ -1,3 +1,20 @@ +aspectj-maven-plugin (1.10-1) unstable; urgency=medium + + * Team upload. + * New upstream release + - Keep the profiles in the pom to resolve the path to tools.jar + (Closes: #767982) + - Depend on libmaven3-core-java instead of libmaven2-core-java + * Depend on junit4 instead of junit + * Build with the DH sequencer instead of CDBS + * Standards-Version updated to 4.1.0 + * Switch to debhelper level 10 + * Use secure Vcs-* URLs + * Updated the Homepage field + * Track and download the new releases from GitHub + + -- Emmanuel Bourg Thu, 31 Aug 2017 00:09:19 +0200 + aspectj-maven-plugin (1.7-1) unstable; urgency=medium * New upstream release diff -Nru aspectj-maven-plugin-1.7/debian/clean aspectj-maven-plugin-1.10/debian/clean --- aspectj-maven-plugin-1.7/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/clean 2017-08-30 21:51:19.000000000 +0000 @@ -0,0 +1 @@ +test.lst diff -Nru aspectj-maven-plugin-1.7/debian/compat aspectj-maven-plugin-1.10/debian/compat --- aspectj-maven-plugin-1.7/debian/compat 2014-10-24 13:16:53.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/compat 2017-08-30 21:51:19.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru aspectj-maven-plugin-1.7/debian/control aspectj-maven-plugin-1.10/debian/control --- aspectj-maven-plugin-1.7/debian/control 2014-10-24 14:04:33.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/control 2017-08-30 21:51:19.000000000 +0000 @@ -3,20 +3,21 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Emmanuel Bourg -Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5) -Build-Depends-Indep: junit (>= 3.0), +Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2) +Build-Depends-Indep: junit4, libaspectj-java (>= 1.8.2), libdoxia-sitetools-java, libmaven-invoker-plugin-java, libmaven-plugin-testing-java, libmaven-plugin-tools-java, + libmaven-reporting-api-java, libmaven-reporting-impl-java, - libmaven2-core-java, + libmaven3-core-java, libplexus-utils2-java (>= 2.0.5) -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/aspectj-maven-plugin.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/aspectj-maven-plugin.git -Homepage: http://mojo.codehaus.org/aspectj-maven-plugin +Standards-Version: 4.1.0 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/aspectj-maven-plugin.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/aspectj-maven-plugin.git +Homepage: http://www.mojohaus.org/aspectj-maven-plugin/ Package: libaspectj-maven-plugin-java Architecture: all diff -Nru aspectj-maven-plugin-1.7/debian/copyright aspectj-maven-plugin-1.10/debian/copyright --- aspectj-maven-plugin-1.7/debian/copyright 2014-10-24 13:16:53.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/copyright 2017-08-30 21:51:19.000000000 +0000 @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: AspectJ compiler Maven Plugin Upstream-Contact: Kaare Nilsen -Source: http://mojo.codehaus.org/aspectj-maven-plugin +Source: https://github.com/mojohaus/aspectj-maven-plugin Files: * Copyright: 2005-2013, The Codehaus diff -Nru aspectj-maven-plugin-1.7/debian/libaspectj-maven-plugin-java.poms aspectj-maven-plugin-1.10/debian/libaspectj-maven-plugin-java.poms --- aspectj-maven-plugin-1.7/debian/libaspectj-maven-plugin-java.poms 2014-10-24 13:21:58.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/libaspectj-maven-plugin-java.poms 2017-08-30 22:02:56.000000000 +0000 @@ -25,4 +25,4 @@ # --site-xml=: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -pom.xml --no-parent --has-package-version +pom.xml --no-parent --has-package-version --keep-elements=profiles diff -Nru aspectj-maven-plugin-1.7/debian/maven.rules aspectj-maven-plugin-1.10/debian/maven.rules --- aspectj-maven-plugin-1.7/debian/maven.rules 2014-10-24 13:21:58.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/maven.rules 2017-08-30 21:51:19.000000000 +0000 @@ -2,6 +2,9 @@ s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * * s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * * s/aspectj/org.aspectj/ aspectjweaver jar s/.*/debian/ * * -junit junit jar s/.*/3.x/ * * +junit junit jar s/.*/4.x/ * * +org.apache.maven maven-* jar s/.*/3.x/ * * org.apache.maven.doxia doxia-site-renderer jar s/.*/debian/ * * +org.apache.maven.reporting maven-reporting-api jar s/.*/3.x/ * * org.apache.maven.reporting maven-reporting-impl jar s/.*/debian/ * * +org.codehaus.plexus plexus-utils * s/.*/2.x/ * * diff -Nru aspectj-maven-plugin-1.7/debian/orig-tar.sh aspectj-maven-plugin-1.10/debian/orig-tar.sh --- aspectj-maven-plugin-1.7/debian/orig-tar.sh 2014-10-24 13:16:53.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/orig-tar.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -#!/bin/sh -e - -VERSION=$2 -TAR=../aspectj-maven-plugin_$VERSION.orig.tar.xz -DIR=aspectj-maven-plugin-$VERSION -TAG=$(echo "aspectj-maven-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') - -svn export http://svn.codehaus.org/mojo/tags/${TAG}/ $DIR -XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR -rm -rf $DIR ../$TAG - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir && echo "moved $TAR to $origDir" -fi diff -Nru aspectj-maven-plugin-1.7/debian/rules aspectj-maven-plugin-1.10/debian/rules --- aspectj-maven-plugin-1.7/debian/rules 2014-10-24 13:36:32.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/rules 2017-08-30 21:51:19.000000000 +0000 @@ -1,12 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk - -JAVA_HOME := /usr/lib/jvm/default-java +%: + dh $@ get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -clean:: - rm -f test.lst + uscan --download-current-version --force-download --rename --repack --compression xz diff -Nru aspectj-maven-plugin-1.7/debian/watch aspectj-maven-plugin-1.10/debian/watch --- aspectj-maven-plugin-1.7/debian/watch 2014-10-24 13:16:53.000000000 +0000 +++ aspectj-maven-plugin-1.10/debian/watch 2017-08-30 21:51:19.000000000 +0000 @@ -1,4 +1,2 @@ version=3 -opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ - http://svn.codehaus.org/mojo/tags/ \ - aspectj-maven-plugin-(\d.*)/ debian debian/orig-tar.sh +https://github.com/mojohaus/aspectj-maven-plugin/tags .*/aspectj-maven-plugin-([\d\.]+).tar.gz diff -Nru aspectj-maven-plugin-1.7/.gitignore aspectj-maven-plugin-1.10/.gitignore --- aspectj-maven-plugin-1.7/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/.gitignore 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,296 @@ +# +# Standard gitignore file for Java and Maven development. +# + +### TortoiseGit ### +# Project-level settings +/.tgitconfig + +### OSX ### +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +### Windows ### +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + + +### Linux ### +*~ + +# KDE directory preferences +.directory + + +### Eclipse ### +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.project +.classpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + +### vim ### +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +*.un~ +Session.vim +.netrwhist +*~ + + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +### Karma ### +node/ +node_modules/ + + +### Java ### +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo +*.pot + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + + +### CVS ### +/CVS/* +*/CVS/* +.cvsignore +*/.cvsignore + + +### SVN ### +.svn/ + + +### Mercurial ### +/.hg/* +*/.hg/* +.hgignore + +### Windows ### +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + + +### Linux ### +*~ + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +### AspectJ ### +test.lst + diff -Nru aspectj-maven-plugin-1.7/pom.xml aspectj-maven-plugin-1.10/pom.xml --- aspectj-maven-plugin-1.7/pom.xml 2014-09-10 06:20:51.000000000 +0000 +++ aspectj-maven-plugin-1.10/pom.xml 2017-03-06 22:03:45.000000000 +0000 @@ -1,126 +1,120 @@ - 4.0.0 + 4.0.0 - - org.codehaus.mojo - mojo-parent - 33 - - - aspectj-maven-plugin - 1.7 - maven-plugin + + org.codehaus.mojo + mojo-parent + 40 + + + aspectj-maven-plugin + 1.10 + maven-plugin - Mojo's AspectJ Maven Plugin - + Mojo's AspectJ Maven Plugin + Handles AspectJ usage within Maven. Functionality provided is: weaving of aspects (or existing aspects from libraries) with the test and/or main classes, weaving of pre-existing jars and ajdoc reporting. - - http://mojo.codehaus.org/aspectj-maven-plugin - 2005 - - - The MIT License - LICENSE.txt - repo - - - - - 1.8.2 - 2.2.1 - 2.10 - 1.6 - - - - ${mavenVersion} - - - - scm:svn:http://svn.codehaus.org/mojo/tags/aspectj-maven-plugin-1.7 - scm:svn:https://svn.codehaus.org/mojo/tags/aspectj-maven-plugin-1.7 - - http://fisheye.codehaus.org/browse/mojo/tags/aspectj-maven-plugin-1.7 - - - jira - http://jira.codehaus.org/browse/MASPECTJ - - - bamboo - http://bamboo-ci.codehaus.org/browse/MOJO-MASPECTJ - - - mail - true - true - true - true - -
david@codehaus.org
- - - - - - - - kaare - Kaare Nilsen - kaare.nilsen@gmail.com - Arktekk - http://arktekk.no - - Java Developer - - +1 - - - Lennart Jörelid - lj@jguru.se - jGuru Europe AB - - Java Developer - - +1 - - - - - Thor Age Eldby - tel@objectnet.no - - Java Developer - - +1 - - - David J. M. Karlsen - david@codehaus.org - davidkarlsen.com - http://www.davidkarlsen.com - http://xircles.codehaus.org/users/david - - Java Developer - - +1 - - - Marvin Froeder - velo.br@gmail.com - -3 - - - Krzysztof Debski - kdebski85@gmail.com - +1 - - + + 2005 + + 1.8.9 + 3.0.5 + 1.6 + 1.7 + + ${project.build.directory}/staging/aspectj-maven-plugin + + + + ${mavenVersion} + + + + GitHub + https://github.com/mojohaus/aspectj-maven-plugin/issues/ + + + Travis-CI + https://travis-ci.org/mojohaus/aspectj-maven-plugin + + + + scm:git:https://github.com/mojohaus/aspectj-maven-plugin.git + scm:git:ssh://git@github.com/mojohaus/aspectj-maven-plugin.git + https://github.com/mojohaus/aspectj-maven-plugin + aspectj-maven-plugin-1.10 + + + + + kaare + Kaare Nilsen + kaare.nilsen@gmail.com + Arktekk + http://arktekk.no + + Java Developer + + +1 + + + Lennart Jörelid + lj@jguru.se + jGuru Europe AB + + Java Developer + + +1 + + + + + Thor Age Eldby + tel@objectnet.no + + Java Developer + + +1 + + + David J. M. Karlsen + david@davidkarlsen.com + davidkarlsen.com + http://www.davidkarlsen.com + + Java Developer + + +1 + + + Marvin Froeder + velo.br@gmail.com + -3 + + + Krzysztof Debski + kdebski85@gmail.com + +1 + + + + + com.sun + tools + ${java.version} + system + + ${java.home}/lib/rt.jar + + + + + org.codehaus.plexus @@ -129,39 +123,52 @@ org.apache.maven - maven-artifact + maven-core ${mavenVersion} + provided org.apache.maven maven-model ${mavenVersion} - - - org.apache.maven - maven-project - ${mavenVersion} + provided org.apache.maven.reporting maven-reporting-api - ${mavenVersion} + 3.0 org.apache.maven maven-plugin-api ${mavenVersion} + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + + org.apache.maven + maven-compat + ${mavenVersion} + + + org.apache.maven.doxia + doxia-sink-api + ${doxiaVersion} + org.apache.maven.doxia doxia-site-renderer - 1.1.2 + ${doxiaVersion} org.apache.maven.reporting maven-reporting-impl - 2.1 + 2.4 org.aspectj @@ -175,13 +182,6 @@ [DEBUG] Running : ajdoc -classpath [... a long classpath follows ...] ajdoc requires a JDK 1.4 or later tools jar - exiting --> - - com.sun - tools - ${java.version} - system - ${toolsjarSystemPath} - junit @@ -191,270 +191,220 @@ org.apache.maven.plugin-testing maven-plugin-testing-harness - 1.2 + 2.1 test - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.3 - - - help-mojo - - helpmojo - - - - - - org.apache.maven.plugins - maven-changes-plugin - ${changesPluginVersion} - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.3.1 - - - enforce-bytecode-version - - enforce - - - - - 1.6 - - com.sun:tools - - - - - - - - - org.codehaus.mojo - extra-enforcer-rules - 1.0-beta-2 - - - - - maven-surefire-plugin - 2.17 - - false - - **/test-project/**/*.java - **/parent-child-test-project/**/*.java - **/AbstractAjcMojoTest.java - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - run - - - - - src/it - ${project.build.directory}/it - verify - ${project.build.directory}/local-repo - - clean - test - - src/it/settings.xml - true - - - - - - com.github.jeluard - plantuml-maven-plugin - 7954 - - - ${basedir} - - src/site/**/*.puml - - - ${project.build.directory}/site/images/plantuml - - - - generate-plantuml-diagrams - - generate - - pre-site - - - - - net.sourceforge.plantuml - plantuml - 7985 - - - - - - - - - - maven-plugin-plugin - - - org.apache.maven.plugins - maven-changes-plugin - ${changesPluginVersion} - - Type,Key,Summary,Assignee,Status,Resolution,Created - true - - update - - 200 - true - Type,Key - - dev@mojo.codehaus.org - user@mojo.codehaus.org - users@maven.apache.org - aspectj-users@eclipse.org - - ${project.url} - - - - org.codehaus.mojo - l10n-maven-plugin - 1.0-alpha-2 - - - nl - sv - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - cim - dependency-info - index - issue-tracking - mailing-list - project-team - scm - summary - - - - - - - - + + + + org.apache.maven.plugins + maven-plugin-plugin + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-bytecode-version + + enforce + + + + + ${mojo.java.target} + + com.sun:tools + + + + + + + + + org.codehaus.mojo + extra-enforcer-rules + 1.0-beta-3 + + + + + maven-surefire-plugin + + false + + **/test-project/**/*.java + **/parent-child-test-project/**/*.java + **/AbstractAjcMojoTest.java + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + integration-test + + install + run + + + + + src/it + ${project.build.directory}/it + verify + ${project.build.directory}/local-repo + + clean + test + + src/it/settings.xml + true + + + + + + com.github.jeluard + plantuml-maven-plugin + 7954 + + + ${basedir} + + src/site/**/*.puml + + + ${project.build.directory}/site/images/plantuml + + + + generate-plantuml-diagrams + + generate + + pre-site + + + + + net.sourceforge.plantuml + plantuml + 7985 + + + + + + + + + + org.codehaus.mojo + l10n-maven-plugin + 1.0-alpha-2 + + + nl + sv + + + + + + + + + + standardToolsJar-profile + + true + + ${java.home}/../lib/tools.jar + + + + + com.sun + tools + system + ${java.home}/../lib/tools.jar + + + + + appleJdkToolsJar-profile + + false + + ${java.home}/../Classes/classes.jar + + + + + com.sun + tools + system + ${java.home}/../Classes/classes.jar + + + + + java8 + + 1.8 + + - - standardToolsJar-profile - - true - - ${java.home}/../lib/tools.jar - - - - ${java.home}/../lib/tools.jar - - - - appleJdkToolsJar-profile - - false - - ${java.home}/../Classes/classes.jar - - - - ${java.home}/../Classes/classes.jar - - - - - maven-repo-local - + -Xdoclint:none + + + + maven-repo-local + + + maven.repo.local + + + + + + maven-surefire-plugin + + - maven.repo.local + + maven.repo.local + ${maven.repo.local} - - - - - maven-surefire-plugin - - - - - maven.repo.local - ${maven.repo.local} - - - - - - - - + + + + + + + diff -Nru aspectj-maven-plugin-1.7/README.md aspectj-maven-plugin-1.10/README.md --- aspectj-maven-plugin-1.7/README.md 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/README.md 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,16 @@ +# Mojohaus AspectJ-Maven-Plugin + +This plugin weaves AspectJ aspects into your classes using the AspectJ compiler ("ajc"). +Typically, aspects are used in one of two ways within your Maven reactors: + + * As part of a Single Project, implying aspects and code are defined within the same Maven project. + This is the simplest approach to start out with; feel free to examine the + "Examples: Single-project AspectJ use" to better understand single-project use. + + * As part of a Multi-module Maven Reactor where one/some project(s) contains aspects and other + projects within the Maven reactor contain code using the aspects ("woven by the aspects"). + This is a more complex and powerful approach, best suited when several Maven projects should be woven + by a common set of aspects. The "Examples: Multi-module AspectJ use" contains a basic walkthrough + of this approach. + +[Plugin documentation - available shortly](http://www.mojohaus.org/aspectj-maven-plugin/) diff -Nru aspectj-maven-plugin-1.7/src/it/AjcTestCompilerUsingCorrectClasspath/verify.groovy aspectj-maven-plugin-1.10/src/it/AjcTestCompilerUsingCorrectClasspath/verify.groovy --- aspectj-maven-plugin-1.7/src/it/AjcTestCompilerUsingCorrectClasspath/verify.groovy 2011-02-10 23:14:55.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/AjcTestCompilerUsingCorrectClasspath/verify.groovy 2017-03-06 22:03:45.000000000 +0000 @@ -1,4 +1,4 @@ file = new File(basedir, "target/test-classes/builddef.lst") assert file.exists() -assert file.readLines().get(3) == '-classpath' -assert file.readLines().get(4).contains('junit') \ No newline at end of file +assert file.readLines().get(4) == '-classpath' +assert file.readLines().get(5).contains('junit') diff -Nru aspectj-maven-plugin-1.7/src/it/NoParameters/invoker.properties aspectj-maven-plugin-1.10/src/it/NoParameters/invoker.properties --- aspectj-maven-plugin-1.7/src/it/NoParameters/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/NoParameters/invoker.properties 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1 @@ +invoker.goals = clean compile \ No newline at end of file diff -Nru aspectj-maven-plugin-1.7/src/it/NoParameters/pom.xml aspectj-maven-plugin-1.10/src/it/NoParameters/pom.xml --- aspectj-maven-plugin-1.7/src/it/NoParameters/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/NoParameters/pom.xml 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,41 @@ + + 4.0.0 + org.codehaus.mjo.aspectj.it + parameters + 0.0.1-SNAPSHOT + + + + org.aspectj + aspectjrt + @aspectjVersion@ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + org.codehaus.mojo + aspectj-maven-plugin + @project.version@ + + + + compile + + + + + 1.5 + false + + + + + \ No newline at end of file diff -Nru aspectj-maven-plugin-1.7/src/it/NoParameters/src/main/aspect/Azpect.java aspectj-maven-plugin-1.10/src/it/NoParameters/src/main/aspect/Azpect.java --- aspectj-maven-plugin-1.7/src/it/NoParameters/src/main/aspect/Azpect.java 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/NoParameters/src/main/aspect/Azpect.java 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,39 @@ +/** + * The MIT License + * + * Copyright 2005-2006 The Codehaus. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; + +/** + * Testing of @AspectJ code style. + */ +@Aspect +public class Azpect +{ + @Before ("execution (* Clazz.print(..))") + public void trace() + { + System.out.println("Trace"); + } + +} \ No newline at end of file diff -Nru aspectj-maven-plugin-1.7/src/it/NoParameters/src/main/aspect/OldStyleAspect.aj aspectj-maven-plugin-1.10/src/it/NoParameters/src/main/aspect/OldStyleAspect.aj --- aspectj-maven-plugin-1.7/src/it/NoParameters/src/main/aspect/OldStyleAspect.aj 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/NoParameters/src/main/aspect/OldStyleAspect.aj 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,36 @@ +/** + * The MIT License + * + * Copyright 2005-2006 The Codehaus. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * Testing of pre @AspectJ code style. + */ +public aspect OldStyleAspect +{ + + pointcut oldStylePointcut():execution(* Clazz.print(..)); + + before() : oldStylePointcut(){ + System.out.println( "before print()" ); + } +} diff -Nru aspectj-maven-plugin-1.7/src/it/NoParameters/src/main/java/Clazz.java aspectj-maven-plugin-1.10/src/it/NoParameters/src/main/java/Clazz.java --- aspectj-maven-plugin-1.7/src/it/NoParameters/src/main/java/Clazz.java 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/NoParameters/src/main/java/Clazz.java 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,34 @@ +/** + * The MIT License + * + * Copyright 2005-2006 The Codehaus. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * The Class to get weaved + */ +public class Clazz +{ + public void print() + { + System.out.println( "Weave me" ); + } +} diff -Nru aspectj-maven-plugin-1.7/src/it/NoParameters/verify.groovy aspectj-maven-plugin-1.10/src/it/NoParameters/verify.groovy --- aspectj-maven-plugin-1.7/src/it/NoParameters/verify.groovy 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/NoParameters/verify.groovy 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,4 @@ +file = new File(basedir, "build.log") +assert file.exists() +assert !file.getText().contains("compiler errors:") +assert !(file.getText() =~ /Running : ajc .* -parameters .*/).matches() diff -Nru aspectj-maven-plugin-1.7/src/it/Parameters/invoker.properties aspectj-maven-plugin-1.10/src/it/Parameters/invoker.properties --- aspectj-maven-plugin-1.7/src/it/Parameters/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/Parameters/invoker.properties 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1 @@ +invoker.goals = clean compile \ No newline at end of file diff -Nru aspectj-maven-plugin-1.7/src/it/Parameters/pom.xml aspectj-maven-plugin-1.10/src/it/Parameters/pom.xml --- aspectj-maven-plugin-1.7/src/it/Parameters/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/Parameters/pom.xml 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,41 @@ + + 4.0.0 + org.codehaus.mjo.aspectj.it + parameters + 0.0.1-SNAPSHOT + + + + org.aspectj + aspectjrt + @aspectjVersion@ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + org.codehaus.mojo + aspectj-maven-plugin + @project.version@ + + + + compile + + + + + 1.5 + true + + + + + \ No newline at end of file diff -Nru aspectj-maven-plugin-1.7/src/it/Parameters/src/main/aspect/Azpect.java aspectj-maven-plugin-1.10/src/it/Parameters/src/main/aspect/Azpect.java --- aspectj-maven-plugin-1.7/src/it/Parameters/src/main/aspect/Azpect.java 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/Parameters/src/main/aspect/Azpect.java 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,39 @@ +/** + * The MIT License + * + * Copyright 2005-2006 The Codehaus. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; + +/** + * Testing of @AspectJ code style. + */ +@Aspect +public class Azpect +{ + @Before ("execution (* Clazz.print(..))") + public void trace() + { + System.out.println("Trace"); + } + +} \ No newline at end of file diff -Nru aspectj-maven-plugin-1.7/src/it/Parameters/src/main/aspect/OldStyleAspect.aj aspectj-maven-plugin-1.10/src/it/Parameters/src/main/aspect/OldStyleAspect.aj --- aspectj-maven-plugin-1.7/src/it/Parameters/src/main/aspect/OldStyleAspect.aj 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/Parameters/src/main/aspect/OldStyleAspect.aj 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,36 @@ +/** + * The MIT License + * + * Copyright 2005-2006 The Codehaus. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * Testing of pre @AspectJ code style. + */ +public aspect OldStyleAspect +{ + + pointcut oldStylePointcut():execution(* Clazz.print(..)); + + before() : oldStylePointcut(){ + System.out.println( "before print()" ); + } +} diff -Nru aspectj-maven-plugin-1.7/src/it/Parameters/src/main/java/Clazz.java aspectj-maven-plugin-1.10/src/it/Parameters/src/main/java/Clazz.java --- aspectj-maven-plugin-1.7/src/it/Parameters/src/main/java/Clazz.java 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/Parameters/src/main/java/Clazz.java 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,34 @@ +/** + * The MIT License + * + * Copyright 2005-2006 The Codehaus. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * The Class to get weaved + */ +public class Clazz +{ + public void print() + { + System.out.println( "Weave me" ); + } +} diff -Nru aspectj-maven-plugin-1.7/src/it/Parameters/verify.groovy aspectj-maven-plugin-1.10/src/it/Parameters/verify.groovy --- aspectj-maven-plugin-1.7/src/it/Parameters/verify.groovy 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/it/Parameters/verify.groovy 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,4 @@ +file = new File(basedir, "build.log") +assert file.exists() +assert !file.getText().contains("compiler errors:") +assert file.getText() =~ /Running : ajc .* -parameters .*/ diff -Nru aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java --- aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java 2014-09-09 16:04:50.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcCompiler.java 2017-03-06 22:03:45.000000000 +0000 @@ -27,6 +27,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Parameter; import org.aspectj.bridge.IMessage; import org.aspectj.tools.ajc.Main; import org.codehaus.plexus.util.FileUtils; @@ -46,7 +47,7 @@ /** * Base class for the two aspectJ compiletime weaving mojos. *

- * For all available options see {@link http://www.eclipse.org/aspectj/doc/released/devguide/ajc-ref.html} + * For all available options see ajc-ref * * @author Kaare Nilsen */ @@ -62,15 +63,15 @@ /** * The source directory for the aspects. * - * @parameter default-value="src/main/aspect" */ + @Parameter( defaultValue = "src/main/aspect" ) protected String aspectDirectory = "src/main/aspect"; /** * The source directory for the test aspects. * - * @parameter default-value="src/test/aspect" */ + @Parameter( defaultValue = "src/test/aspect" ) protected String testAspectDirectory = "src/test/aspect"; /** @@ -78,8 +79,8 @@ * specified all .java and .aj files in the project source directories, or directories specified by the ajdtDefFile * property are included. * - * @parameter */ + @Parameter protected String[] includes; /** @@ -87,39 +88,58 @@ * specified all .java and .aj files in the project source directories, or directories specified by the ajdtDefFile * property are included. * - * @parameter */ + @Parameter protected String[] excludes; /** * Where to find the ajdt build definition file. If set this will override the use of project sourcedirs. * - * @parameter */ + @Parameter protected String ajdtBuildDefFile; /** * Generate aop.xml file for load-time weaving with default name (/META-INF/aop.xml). * - * @parameter */ + @Parameter protected boolean outxml; /** * Generate aop.xml file for load-time weaving with custom name. * - * @parameter */ + @Parameter protected String outxmlfile; /** * Generate .ajesym symbol files for emacs support. * - * @parameter */ + @Parameter protected boolean emacssym; /** + * Set the compiler "proc" argument. + * Aspectj supports Annotation processing since 1.8.2, it can been disabled by proc:none. + * + * @parameter + * @see AspectJ 1.8.2 Release notes + * @see Annotation Processing + */ + @Parameter + protected String proc; + + /** + * Set the compiler "parameters" argument. + * + */ + @Parameter + protected boolean parameters; + + + /** * Allows the caller to provide additional arguments in a Map format. For example: * 

      * <configuration>
@@ -130,24 +150,24 @@
      * </configuration>
      *
* - * @parameter * @since 1.5 */ + @Parameter protected Map Xset; /** * generate .ajsym file into the output directory * - * @parameter */ + @Parameter protected boolean crossrefs; /** * Set default level for messages about potential programming mistakes in crosscutting code. {level} may be ignore, * warning, or error. This overrides entries in org/aspectj/weaver/XlintDefault.properties from aspectjtools.jar. * - * @parameter */ + @Parameter protected String Xlint; /** @@ -155,8 +175,8 @@ * PropertyFile is a path to a Java .properties file that takes the same property names and values as * org/aspectj/weaver/XlintDefault.properties from aspectjtools.jar, which it also overrides. * - * @parameter */ + @Parameter protected File Xlintfile; /** @@ -164,16 +184,16 @@ * within declare statements. It's experimental and undocumented because it may change, and because it doesn't yet * take into account ITDs. * - * @parameter * @since 1.3 */ + @Parameter protected boolean XhasMember; /** * Specify classfile target setting (1.1 to 1.8) default is 1.2 * - * @parameter default-value="${project.build.java.target}" */ + @Parameter( defaultValue = "${project.build.java.target}" ) protected String target; /** @@ -182,80 +202,80 @@ * as a keyword and implement assertions according to the 1.4 language spec. When using -source 1.5 or higher, Java * 5 language features are permitted. With --source 1.7 or higher Java 7 features are supported. * - * @parameter default-value="${mojo.java.target}" */ + @Parameter( defaultValue = "${mojo.java.target}" ) protected String source; /** * Specify compiler compliance setting. * Defaults to 1.4, with permitted values ("1.3", "1.4", "1.5", "1.6" and "1.7", "1.8"). * - * @parameter default-value="1.4" * @see org.codehaus.mojo.aspectj.AjcHelper#ACCEPTED_COMPLIANCE_LEVEL_VALUES */ + @Parameter( defaultValue = "1.4" ) protected String complianceLevel; /** * Toggle warning messages on deprecations * - * @parameter */ + @Parameter protected boolean deprecation; /** * Emit no errors for unresolved imports; * - * @parameter */ + @Parameter protected boolean noImportError; /** * Keep compiling after error, dumping class files with problem methods * - * @parameter */ + @Parameter protected boolean proceedOnError; /** * Preserve all local variables during code generation (to facilitate debugging). * - * @parameter */ + @Parameter protected boolean preserveAllLocals; /** * Compute reference information. * - * @parameter */ + @Parameter protected boolean referenceInfo; /** * Specify default source encoding format. * - * @parameter property="project.build.sourceEncoding" */ + @Parameter( property = "project.build.sourceEncoding" ) protected String encoding; /** * Emit messages about accessed/processed compilation units * - * @parameter */ + @Parameter protected boolean verbose; /** * Emit messages about weaving * - * @parameter */ + @Parameter protected boolean showWeaveInfo; /** * Repeat compilation process N times (typically to do performance analysis). * - * @parameter */ + @Parameter protected int repeat; /** @@ -263,51 +283,51 @@ * subject to the restriction that on attempting a reweave all the types that advised the woven type must be * accessible. * - * @parameter */ + @Parameter protected boolean Xreweavable; /** * (Experimental) Create class files that can't be subsequently rewoven by AspectJ. * - * @parameter */ + @Parameter protected boolean XnotReweavable; /** * (Experimental) do not inline around advice * - * @parameter */ + @Parameter protected boolean XnoInline; /** * (Experimental) Normally it is an error to declare aspects {@link Serializable}. This option removes that restriction. * - * @parameter */ + @Parameter protected boolean XserializableAspects; /** * Causes the compiler to calculate and add the SerialVersionUID field to any type implementing {@link Serializable} that is * affected by an aspect. The field is calculated based on the class before weaving has taken place. * - * @parameter */ + @Parameter protected boolean XaddSerialVersionUID; /** * Causes compiler to terminate before weaving * - * @parameter */ + @Parameter protected boolean XterminateAfterCompilation; /** * (Experimental) Allows code to be generated that targets a 1.2 or a 1.5 level AspectJ runtime (default 1.5) * - * @parameter default="1.5" */ + @Parameter( defaultValue = "1.5" ) protected String Xajruntimetarget; /** @@ -315,8 +335,8 @@ * that can be identified by pointcuts. Values are: * arrayconstruction, synchronization * - * @parameter */ + @Parameter protected String Xjoinpoints; /** @@ -324,8 +344,8 @@ * argument containing a list of paths to zip files or directories, delimited by the platform-specific path * delimiter. * - * @parameter */ + @Parameter protected String bootclasspath; /** @@ -352,9 +372,9 @@ *
suppress all compiler warnings
* * - * @parameter * @see Eclipse AJC reference */ + @Parameter protected String warn; /** @@ -377,15 +397,15 @@ * * * - * @parameter default-value="builddef.lst" */ + @Parameter( defaultValue = "builddef.lst" ) protected String argumentFileName = "builddef.lst"; /** * Forces re-compilation, regardless of whether the compiler arguments or the sources have changed. * - * @parameter default-value="false" */ + @Parameter( defaultValue = "false" ) protected boolean forceAjcCompile; /** @@ -521,7 +541,7 @@ ajcMain.setHolder(mavenMessageHandler); synchronized (BIG_ASPECTJ_LOCK) { - ajcMain.runMain((String[]) ajcOptions.toArray(new String[ajcOptions.size()]), false); + ajcMain.runMain(ajcOptions.toArray(new String[ajcOptions.size()]), false); } IMessage[] errors = mavenMessageHandler.getMessages(IMessage.ERROR, true); @@ -560,6 +580,10 @@ ajcOptions.add("-warn:" + warn); } + if (null != proc) { + ajcOptions.add("-proc:" + proc); + } + if (Xset != null && !Xset.isEmpty()) { StringBuilder sb = new StringBuilder("-Xset:"); for (Map.Entry param : Xset.entrySet()) { @@ -769,6 +793,12 @@ } + public void setParameters(boolean parameters) { + if (parameters) { + ajcOptions.add("-parameters"); + } + } + public void setCrossrefs(boolean crossrefs) { if (crossrefs) { ajcOptions.add("-crossrefs"); diff -Nru aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcMojo.java aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcMojo.java --- aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcMojo.java 2013-08-16 20:06:52.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AbstractAjcMojo.java 2017-03-06 22:03:45.000000000 +0000 @@ -25,6 +25,7 @@ */ import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import java.io.File; @@ -33,7 +34,7 @@ * The base class. * * @author Juraj Burian - * @version $Revision: 18621 $ by $Author: lennartj $ + * @version $Revision$ by $Author$ */ public abstract class AbstractAjcMojo extends AbstractMojo { @@ -41,36 +42,32 @@ /** * The maven project. * - * @parameter default-value="${project}" - * @required - * @readonly */ + @Parameter( required = true, readonly = true, defaultValue = "${project}" ) protected MavenProject project; /** * The basedir of the project. * - * @parameter default-value="${basedir}" - * @required - * @readonly */ + @Parameter( required = true, readonly = true, defaultValue = "${basedir}" ) protected File basedir; /** * List of of modules to weave (into target directory). Corresponds to ajc * -inpath option (or -injars for pre-1.2 (which is not supported)). * - * @parameter */ + @Parameter protected Module[] weaveDependencies; /** * List of of directories with .class files to weave (into target directory). * Corresponds to ajc -inpath option. * - * @parameter * @since 1.4 */ + @Parameter protected String[] weaveDirectories; /** @@ -79,24 +76,24 @@ * The modules must also be dependencies of the project. * Corresponds to ajc -aspectpath option * - * @parameter */ + @Parameter protected Module[] aspectLibraries; /** * Parameter which indicates an XML file containing AspectJ weaving instructions. * Assigning this plugin parameter adds the -xmlConfigured option to ajc. * - * @parameter * @see http://www.eclipse.org/aspectj/doc/next/devguide/ajc-ref.html */ + @Parameter protected File xmlConfigured; /** * Skip plugin execution. * - * @parameter default-value="false" property="aspectj.skip" */ + @Parameter( defaultValue = "false", property = "aspectj.skip" ) private boolean skip; /** diff -Nru aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AjcCompileMojo.java aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AjcCompileMojo.java --- aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AjcCompileMojo.java 2013-08-25 08:44:01.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AjcCompileMojo.java 2017-03-06 22:03:45.000000000 +0000 @@ -28,19 +28,20 @@ import java.util.Collections; import java.util.List; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.Scanner; /** * Weaves all main classes. * - * @goal compile - * @requiresDependencyResolution compile - * @phase compile * @description AspectJ Compiler Plugin. * @author Kaare Nilsen - * @threadSafe */ +@Mojo( name="compile", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true ) public class AjcCompileMojo extends AbstractAjcCompiler { @@ -48,10 +49,8 @@ /** * The directory for compiled classes. * - * @parameter default-value="${project.build.outputDirectory}" - * @required - * @readonly */ + @Parameter( readonly = true, required = true, defaultValue = "${project.build.outputDirectory}" ) private File outputDirectory; /** @@ -64,10 +63,10 @@ * Otherwise specify the source folder(s) to use. *

* - * @parameter * @since 1.4 * @see DirectoryScanner */ + @Parameter private Scanner[] sources; protected File getOutputDirectory() diff -Nru aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AjcReportMojo.java aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AjcReportMojo.java --- aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AjcReportMojo.java 2014-09-10 06:15:43.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AjcReportMojo.java 2017-03-06 22:03:45.000000000 +0000 @@ -28,6 +28,10 @@ import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.doxia.siterenderer.Renderer; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; @@ -46,60 +50,52 @@ * Creates an AspectJ HTML report using the {@code ajdoc} tool and format. * * @author Kaare Nilsen - * @requiresDependencyResolution compile * @description A Maven 2.0 ajdoc report - * @goal aspectj-report */ +@Mojo( name="aspectj-report", requiresDependencyResolution = ResolutionScope.COMPILE ) public class AjcReportMojo extends AbstractMavenReport { /** * The source directory for the aspects * - * @parameter default-value="src/main/aspect" */ + @Parameter( defaultValue = "src/main/aspect" ) private String aspectDirectory = "src/main/aspect"; /** * The source directory for the test aspects * - * @parameter default-value="src/test/aspect" */ + @Parameter( defaultValue = "src/test/aspect" ) private String testAspectDirectory = "src/test/aspect"; /** * The maven project. * - * @parameter default-value="${project}" - * @required - * @readonly */ + @Parameter( readonly = true, required = true, defaultValue = "${project}" ) private MavenProject project; /** * The basedir of the project. * - * @parameter default-value="${basedir}" - * @required - * @readonly */ + @Parameter( readonly = true, required = true, defaultValue = "${basedir}" ) private File basedir; /** * The output directory for the report. * - * @parameter default-value="${project.reporting.outputDirectory}/aspectj-report" - * @required */ + @Parameter( required = true, defaultValue = "${project.reporting.outputDirectory}/aspectj-report" ) private File outputDirectory; /** * The build directory (normally "${basedir}/target"). * - * @parameter default-value="${project.build.directory}" - * @required - * @readonly */ + @Parameter( required = true, readonly = true, defaultValue = "${project.build.directory}" ) private File buildDirectory; /** @@ -119,43 +115,43 @@ /** * Where to find the ajdt build definition file. If set this will override the use of project sourcedirs. * - * @parameter */ + @Parameter private String ajdtBuildDefFile; /** * Doxia Site Renderer. * - * @component */ + @Component private Renderer siteRenderer; /** * Shows only package, protected, and public classes and members. * - * @parameter */ + @Parameter protected boolean packageScope; /** * Shows only protected and public classes and members. This is the default. * - * @parameter */ + @Parameter protected boolean protectedScope; /** * Shows all classes and members. * - * @parameter */ + @Parameter protected boolean privateScope; /** * Shows only public classes and members. * - * @parameter */ + @Parameter protected boolean publicScope; /** @@ -170,8 +166,8 @@ * if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) The title on the * overview page is set by -doctitle. * - * @parameter */ + @Parameter protected String overview; /** @@ -180,8 +176,8 @@ * space, though if it does, it must be enclosed in quotes. Any internal quotation marks within title may have to be * escaped. * - * @parameter */ + @Parameter protected String doctitle; /** @@ -189,15 +185,15 @@ * the source files, generating the documentation (one message per source file), and sorting. The verbose option * causes the printing of additional messages specifying the number of milliseconds to parse each java source file. * - * @parameter */ + @Parameter protected boolean verbose; /** * Specify compiler compliance setting (1.3 to 1.8, default is 1.5) * - * @parameter default-value="${mojo.java.target}" */ + @Parameter( defaultValue = "${mojo.java.target}" ) protected String complianceLevel; /** @@ -206,10 +202,8 @@ private List ajcOptions = new ArrayList(); /** - * @parameter default-value="${plugin.artifacts}" - * @required - * @readonly */ + @Parameter( readonly = true, required = true, defaultValue = "${plugin.artifacts}" ) private List pluginArtifacts; /** diff -Nru aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AjcTestCompileMojo.java aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AjcTestCompileMojo.java --- aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/AjcTestCompileMojo.java 2013-08-25 08:44:01.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/AjcTestCompileMojo.java 2017-03-06 22:03:45.000000000 +0000 @@ -28,46 +28,48 @@ import java.util.ArrayList; import java.util.List; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.Scanner; /** * Weaves all test classes. * - * @goal test-compile - * @requiresDependencyResolution test - * @phase test-compile * @description AspectJ Compiler Plugin. * @author Kaare Nilsen - * @threadSafe */ +@Mojo( name="test-compile", threadSafe = true, defaultPhase = LifecyclePhase.TEST_COMPILE, requiresDependencyResolution = ResolutionScope.TEST ) public class AjcTestCompileMojo extends AbstractAjcCompiler { + protected static final String MAVEN_TEST_SKIP = "maven.test.skip"; + /** * Flag to indicate if the main source dirs should be a part of the compile process. * Note! This will make all classes in main source dir appear in the * test output dir also, potentially overwriting test resources. * - * @parameter default-value="false" */ + @Parameter( defaultValue = "false" ) protected boolean weaveMainSourceFolder = false; /** * Flag to indicate if aspects in the the main source dirs * should be a part of the compile process * - * @parameter default-value="true" */ + @Parameter( defaultValue = "true" ) protected boolean weaveWithAspectsInMainSourceFolder = true; /** * The directory where compiled test classes go. * - * @parameter default-value="${project.build.testOutputDirectory}" - * @required - * @readonly */ + @Parameter( readonly = true, required = true, defaultValue = "${project.build.testOutputDirectory}" ) private File outputDirectory; /** @@ -80,13 +82,24 @@ * Otherwise specify the test source folder(s) to use. *

* - * @parameter * @since 1.4 * @see DirectoryScanner */ + @Parameter private Scanner[] testSources; @Override + public void execute() throws MojoExecutionException + { + if (isSkipTestCompile()) + { + getLog().info("Not compiling test sources"); + return; + } + super.execute(); + } + + @Override protected List getClasspathDirectories() { List outputDirectories = new ArrayList(); @@ -128,4 +141,10 @@ } return additionalPath; } + + private boolean isSkipTestCompile() + { + String skipTestCompile = System.getProperty(MAVEN_TEST_SKIP); + return Boolean.parseBoolean(skipTestCompile); + } } diff -Nru aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/EclipseAjcMojo.java aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/EclipseAjcMojo.java --- aspectj-maven-plugin-1.7/src/main/java/org/codehaus/mojo/aspectj/EclipseAjcMojo.java 2013-08-16 20:06:52.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/main/java/org/codehaus/mojo/aspectj/EclipseAjcMojo.java 2017-03-06 22:03:45.000000000 +0000 @@ -26,6 +26,8 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.codehaus.plexus.util.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -53,10 +55,10 @@ * Create eclipse configuration of aspectJ * * @author Juraj Burian - * @version $Revision: 18621 $ by $Author: lennartj $ (at)goal eclipse - * @requiresDependencyResolution compile + * @version $Revision$ by $Author$ (at)goal eclipse * @description create eclipse configuration of aspectJ */ +@Mojo( name="EclipseAjcMojo", requiresDependencyResolution = ResolutionScope.COMPILE ) public class EclipseAjcMojo extends AbstractAjcMojo { diff -Nru aspectj-maven-plugin-1.7/src/site/apt/ajc_reference/standard_opts.apt aspectj-maven-plugin-1.10/src/site/apt/ajc_reference/standard_opts.apt --- aspectj-maven-plugin-1.7/src/site/apt/ajc_reference/standard_opts.apt 2014-09-09 03:42:14.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/site/apt/ajc_reference/standard_opts.apt 2017-03-06 22:03:45.000000000 +0000 @@ -36,6 +36,9 @@ -sourceroots compile all .aj and .java files in ( uses classpath delimiter) -crossrefs generate .ajsym file into the output directory + -parameters stores formal parameter names of constructors and methods + in the generated class file so that the method + java.lang.reflect.Executable.getParameters from the Reflection API can retrieve them. -emacssym generate .ajesym symbol files for emacs support -Xlint same as '-Xlint:warning' -Xlint: set default level for crosscutting messages diff -Nru aspectj-maven-plugin-1.7/src/test/java/org/codehaus/mojo/aspectj/AjcTestCompileMojoTest.java aspectj-maven-plugin-1.10/src/test/java/org/codehaus/mojo/aspectj/AjcTestCompileMojoTest.java --- aspectj-maven-plugin-1.7/src/test/java/org/codehaus/mojo/aspectj/AjcTestCompileMojoTest.java 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/src/test/java/org/codehaus/mojo/aspectj/AjcTestCompileMojoTest.java 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,27 @@ +package org.codehaus.mojo.aspectj; + +import org.apache.maven.plugin.testing.AbstractMojoTestCase; + +public class AjcTestCompileMojoTest extends AbstractMojoTestCase +{ + + public void testExecuteWithSkip() throws Exception { + final AjcTestCompileMojo testSubject = new AjcTestCompileMojo(); + System.setProperty(AjcTestCompileMojo.MAVEN_TEST_SKIP, "true"); + testSubject.execute(); + } + + public void testExecuteWithoutSkip() throws Exception { + final AjcTestCompileMojo testSubject = new AjcTestCompileMojo(); + + try + { + testSubject.execute(); + } + catch (Exception e) + { + // should throw exception, as superclass executes + // and no setup has been done. + } + } +} \ No newline at end of file diff -Nru aspectj-maven-plugin-1.7/.travis.yml aspectj-maven-plugin-1.10/.travis.yml --- aspectj-maven-plugin-1.7/.travis.yml 1970-01-01 00:00:00.000000000 +0000 +++ aspectj-maven-plugin-1.10/.travis.yml 2017-03-06 22:03:45.000000000 +0000 @@ -0,0 +1,20 @@ +language: java +jdk: + - oraclejdk7 + - oraclejdk8 +addons: + apt: + packages: + - graphviz +install: "mvn --show-version --errors --batch-mode validate dependency:go-offline" +script: "mvn --show-version --errors --batch-mode clean install site" +cache: + directories: + - $HOME/.m2 +branches: + except: + - gh-pages +notifications: + email: + - lennartj@gmail.com + - david@davidkarlsen.com