Skip to content

Commit f307e9b

Browse files
committed
[refactor] Remove AOP
1 parent 3bf9db6 commit f307e9b

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
@@ -456,12 +456,6 @@
456456
<version>${apache.xmlrpc.version}</version>
457457
</dependency>
458458

459-
<dependency>
460-
<groupId>org.aspectj</groupId>
461-
<artifactId>aspectjrt</artifactId>
462-
<version>${aspectj.version}</version>
463-
</dependency>
464-
465459
<dependency>
466460
<groupId>org.eclipse.jetty</groupId>
467461
<artifactId>jetty-jaas</artifactId>
@@ -1844,60 +1838,6 @@ The BaseX Team. The original license statement is also included below.]]></pream
18441838
</executions>
18451839
</plugin>
18461840

1847-
<plugin>
1848-
<groupId>dev.aspectj</groupId>
1849-
<artifactId>aspectj-maven-plugin</artifactId>
1850-
<version>1.14.1</version>
1851-
<dependencies>
1852-
<dependency>
1853-
<groupId>org.aspectj</groupId>
1854-
<artifactId>aspectjtools</artifactId>
1855-
<version>${aspectj.version}</version>
1856-
</dependency>
1857-
</dependencies>
1858-
<executions>
1859-
<execution>
1860-
<goals>
1861-
<goal>compile</goal>
1862-
</goals>
1863-
1864-
<!-- Compile and weave aspects after all classes compiled by javac -->
1865-
<!-- phase>process-classes</phase>
1866-
<goals>
1867-
<goal>compile</goal>
1868-
</goals -->
1869-
1870-
<configuration>
1871-
<forceAjcCompile>true</forceAjcCompile> <!-- Required, otherwise the Aspects are not re-compiled when the src/main/java is recompiled for the test phase -->
1872-
<showWeaveInfo>true</showWeaveInfo>
1873-
<complianceLevel>${project.build.source}</complianceLevel>
1874-
<source>${project.build.source}</source>
1875-
<target>${project.build.target}</target>
1876-
<!-- sources>
1877-
<source>
1878-
<basedir>${project.build.sourceDirectory}</basedir>
1879-
<includes>
1880-
<include>**/PermissionRequiredAspect.java</include>
1881-
</includes>
1882-
<excludes>
1883-
<exclude>**/EnsureLockingAspect.java</exclude>
1884-
</excludes>
1885-
</source>
1886-
</sources -->
1887-
1888-
<!-- weaveDirectories>
1889-
<weaveDirectory>${project.build.directory}/classes</weaveDirectory>
1890-
</weaveDirectories -->
1891-
1892-
<excludes>
1893-
<!-- excluded by default, as only really needed for debugging lock ownership issues -->
1894-
<exclude>**/EnsureLockingAspect.java</exclude>
1895-
</excludes>
1896-
</configuration>
1897-
</execution>
1898-
</executions>
1899-
</plugin>
1900-
19011841
<plugin>
19021842
<groupId>org.apache.maven.plugins</groupId>
19031843
<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>5.0.0</apache.xmlrpc.version>
9696
<appassembler.version>2.1.0</appassembler.version>
97-
<aspectj.version>1.9.24</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)