Skip to content

Commit e9083de

Browse files
committed
[refactor] Remove AOP
1 parent 18413ce commit e9083de

File tree

2 files changed

+0
-61
lines changed

2 files changed

+0
-61
lines changed

exist-core/pom.xml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,6 @@
415415
<version>${apache.xmlrpc.version}</version>
416416
</dependency>
417417

418-
<dependency>
419-
<groupId>org.aspectj</groupId>
420-
<artifactId>aspectjrt</artifactId>
421-
<version>${aspectj.version}</version>
422-
</dependency>
423-
424418
<dependency>
425419
<groupId>org.eclipse.jetty</groupId>
426420
<artifactId>jetty-jaas</artifactId>
@@ -1744,60 +1738,6 @@ The BaseX Team. The original license statement is also included below.]]></pream
17441738
</executions>
17451739
</plugin>
17461740

1747-
<plugin>
1748-
<groupId>com.nickwongdev</groupId>
1749-
<artifactId>aspectj-maven-plugin</artifactId>
1750-
<version>1.12.6</version>
1751-
<dependencies>
1752-
<dependency>
1753-
<groupId>org.aspectj</groupId>
1754-
<artifactId>aspectjtools</artifactId>
1755-
<version>${aspectj.version}</version>
1756-
</dependency>
1757-
</dependencies>
1758-
<executions>
1759-
<execution>
1760-
<goals>
1761-
<goal>compile</goal>
1762-
</goals>
1763-
1764-
<!-- Compile and weave aspects after all classes compiled by javac -->
1765-
<!-- phase>process-classes</phase>
1766-
<goals>
1767-
<goal>compile</goal>
1768-
</goals -->
1769-
1770-
<configuration>
1771-
<forceAjcCompile>true</forceAjcCompile> <!-- Required, otherwise the Aspects are not re-compiled when the src/main/java is recompiled for the test phase -->
1772-
<showWeaveInfo>true</showWeaveInfo>
1773-
<complianceLevel>${project.build.source}</complianceLevel>
1774-
<source>${project.build.source}</source>
1775-
<target>${project.build.target}</target>
1776-
<!-- sources>
1777-
<source>
1778-
<basedir>${project.build.sourceDirectory}</basedir>
1779-
<includes>
1780-
<include>**/PermissionRequiredAspect.java</include>
1781-
</includes>
1782-
<excludes>
1783-
<exclude>**/EnsureLockingAspect.java</exclude>
1784-
</excludes>
1785-
</source>
1786-
</sources -->
1787-
1788-
<!-- weaveDirectories>
1789-
<weaveDirectory>${project.build.directory}/classes</weaveDirectory>
1790-
</weaveDirectories -->
1791-
1792-
<excludes>
1793-
<!-- excluded by default, as only really needed for debugging lock ownership issues -->
1794-
<exclude>**/EnsureLockingAspect.java</exclude>
1795-
</excludes>
1796-
</configuration>
1797-
</execution>
1798-
</executions>
1799-
</plugin>
1800-
18011741
<plugin>
18021742
<groupId>org.apache.maven.plugins</groupId>
18031743
<artifactId>maven-javadoc-plugin</artifactId>

exist-parent/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
<apache.httpcomponents.core.version>4.4.16</apache.httpcomponents.core.version>
9595
<apache.xmlrpc.version>4.0.0</apache.xmlrpc.version>
9696
<appassembler.version>2.1.0</appassembler.version>
97-
<aspectj.version>1.9.8.M1</aspectj.version>
9897
<exquery.distribution.version>0.2.1</exquery.distribution.version>
9998
<icu.version>59.1</icu.version>
10099
<izpack.version>5.2.4</izpack.version>

0 commit comments

Comments
 (0)