Updated maven configuration to have the build run again on Java 8

Also Upgraded to Netbeans Platform 8
This commit is contained in:
2014-07-24 11:52:42 +02:00
parent 17b5e98177
commit 6bc71ff0e9
8 changed files with 10 additions and 3 deletions

View File

@@ -79,6 +79,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<etcConfFile>src/main/resources/fda.conf</etcConfFile>
</configuration>

View File

@@ -30,6 +30,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@@ -84,7 +84,7 @@
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>${project.version}</version>
<type>nbm</type>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
@@ -104,6 +104,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.8.1</version>
<extensions>true</extensions>
</plugin>

View File

@@ -123,6 +123,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.8.1</version>
<extensions>true</extensions>
</plugin>

View File

@@ -105,6 +105,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.8.1</version>
<extensions>true</extensions>
<configuration>
<publicPackages>

View File

@@ -97,6 +97,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.8.1</version>
<extensions>true</extensions>
<configuration>
<publicPackages>

View File

@@ -96,6 +96,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.8.1</version>
<extensions>true</extensions>
<configuration>
<publicPackages>

View File

@@ -39,7 +39,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.5</version>
<version>3.8.1</version>
<extensions>true</extensions>
<configuration>
<brandingToken>${brandingToken}</brandingToken>
@@ -89,7 +89,7 @@
</modules>
<properties>
<netbeans.version>RELEASE712</netbeans.version>
<netbeans.version>RELEASE80</netbeans.version>
<brandingToken>fda</brandingToken>
</properties>
</project>