diff options
| author | Andy Clement <aclement@gopivotal.com> | 2014-04-21 15:13:19 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2014-04-21 15:13:19 -0700 |
| commit | 144a6294884029d2a5a2a67d0e792b8507a7e897 (patch) | |
| tree | 80ce5284801dc7b6e2421dcbaf081d5b1724e17d /build/usedForMavenUpload/aspectjrt.pom | |
| parent | a9da693f8a3016edf96cfe4b29d304afdfb6b1b8 (diff) | |
| parent | 5a5bef1efd1026ee508fddff9be0632af68ba984 (diff) | |
| download | aspectj-144a6294884029d2a5a2a67d0e792b8507a7e897.tar.gz aspectj-144a6294884029d2a5a2a67d0e792b8507a7e897.zip | |
Merge branch 'BETA_JAVA8'
Conflicts:
build/usedForMavenUpload/aspectjrt.pom
build/usedForMavenUpload/aspectjtools.pom
build/usedForMavenUpload/aspectjweaver.pom
docs/dist/doc/README-174.html
docs/dist/doc/index.html
lib/asm/build.xml
org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
weaver/.classpath
weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
Diffstat (limited to 'build/usedForMavenUpload/aspectjrt.pom')
| -rw-r--r-- | build/usedForMavenUpload/aspectjrt.pom | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/usedForMavenUpload/aspectjrt.pom b/build/usedForMavenUpload/aspectjrt.pom index 0a7b0ec50..e5d94b827 100644 --- a/build/usedForMavenUpload/aspectjrt.pom +++ b/build/usedForMavenUpload/aspectjrt.pom @@ -5,7 +5,7 @@ <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> <packaging>jar</packaging> - <version>1.7.4.BUILD-SNAPSHOT</version> + <version>1.8.0.BUILD-SNAPSHOT</version> <name>AspectJ runtime</name> <description>The runtime needed to execute a program using AspectJ</description> <url>http://www.aspectj.org</url> |