Skip to content

Commit 46a0310

Browse files
committed
Updated Maven plugin versions
1 parent 5d8f103 commit 46a0310

File tree

3 files changed

+17
-30
lines changed

3 files changed

+17
-30
lines changed

BNCompiler/pom.xml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,11 @@
4646
<build>
4747
<plugins>
4848

49-
<!-- compilation settings -->
50-
<plugin>
51-
<groupId>org.apache.maven.plugins</groupId>
52-
<artifactId>maven-compiler-plugin</artifactId>
53-
<version>3.1</version>
54-
<configuration>
55-
<source>1.6</source>
56-
<target>1.6</target>
57-
<showWarnings>true</showWarnings>
58-
<showDeprecation>true</showDeprecation>
59-
<!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
60-
</configuration>
61-
</plugin>
62-
6349
<!-- adds classpath and main class to the JAR manifest -->
6450
<plugin>
6551
<groupId>org.apache.maven.plugins</groupId>
6652
<artifactId>maven-jar-plugin</artifactId>
67-
<version>2.5</version>
53+
<version>2.6</version>
6854
<configuration>
6955
<archive>
7056
<manifest>
@@ -96,7 +82,7 @@
9682
<!-- prepares folder structure ready for distribution -->
9783
<plugin>
9884
<artifactId>maven-assembly-plugin</artifactId>
99-
<version>2.4.1</version>
85+
<version>2.5.4</version>
10086
<configuration>
10187
<descriptors>
10288
<descriptor>src/assembly/dist.xml</descriptor>

JavaLibrary/pom.xml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,30 +48,25 @@
4848
<artifactId>maven-compiler-plugin</artifactId>
4949
<version>3.1</version>
5050
<configuration>
51-
<source>1.6</source>
52-
<target>1.6</target>
53-
<showWarnings>true</showWarnings>
54-
<showDeprecation>true</showDeprecation>
5551
<compilerArgument>-Xlint:unchecked</compilerArgument>
5652
</configuration>
5753
</plugin>
5854

5955
<!-- compile test.asn file into Java source files -->
6056
<plugin>
61-
<artifactId>maven-antrun-plugin</artifactId>
62-
<version>1.7</version>
57+
<groupId>org.codehaus.mojo</groupId>
58+
<artifactId>exec-maven-plugin</artifactId>
59+
<version>1.4.0</version>
6360
<executions>
6461
<execution>
6562
<phase>generate-test-sources</phase>
6663
<goals>
67-
<goal>run</goal>
64+
<goal>java</goal>
6865
</goals>
6966
<configuration>
70-
<target>
71-
<java classname="org.bn.compiler.Main" classpathref="maven.compile.classpath" fork="true" failonerror="true">
72-
<arg line="-m java -o ${project.build.directory}/generated-test-sources/bncompiler/org/bn/coders/test_asn -ns org.bn.coders.test_asn -f ../BNCompiler/src/test/resources/test.asn" />
73-
</java>
74-
</target>
67+
<mainClass>org.bn.compiler.Main</mainClass>
68+
<classpathScope>compile</classpathScope>
69+
<commandlineArgs>-m java -o ${project.build.directory}/generated-test-sources/bncompiler/org/bn/coders/test_asn -ns org.bn.coders.test_asn -f ${basedir}/../BNCompiler/src/test/resources/test.asn</commandlineArgs>
7570
</configuration>
7671
</execution>
7772
</executions>
@@ -81,7 +76,7 @@
8176
<plugin>
8277
<groupId>org.codehaus.mojo</groupId>
8378
<artifactId>build-helper-maven-plugin</artifactId>
84-
<version>1.9</version>
79+
<version>1.9.1</version>
8580
<executions>
8681
<execution>
8782
<phase>generate-test-sources</phase>

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,19 @@
4747

4848
<properties>
4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
50+
51+
<!-- compiler settings -->
52+
<maven.compiler.source>1.6</maven.compiler.source>
53+
<maven.compiler.target>1.6</maven.compiler.target>
54+
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
55+
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
5056
</properties>
5157

5258
<dependencies>
5359
<dependency>
5460
<groupId>junit</groupId>
5561
<artifactId>junit</artifactId>
56-
<version>4.11</version>
62+
<version>4.12</version>
5763
<scope>test</scope>
5864
</dependency>
5965
</dependencies>

0 commit comments

Comments
 (0)