Skip to content
Snippets Groups Projects
Commit 70f8782b authored by Markus Alexander Kuppe's avatar Markus Alexander Kuppe
Browse files

[Build] Upgrade AspectJ to its 1.8 release to be compatibility with Java 8.

parent 23e3af26
No related branches found
No related tags found
No related merge requests found
...@@ -22,3 +22,4 @@ workspace/ ...@@ -22,3 +22,4 @@ workspace/
states/ states/
.DS_Store .DS_Store
screenshots/ screenshots/
ajcore.*.txt
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.8.2</version> <version>1.8.5</version>
</dependency> </dependency>
<!-- Down below we manually install the standalone feature. Maven/Tycho isn't <!-- Down below we manually install the standalone feature. Maven/Tycho isn't
smart enough to figure this out by itself. Thus, we have to tell Tycho smart enough to figure this out by itself. Thus, we have to tell Tycho
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"> <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
<classpath> <classpath>
<pathelement location="lib/aspectjtools.jar" /> <pathelement location="lib/aspectjtools-1.8.5.jar" />
</classpath> </classpath>
</taskdef> </taskdef>
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
<iajc destdir="${class.dir}" sourceRoots="${src-aj.dir}" debug="true" source="1.5" target="1.5"> <iajc destdir="${class.dir}" sourceRoots="${src-aj.dir}" debug="true" source="1.5" target="1.5">
<classpath refid="project.classpath" /> <classpath refid="project.classpath" />
<classpath> <classpath>
<pathelement location="lib/aspectjrt.jar" /> <pathelement location="lib/aspectjrt-1.8.5.jar" />
<pathelement location="lib/aspectjtools.jar" /> <pathelement location="lib/aspectjtools-1.8.5.jar" />
<pathelement path="${class.dir}" /> <pathelement path="${class.dir}" />
</classpath> </classpath>
</iajc> </iajc>
...@@ -107,8 +107,8 @@ ...@@ -107,8 +107,8 @@
<!-- These files are requried for load time weaving and during runtime --> <!-- These files are requried for load time weaving and during runtime -->
<copy todir="${class.dir}/lib"> <copy todir="${class.dir}/lib">
<fileset dir="lib/"> <fileset dir="lib/">
<include name="aspectjrt.jar" /> <include name="aspectjrt-1.8.5.jar" />
<include name="aspectjweaver.jar" /> <include name="aspectjweaver-1.8.5.jar" />
</fileset> </fileset>
</copy> </copy>
</target> </target>
......
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment