Skip to content

Commit 09dd290

Browse files
chrfrantzchrfrantz
committed
Refined build files and cleaned up.
1 parent e10f1c5 commit 09dd290

3 files changed

Lines changed: 42 additions & 508 deletions

File tree

‎pom-root.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<properties>
2323
<maven.compiler.source>1.8</maven.compiler.source>
2424
<maven.compiler.target>1.8</maven.compiler.target>
25-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2626
</properties>
27-
27+
2828
<dependencies>
2929
<dependency>
3030
<groupId>com.github.chrfrantz</groupId>
@@ -38,10 +38,10 @@
3838
<scope>test</scope>
3939
</dependency>
4040
</dependencies>
41-
41+
4242
<build>
4343
<finalName>dbscan</finalName>
44-
<resources>
44+
<resources>
4545
<resource>
4646
<directory>src/test</directory>
4747
<excludes>
@@ -50,13 +50,13 @@
5050
</resource>
5151
</resources>
5252
<plugins>
53-
<plugin>
53+
<plugin>
5454
<groupId>org.apache.maven.plugins</groupId>
5555
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>3.6.0</version>
56+
<version>3.6.0</version>
5757
<executions>
5858
<!-- Prevent test compilation as of missing dependency in NetLogoLite.jar -->
59-
<execution>
59+
<execution>
6060
<id>default-testCompile</id>
6161
<phase>test-compile</phase>
6262
<configuration>
@@ -70,16 +70,16 @@
7070
</execution>
7171
</executions>
7272
</plugin>
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-jar-plugin</artifactId>
76-
<version>3.0.2</version>
77-
<configuration>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-jar-plugin</artifactId>
76+
<version>3.0.2</version>
77+
<configuration>
7878
<archive>
7979
<manifestFile>src/main/resources/manifest.txt</manifestFile>
8080
</archive>
8181
</configuration>
82-
</plugin>
82+
</plugin>
8383
</plugins>
8484
</build>
8585

