Skip to content

Commit cb5df6c

Browse files
authored
Merge pull request #2238 from adamretter/feature/aspectj-1.9.2-4.x.x
(4.x.x) Update to AspectJ 1.9.2
2 parents c873144 + d37a4d6 commit cb5df6c

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<classpathentry kind="lib" path="tools/ant/lib/ant-1.10.2.jar"/>
115115
<classpathentry kind="lib" path="tools/ant/lib/ant-antunit-1.3.jar"/>
116116
<classpathentry kind="lib" path="tools/ant/lib/ant-launcher-1.10.2.jar"/>
117-
<classpathentry kind="lib" path="tools/aspectj/lib/aspectjrt-1.9.1.jar"/>
117+
<classpathentry kind="lib" path="tools/aspectj/lib/aspectjrt-1.9.2.jar"/>
118118
<classpathentry kind="lib" path="lib/core/cglib-nodep-3.2.6.jar"/>
119119
<classpathentry kind="lib" path="lib/core/clj-ds-0.0.4.jar"/>
120120
<classpathentry kind="lib" path="lib/core/commons-codec-1.11.jar"/>

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/scripts/build-impl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</fileset>
100100
</path>
101101

102-
<taskdef classpath="${tools.aspectj}/lib/aspectjtools-1.9.1.jar" resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"/>
102+
<taskdef classpath="${tools.aspectj}/lib/aspectjtools-1.9.2.jar" resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"/>
103103
<path id="classpath.aspectj">
104104
<fileset dir="${tools.aspectj}/lib">
105105
<include name="*.jar"/>

nbproject/project.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ file.reference.jdom-1.1.jar=extensions/webdav/lib/jdom-1.1.jar
170170
test.src5.dir=extensions/indexes/ngram/test/src
171171
jnlp.signing.keystore=
172172
build.dir=nbproject/build
173-
file.reference.aspectjtools-1.9.1.jar=tools/aspectj/lib/aspectjtools-1.9.1.jar
173+
file.reference.aspectjtools-1.9.2.jar=tools/aspectj/lib/aspectjtools-1.9.2.jar
174174
application.title=eXist-db
175175
jmx.rmi.use.port=true
176176
file.reference.jetty-io-9.4.10.v20180503.jar=tools/jetty/lib/jetty-io-9.4.10.v20180503.jar
@@ -195,12 +195,12 @@ file.reference.ws-commons-util-1.0.2.jar=lib/core/ws-commons-util-1.0.2.jar
195195
file.reference.xmlunit-core-2.6.0.jar=lib/test/xmlunit-core-2.6.0.jar
196196
file.reference.xmlunit-legacy-2.6.0.jar=lib/test/xmlunit-legacy-2.6.0.jar
197197
file.reference.xmlunit-matchers-2.6.0.jar=lib/test/xmlunit-matchers-2.6.0.jar
198-
file.reference.aspectjweaver-1.9.1.jar=tools/aspectj/lib/aspectjweaver-1.9.1.jar
198+
file.reference.aspectjweaver-1.9.2.jar=tools/aspectj/lib/aspectjweaver-1.9.2.jar
199199
file.reference.commons-logging-1.2.jar=lib/core/commons-logging-1.2.jar
200200
file.reference.xqjapi-1.0-fr.jar=lib/optional/xqjapi-1.0-fr.jar
201201
test.eXist-1.32.dir=${file.reference.test-src-1}
202202
file.reference.log4j-jul-2.11.0.jar=lib/core/log4j-jul-2.11.0.jar
203-
file.reference.aspectjrt-1.9.1.jar=tools/aspectj/lib/aspectjrt-1.9.1.jar
203+
file.reference.aspectjrt-1.9.2.jar=tools/aspectj/lib/aspectjrt-1.9.2.jar
204204
excludes=**/spatial/*,**/modules/svn/*,**/modules/xmpp/**, **/xmlcalabash/**, **/xslfo/**,**/cssparser/**,**/oracle/**,**/memcached/**,**/cqlparser/**,**/contentextraction/**
205205
jnlp.descriptor=application
206206
file.reference.exquery-annotations-common-api-1.0-SNAPSHOT.jar=extensions/exquery/lib/exquery-annotations-common-api-1.0-SNAPSHOT.jar
@@ -331,9 +331,9 @@ javac.classpath=\
331331
${file.reference.hamcrest-core-1.3.jar}:\
332332
${file.reference.ant-1.10.2.jar}:\
333333
${file.reference.xmlunit-1.6.jar}:\
334-
${file.reference.aspectjtools-1.9.1.jar}:\
335-
${file.reference.aspectjrt-1.9.1.jar}:\
336-
${file.reference.aspectjweaver-1.9.1.jar}:\
334+
${file.reference.aspectjtools-1.9.2.jar}:\
335+
${file.reference.aspectjrt-1.9.2.jar}:\
336+
${file.reference.aspectjweaver-1.9.2.jar}:\
337337
${file.reference.existdb-favicon.jar}:\
338338
${file.reference.javax.annotation-api-1.2.jar}:\
339339
${file.reference.jetty-annotations-9.4.10.v20180503.jar}:\
117 KB
Binary file not shown.
13 MB
Binary file not shown.
1.94 MB
Binary file not shown.

0 commit comments

Comments
 (0)