diff options
| author | Andy Clement <aclement@pivotal.io> | 2019-03-07 11:50:24 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2019-03-07 11:50:24 -0800 |
| commit | 370f291c359cd159c5f3f0abd6e9e53e81234a07 (patch) | |
| tree | 8a1631f75b36bc1504bdb0d0405d2e21a270d690 | |
| parent | 7d2e6a2aee648599c19a0fb4d84bb787704b3bc2 (diff) | |
| download | aspectj-370f291c359cd159c5f3f0abd6e9e53e81234a07.tar.gz aspectj-370f291c359cd159c5f3f0abd6e9e53e81234a07.zip | |
1.9.3.RC1 final bitsV1_9_3RC1
4 files changed, 44 insertions, 1 deletions
@@ -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 diff --git a/docs/dist/doc/README-193.html b/docs/dist/doc/README-193.html new file mode 100644 index 000000000..6bcf89e75 --- /dev/null +++ b/docs/dist/doc/README-193.html @@ -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> diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java index 25557035a..e7419680e 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java @@ -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()); diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java index f7f3908c3..b12dc4fe8 100644 --- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java +++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java @@ -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); } } |