‎pom-v6.xml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<version>0.1</version>
99
<relativePath>pom-root.xml</relativePath>
1010
</parent>
11-
11+
1212
<groupId>org.nlogo.extensions.dbscan</groupId>
1313
<artifactId>dbscan-NetLogo6</artifactId>
1414
<version>0.1</version>
15-
<packaging>jar</packaging>
16-
15+
<packaging>jar</packaging>
16+
1717
<dependencies>
1818
<dependency>
1919
<groupId>NetLogo</groupId>
@@ -26,11 +26,11 @@
2626
<version>2.12.0</version>
2727
</dependency>
2828
</dependencies>
29-
29+
3030
<build>
3131
<plugins>
32-
<!-- Make copy of source files (and recovery afterwards) before applying syntax changes to accommodate NetLogo Extensions API v6 -->
33-
<plugin>
32+
<!-- Make copy of source files (and recovery afterwards) before applying syntax changes to accommodate NetLogo Extensions API v6 -->
33+
<plugin>
3434
<artifactId>maven-antrun-plugin</artifactId>
3535
<version>1.4</version>
3636
<executions>
@@ -39,9 +39,9 @@
3939
<phase>generate-sources</phase>
4040
<configuration>
4141
<tasks>
42-
<copy file="src/main/java/org/nlogo/extensions/dbscan/DBSCANExtension.java" tofile="src/main/java/org/nlogo/extensions/dbscan/DBSCANExtension.bak"/>
43-
<copy file="src/test/java/org/nlogo/extensions/dbscan/TestNetLogoDBSCAN.java" tofile="src/test/java/org/nlogo/extensions/dbscan/TestNetLogoDBSCAN.bak"/>
44-
<copy file="src/main/resources/manifest.txt" tofile="src/main/resources/manifest.bak"/>
42+
<copy file="src/main/java/org/nlogo/extensions/dbscan/DBSCANExtension.java" tofile="tmp/DBSCANExtension.bak"/>
43+
<copy file="src/test/java/org/nlogo/extensions/dbscan/TestNetLogoDBSCAN.java" tofile="tmp/TestNetLogoDBSCAN.bak"/>
44+
<copy file="src/main/resources/manifest.txt" tofile="tmp/manifest.bak"/>
4545
</tasks>
4646
</configuration>
4747
<goals>
@@ -50,12 +50,12 @@
5050
</execution>
5151
<execution>
5252
<id>restore-source-file</id>
53-
<phase>test</phase>
53+
<phase>package</phase>
5454
<configuration>
5555
<tasks>
56-
<move file="src/main/java/org/nlogo/extensions/dbscan/DBSCANExtension.bak" tofile="src/main/java/org/nlogo/extensions/dbscan/DBSCANExtension.java"/>
57-
<move file="src/test/java/org/nlogo/extensions/dbscan/TestNetLogoDBSCAN.bak" tofile="src/test/java/org/nlogo/extensions/dbscan/TestNetLogoDBSCAN.java"/>
58-
<move file="src/main/resources/manifest.bak" tofile="src/main/resources/manifest.txt"/>
56+
<move file="tmp/DBSCANExtension.bak" tofile="src/main/java/org/nlogo/extensions/dbscan/DBSCANExtension.java"/>
57+
<move file="tmp/TestNetLogoDBSCAN.bak" tofile="src/test/java/org/nlogo/extensions/dbscan/TestNetLogoDBSCAN.java"/>
58+
<move file="tmp/manifest.bak" tofile="src/main/resources/manifest.txt"/>
5959
</tasks>
6060
</configuration>
6161
<goals>
@@ -64,21 +64,21 @@
6464
</execution>
6565
</executions>
6666
</plugin>
67-
<!-- Replacing syntax to accommodate NetLogo Extensions API v6 -->
67+
<!-- Replacing syntax to accommodate NetLogo Extensions API v6 -->
6868
<plugin>
69-
<groupId>com.google.code.maven-replacer-plugin</groupId>
70-
<artifactId>replacer</artifactId>
71-
<version>1.5.3</version>
72-
<executions>
73-
<execution>
74-
<phase>process-sources</phase>
75-
<goals>
76-
<goal>replace</goal>
69+
<groupId>com.google.code.maven-replacer-plugin</groupId>
70+
<artifactId>replacer</artifactId>
71+
<version>1.5.3</version>
72+
<executions>
73+
<execution>
74+
<phase>process-sources</phase>
75+
<goals>
76+
<goal>replace</goal>
7777
</goals>
7878
</execution>
79-
</executions>
79+
</executions>
8080
<configuration>
81-
<includes>
81+
<includes>
8282
<include>${basedir}/src/main/java/org/nlogo/extensions/dbscan/DBSCANExtension.java</include>
8383
<include>${basedir}/src/test/java/org/nlogo/extensions/dbscan/TestNetLogoDBSCAN.java</include>
8484
<include>${basedir}/src/main/resources/manifest.txt</include>
@@ -96,7 +96,7 @@
9696
<token>import org.nlogo.api.DefaultReporter;</token>
9797
<value>import org.nlogo.api.Reporter;</value>
9898
</replacement>
99-
<replacement>
99+
<replacement>
100100
<token>import org.nlogo.api.Syntax;</token>
101101
<value>import org.nlogo.core.Syntax;
102102
import org.nlogo.core.SyntaxJ;</value>
@@ -109,10 +109,10 @@ import org.nlogo.core.SyntaxJ;</value>
109109
<token>extends DefaultReporter</token>
110110
<value>implements Reporter</value>
111111
</replacement>
112-
<replacement>
113-
<token>java-netlogo-clustering-test-v5.nlogo</token>
114-
<value>java-netlogo-clustering-test-v6.nlogo</value>
115-
</replacement>
112+
<replacement>
113+
<token>java-netlogo-clustering-test-v5.nlogo</token>
114+
<value>java-netlogo-clustering-test-v6.nlogo</value>
115+
</replacement>
116116
</replacements>
117117
</configuration>
118118
</plugin>

0 commit comments

Comments
 (0)