Skip to content

Commit b25a523

Browse files
beperevbeperev
authored
Merge pull request #1 from kriegaex/master
Fix Maven problems concerning AspectJ
2 parents 3c132d5 + c720473 commit b25a523

File tree

2 files changed

+99
-84
lines changed

2 files changed

+99
-84
lines changed

‎.gitignore‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
# Compiled class file
2-
*.class
1+
# Eclipse
2+
.settings/
3+
.classpath
4+
.project
5+
6+
# IntelliJ IDEA
7+
.idea/
8+
*.iml
9+
10+
# Maven
11+
target/
312

413
# Log file
514
*.log
@@ -19,13 +28,5 @@
1928
*.tar.gz
2029
*.rar
2130

22-
# Eclipse files and folders #
23-
.project
24-
.classpath
25-
/target/
26-
/bin/
27-
.settings
28-
29-
3031
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
3132
hs_err_pid*

‎pom.xml‎

Lines changed: 88 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,88 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>prbd</groupId>
6-
<artifactId>pr</artifactId>
7-
<version>0.0.1-SNAPSHOT</version>
8-
<name>Assignment</name>
9-
10-
<properties>
11-
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
12-
</properties>
13-
14-
<dependencies>
15-
<dependency>
16-
<groupId>org.aspectj</groupId>
17-
<artifactId>aspectjrt</artifactId>
18-
<version>1.9.5</version>
19-
</dependency>
20-
<dependency>
21-
<groupId>junit</groupId>
22-
<artifactId>junit</artifactId>
23-
<version>4.12</version>
24-
<scope>test</scope>
25-
</dependency>
26-
</dependencies>
27-
28-
<build>
29-
<pluginManagement>
30-
<plugins>
31-
32-
<plugin>
33-
<groupId>org.codehaus.mojo</groupId>
34-
<artifactId>aspectj-maven-plugin</artifactId>
35-
<version>1.11</version>
36-
<configuration>
37-
<complianceLevel>1.8</complianceLevel>
38-
<source>1.8</source>
39-
<target>1.8</target>
40-
</configuration>
41-
<executions>
42-
<execution>
43-
<!-- IMPORTANT -->
44-
<phase>process-sources</phase>
45-
<goals>
46-
<goal>compile</goal>
47-
<goal>test-compile</goal>
48-
</goals>
49-
</execution>
50-
</executions>
51-
</plugin>
52-
53-
<plugin>
54-
<artifactId>maven-compiler-plugin</artifactId>
55-
<version>${maven.compiler.plugin.version}</version>
56-
<configuration>
57-
<source>1.8</source>
58-
<target>1.8</target>
59-
<!-- IMPORTANT -->
60-
<useIncrementalCompilation>false</useIncrementalCompilation>
61-
</configuration>
62-
</plugin>
63-
64-
<plugin>
65-
<groupId>org.codehaus.mojo</groupId>
66-
<artifactId>exec-maven-plugin</artifactId>
67-
<version>1.6.0</version>
68-
69-
</plugin>
70-
71-
</plugins>
72-
</pluginManagement>
73-
</build>
74-
</project>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>prbd</groupId>
6+
<artifactId>pr</artifactId>
7+
<version>0.0.1-SNAPSHOT</version>
8+
<name>Assignment</name>
9+
10+
<properties>
11+
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
12+
</properties>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.aspectj</groupId>
17+
<artifactId>aspectjrt</artifactId>
18+
<version>1.8.13</version>
19+
</dependency>
20+
<dependency>
21+
<groupId>junit</groupId>
22+
<artifactId>junit</artifactId>
23+
<version>4.12</version>
24+
<scope>test</scope>
25+
</dependency>
26+
</dependencies>
27+
28+
<build>
29+
<pluginManagement>
30+
<plugins>
31+
32+
<plugin>
33+
<groupId>org.codehaus.mojo</groupId>
34+
<artifactId>aspectj-maven-plugin</artifactId>
35+
<version>1.11</version>
36+
<configuration>
37+
<complianceLevel>1.8</complianceLevel>
38+
<source>1.8</source>
39+
<target>1.8</target>
40+
</configuration>
41+
<executions>
42+
<execution>
43+
<!-- IMPORTANT -->
44+
<phase>process-sources</phase>
45+
<goals>
46+
<goal>compile</goal>
47+
<goal>test-compile</goal>
48+
</goals>
49+
</execution>
50+
</executions>
51+
</plugin>
52+
53+
<plugin>
54+
<artifactId>maven-compiler-plugin</artifactId>
55+
<version>${maven.compiler.plugin.version}</version>
56+
<configuration>
57+
<source>1.8</source>
58+
<target>1.8</target>
59+
<!-- IMPORTANT -->
60+
<useIncrementalCompilation>false</useIncrementalCompilation>
61+
</configuration>
62+
</plugin>
63+
64+
<plugin>
65+
<groupId>org.codehaus.mojo</groupId>
66+
<artifactId>exec-maven-plugin</artifactId>
67+
<version>1.6.0</version>
68+
</plugin>
69+
70+
</plugins>
71+
</pluginManagement>
72+
73+
<plugins>
74+
<plugin>
75+
<groupId>org.codehaus.mojo</groupId>
76+
<artifactId>aspectj-maven-plugin</artifactId>
77+
</plugin>
78+
<plugin>
79+
<artifactId>maven-compiler-plugin</artifactId>
80+
</plugin>
81+
<plugin>
82+
<groupId>org.codehaus.mojo</groupId>
83+
<artifactId>exec-maven-plugin</artifactId>
84+
</plugin>
85+
</plugins>
86+
87+
</build>
88+
</project>

0 commit comments

Comments
 (0)