From 6bc71ff0e918c26864c9fc7cb153e8b0d20dcb04 Mon Sep 17 00:00:00 2001
From: Simon Gregor Ebner <simon.ebner@psi.ch>
Date: Thu, 24 Jul 2014 11:52:42 +0200
Subject: [PATCH] Updated maven configuration to have the build run again on
 Java 8 Also Upgraded to Netbeans Platform 8

---
 application/pom.xml        | 1 +
 branding/pom.xml           | 1 +
 fda.ui.cdump/pom.xml       | 3 ++-
 fda.ui.ce/pom.xml          | 1 +
 fda.ui.cm/pom.xml          | 1 +
 fda.ui.ee/pom.xml          | 1 +
 fda.ui.preferences/pom.xml | 1 +
 pom.xml                    | 4 ++--
 8 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index 6642da5..98f5a06 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -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>
diff --git a/branding/pom.xml b/branding/pom.xml
index 572adef..bfe6802 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -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>
diff --git a/fda.ui.cdump/pom.xml b/fda.ui.cdump/pom.xml
index 94b34ce..15bd4ad 100644
--- a/fda.ui.cdump/pom.xml
+++ b/fda.ui.cdump/pom.xml
@@ -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>
 
diff --git a/fda.ui.ce/pom.xml b/fda.ui.ce/pom.xml
index be31724..568946e 100644
--- a/fda.ui.ce/pom.xml
+++ b/fda.ui.ce/pom.xml
@@ -123,6 +123,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>nbm-maven-plugin</artifactId>
+                <version>3.8.1</version>
                 <extensions>true</extensions>
             </plugin>
 
diff --git a/fda.ui.cm/pom.xml b/fda.ui.cm/pom.xml
index 3be90c8..0b0d3cd 100644
--- a/fda.ui.cm/pom.xml
+++ b/fda.ui.cm/pom.xml
@@ -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>
diff --git a/fda.ui.ee/pom.xml b/fda.ui.ee/pom.xml
index ef0e4ef..f36ef3c 100644
--- a/fda.ui.ee/pom.xml
+++ b/fda.ui.ee/pom.xml
@@ -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>
diff --git a/fda.ui.preferences/pom.xml b/fda.ui.preferences/pom.xml
index 4a0ceb6..43fa299 100644
--- a/fda.ui.preferences/pom.xml
+++ b/fda.ui.preferences/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index afec881..d910011 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
\ No newline at end of file