Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add javaModules and enablePreview options #100

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# MIT License
#
# Copyright 2021 Mojohaus
#
# 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.

name: GitHub CI

Expand Down
19 changes: 10 additions & 9 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
The MIT License
MIT License

Copyright 2005-2006 The Codehaus.
Copyright 2005-2015 Mojo@Codehaus
Copyright 2015-2021 Mojohaus

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:
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.
Expand All @@ -18,4 +19,4 @@ 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.
SOFTWARE.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Mojohaus AspectJ-Maven-Plugin
# Mojohaus AspectJ Maven Plugin

This is the [aspectj-maven-plugin](https://www.mojohaus.org/aspectj-maven-plugin/).

Expand All @@ -8,7 +8,7 @@ This is the [aspectj-maven-plugin](https://www.mojohaus.org/aspectj-maven-plugin

## Overview

This plugin weaves AspectJ aspects into your classes using the AspectJ compiler ("ajc").
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.
Expand All @@ -18,7 +18,7 @@ Typically, aspects are used in one of two ways within your Maven reactors:
* 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
by a common set of aspects. The "Examples: Multi-module AspectJ use" contains a basic walk-through
of this approach.

## Contributing
Expand Down
4 changes: 2 additions & 2 deletions src/it/LineNumbersInAjcWarnings/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>WarningMessagesWithLineNumbers</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -41,4 +41,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions src/it/NoParameters/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>parameters</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -41,4 +41,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions src/it/Parameters/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>parameters</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -41,4 +41,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions src/it/TOFIX_MASPECTJ-4/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>maspectj-4</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -67,4 +67,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions src/it/Xajruntimetarget/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>xajruntimetarget</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -41,4 +41,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions src/it/XhasMember/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>xhasmember</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -41,4 +41,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions src/it/Xlint/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>xlint</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -41,4 +41,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions src/it/Xlintfile/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.mjo.aspectj.it</groupId>
<groupId>org.codehaus.mojo.aspectj.it</groupId>
<artifactId>xlintfile</artifactId>
<version>0.0.1-SNAPSHOT</version>

Expand Down Expand Up @@ -41,4 +41,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Loading