Fix AspectJ basics

plexus-compiler-its/pom.xml

@@ -39,7 +39,8 @@
               <goal>verify</goal>
             </goals>
             <configuration>
-              <debug>true</debug>
+              <debug>false</debug>
+              <streamLogsOnFailures>true</streamLogsOnFailures>
               <projectsDirectory>src/main/it</projectsDirectory>
               <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
               <postBuildHookScript>verify</postBuildHookScript>

plexus-compiler-its/src/main/it/aspectj-compiler/invoker.properties

@@ -0,0 +1,20 @@
+# 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.
+
+invoker.java.version = 1.8+
+invoker.goals = clean test
+#invoker.buildResult = failure

plexus-compiler-its/src/main/it/aspectj-compiler/pom.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<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.apache.maven.plugins.compiler.it</groupId>
+  <artifactId>aspectj-compiler</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <compilerId>aspectj</compilerId>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-api</artifactId>
+            <version>@pom.version@</version>
+          </dependency>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-aspectj</artifactId>
+            <version>@pom.version@</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>@junit.version@</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>@aspectj.version@</version>
+    </dependency>
+  </dependencies>
+</project>

plexus-compiler-its/src/main/it/aspectj-compiler/src/main/java/org/acme/Application.java

@@ -0,0 +1,12 @@
+package org.acme;
+
+public class Application {
+  public static void main(String[] args) {
+    System.out.println("Running application");
+    new Application().greet(args[0]);
+  }
+
+  public String greet(String name) {
+    return "Hello " + name;
+  }
+}

plexus-compiler-its/src/main/it/aspectj-compiler/src/main/java/org/acme/MyAnnotationDrivenAspect.aj

@@ -0,0 +1,13 @@
+package org.acme;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+
+@Aspect
+public class MyAnnotationDrivenAspect {
+  @Before("execution(static * *(..)) && within(Application)")
+  public void myAdvice(JoinPoint joinPoint) {
+    System.out.println(joinPoint);
+  }
+}

plexus-compiler-its/src/main/it/aspectj-compiler/src/main/java/org/acme/MyNativeAspect.aj

@@ -0,0 +1,7 @@
+package org.acme;
+
+public aspect MyNativeAspect {
+  before() : execution(!static * *(..)) && within(Application) {
+    System.out.println(thisJoinPoint);
+  }
+}

plexus-compiler-its/src/main/it/aspectj-compiler/src/main/java/org/acme/do-not-try-to-compile.txt

@@ -0,0 +1,7 @@
+The Apache Maven Compiler (MC) API only allows a single source file extension, such as '.java'.
+The AspectJ Compiler (AJC) should consider two default extensions, though: '.java' and '.aj'.
+In order to achieve that, the Plexus AJC component tells MC to give it all files,
+subsequently filtering for those two extensions.
+
+The purpose of this file is to make sure that even though MC finds it in the source folder,
+Plexus AJC filters it out and AJC does not try to compile it. 

plexus-compiler-its/src/main/it/aspectj-compiler/src/test/java/org/acme/ApplicationTest.java

@@ -0,0 +1,19 @@
+package org.acme;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ApplicationTest {
+  @Test
+  public void testGreet() {
+    assertEquals("Hello Jane", new Application().greet("Jane"));
+  }
+
+  @Test
+  public void testMain() {
+    Application.main(new String[] { "Joe" });
+    assertTrue(true);
+  }
+}

plexus-compiler-its/src/main/it/aspectj-compiler/src/test/java/org/acme/TestAspect.java

@@ -0,0 +1,13 @@
+package org.acme;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+
+@Aspect
+public class TestAspect {
+  @Before("call(* *(..)) && !within(TestAspect)")
+  public void beforeCall(JoinPoint joinPoint) {
+    System.out.println(joinPoint);
+  }
+}

plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy

@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+def logFile = new File( basedir, 'build.log' )
+assert logFile.exists()
+content = logFile.text.normalize()
+
+def junitLog = """Running org.acme.ApplicationTest
+call(String org.acme.Application.greet(String))
+execution(String org.acme.Application.greet(String))
+call(void org.junit.Assert.assertEquals(Object, Object))
+call(void org.acme.Application.main(String[]))
+execution(void org.acme.Application.main(String[]))
+Running application
+execution(String org.acme.Application.greet(String))
+call(void org.junit.Assert.assertTrue(boolean))
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0""".normalize()
+
+assert content.contains( junitLog )

plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml

@@ -38,7 +38,8 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>@junit.version@</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

plexus-compiler-its/src/main/it/simple-javac/pom.xml

@@ -37,7 +37,8 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>@junit.version@</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

plexus-compilers/plexus-compiler-aspectj/pom.xml

@@ -13,10 +13,6 @@
   <name>Plexus AspectJ Compiler</name>
   <description>AspectJ Compiler support for Plexus Compiler component.</description>
 
-  <properties>
-    <aspectj.version>1.9.6</aspectj.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>