]> source.dussan.org Git - aspectj.git/commitdiff
1.9.3.RC1 final bits V1_9_3RC1
authorAndy Clement <aclement@pivotal.io>
Thu, 7 Mar 2019 19:50:24 +0000 (11:50 -0800)
committerAndy Clement <aclement@pivotal.io>
Thu, 7 Mar 2019 19:50:24 +0000 (11:50 -0800)
README.md
docs/dist/doc/README-193.html [new file with mode: 0644]
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java

index 2ec5a574e1847382808980998fe83f0b2213bf7a..871f341afaa815dceb15298d0c50528f9161fc80 100644 (file)
--- a/README.md
+++ b/README.md
@@ -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 (file)
index 0000000..6bcf89e
--- /dev/null
@@ -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>
+&copy; 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>
index 25557035aa3dce6a99de1cca30e25638fd86da24..e7419680ee95fefb25e2d5e9372e5e653828b21f 100644 (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());
index f7f3908c3ca694110e6e66e24a9e150518385c22..b12dc4fe8ab8d8481006df2441edee79f8a609a1 100644 (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);
                                }
                        }