Skip to content

Commit 169068f

Browse files
jstreejstree
committed
Merge remote-tracking branch 'origin/master'
2 parents ff7b126 + b669681 commit 169068f

File tree

7 files changed

+53
-59
lines changed

7 files changed

+53
-59
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/.settings/
22
/.project/
33
/.idea/
4-
/*.iml
4+
/*.iml
5+
/*.classpath
6+
/*.project
7+
/target/

‎core-module/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/.settings/
22
/.project/
33
/.idea/
4-
/*.iml
4+
/*.iml
5+
/*.classpath
6+
/*.project
7+
/target/

‎core-module/pom.xml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,28 +79,6 @@
7979
</execution>
8080
</executions>
8181
</plugin>
82-
<plugin>
83-
<groupId>net.alchim31.maven</groupId>
84-
<artifactId>scala-maven-plugin</artifactId>
85-
<version>3.2.2</version>
86-
<executions>
87-
<execution>
88-
<id>scala-compile-first</id>
89-
<phase>process-resources</phase>
90-
<goals>
91-
<goal>add-source</goal>
92-
<goal>compile</goal>
93-
</goals>
94-
</execution>
95-
<execution>
96-
<id>scala-test-compile</id>
97-
<phase>process-test-resources</phase>
98-
<goals>
99-
<goal>testCompile</goal>
100-
</goals>
101-
</execution>
102-
</executions>
103-
</plugin>
10482
<plugin>
10583
<groupId>com.github.wvengen</groupId>
10684
<artifactId>proguard-maven-plugin</artifactId>

‎lib-module/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/.settings/
22
/.project/
33
/.idea/
4-
/*.iml
4+
/*.iml
5+
/*.classpath
6+
/*.project
7+
/target/

‎web-module/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/.settings/
22
/.project/
33
/.idea/
4-
/*.iml
4+
/*.iml
5+
/*.classpath
6+
/*.project
7+
/target/

‎web-module/pom.xml‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<executions>
105105
<execution>
106106
<id>unpack-copy</id>
107-
<phase>initialize</phase>
107+
<phase>generate-resources</phase>
108108
<goals>
109109
<goal>unpack</goal>
110110
</goals>
@@ -169,28 +169,6 @@
169169
</archive>
170170
</configuration>
171171
</plugin>
172-
<plugin>
173-
<groupId>net.alchim31.maven</groupId>
174-
<artifactId>scala-maven-plugin</artifactId>
175-
<version>3.2.2</version>
176-
<executions>
177-
<execution>
178-
<id>scala-compile-first</id>
179-
<phase>process-resources</phase>
180-
<goals>
181-
<goal>add-source</goal>
182-
<goal>compile</goal>
183-
</goals>
184-
</execution>
185-
<execution>
186-
<id>scala-test-compile</id>
187-
<phase>process-test-resources</phase>
188-
<goals>
189-
<goal>testCompile</goal>
190-
</goals>
191-
</execution>
192-
</executions>
193-
</plugin>
194172
<plugin>
195173
<groupId>org.apache.maven.plugins</groupId>
196174
<artifactId>maven-compiler-plugin</artifactId>
@@ -254,5 +232,41 @@
254232
</configuration>
255233
</plugin>
256234
</plugins>
235+
<pluginManagement>
236+
<plugins>
237+
<!--This plugin's configuration is used to store Eclipse m2e settings
238+
only. It has no influence on the Maven build itself. -->
239+
<plugin>
240+
<groupId>org.eclipse.m2e</groupId>
241+
<artifactId>lifecycle-mapping</artifactId>
242+
<version>1.0.0</version>
243+
<configuration>
244+
<lifecycleMappingMetadata>
245+
<pluginExecutions>
246+
<pluginExecution>
247+
<pluginExecutionFilter>
248+
<groupId>
249+
org.apache.maven.plugins
250+
</groupId>
251+
<artifactId>
252+
maven-dependency-plugin
253+
</artifactId>
254+
<versionRange>
255+
[2.6,)
256+
</versionRange>
257+
<goals>
258+
<goal>unpack</goal>
259+
</goals>
260+
</pluginExecutionFilter>
261+
<action>
262+
<execute />
263+
</action>
264+
</pluginExecution>
265+
</pluginExecutions>
266+
</lifecycleMappingMetadata>
267+
</configuration>
268+
</plugin>
269+
</plugins>
270+
</pluginManagement>
257271
</build>
258272
</project>

‎web-module/src/main/scala/egovframework/com/ext/jstree/study.scala‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)