Andy Clement
5 years ago
4 changed files with 44 additions and 1 deletions
+ 3
- 0
README.md
View File
| @@ -22,3 +22,6 @@ This will build all the modules, run all the tests and install the key artifacts | |||
| Once you have imported all the projects using `m2e`, close the `org.eclipse.jdt.core` project (TOBEFIXED), then there is a special module called `run-all-junit-tests` and within that a `RunTheseBeforeYouCommitTests` class that can be run with the JUnit launcher. This will execute all the tests in each module plus the compiler tests in the `tests` module. When you close `org.eclipse.jdt.core` you might need to do a maven refresh on the `run-all-junit-tests` project. | |||
| ## Setting version for release: | |||
| mvn versions:set -DgroupId=org.aspectj -DartifactId=* -DoldVersion=1.9.3.BUILD-SNAPSHOT -DnewVersion=1.9.3 | |||
+ 30
- 0
docs/dist/doc/README-193.html
View File
| @@ -0,0 +1,30 @@ | |||
| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> | |||
| <html> <head> | |||
| <title>AspectJ 1.9.3 Readme</title> | |||
| <style type="text/css"> | |||
| <!-- | |||
| P { margin-left: 20px; } | |||
| PRE { margin-left: 20px; } | |||
| LI { margin-left: 20px; } | |||
| H4 { margin-left: 20px; } | |||
| H3 { margin-left: 10px; } | |||
| --> | |||
| </style> | |||
| </head> | |||
| <body> | |||
| <div align="right"><small> | |||
| © Copyright 2018 Contributors. | |||
| All rights reserved. | |||
| </small></div> | |||
| <p>The full list of resolved issues in 1.9.3 is available | |||
| <a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f0=OP&f1=OP&f3=CP&f4=CP&j1=OR&list_id=16866879&product=AspectJ&query_format=advanced&target_milestone=1.9.3">here</a></h2>.</p> | |||
| <p>Available: 1.9.3.RC1 available 7-Mar-2019</p> | |||
| <br><br> | |||
| <!-- ============================== --> | |||
| </body> | |||
| </html> | |||
+ 8
- 1
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
View File
| @@ -1340,6 +1340,13 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour | |||
| if (buildConfig == null || buildConfig.getFullClasspath() == null) { | |||
| return "no classpath specified"; | |||
| } | |||
| for (String s: buildConfig.getFullClasspath()) { | |||
| if (s.endsWith("runtime/target/classes")) { | |||
| // doing an AspectJ build | |||
| return null; | |||
| } | |||
| } | |||
| String ret = null; | |||
| for (Iterator<String> it = buildConfig.getFullClasspath().iterator(); it.hasNext();) { | |||
| @@ -1362,7 +1369,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour | |||
| } | |||
| } | |||
| // assume that users of development aspectjrt.jar know what they're doing | |||
| if (Version.DEVELOPMENT.equals(version)) { | |||
| if (Version.DEVELOPMENT.equals(version) || version.endsWith("BUILD-SNAPSHOT")) { | |||
| // MessageUtil.info(holder, | |||
| // "running with development version of aspectjrt.jar in " + | |||
| // p.getAbsolutePath()); | |||
+ 3
- 0
taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
View File
| @@ -1027,6 +1027,9 @@ public class AjcTaskTest extends TestCase { | |||
| holder, | |||
| kind + " expected " + num + " got " + actual); | |||
| } | |||
| if (num != actual){ | |||
| System.out.println("===\n"+Arrays.toString(holder.getMessages(kind, false))+"\n===\n"); | |||
| } | |||
| assertEquals(kind.toString(), num, actual); | |||
| } | |||
| } | |||
Loading…