You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/04/27 14:47:11 UTC

svn commit: r1590386 - in /openmeetings/trunk/singlewebapp: ./ .settings/ openmeetings-core/ openmeetings-db/ openmeetings-flash/ openmeetings-install/ openmeetings-screenshare/ openmeetings-service/ openmeetings-util/ openmeetings-web/ openmeetings-we...

Author: solomax
Date: Sun Apr 27 12:47:10 2014
New Revision: 1590386

URL: http://svn.apache.org/r1590386
Log:
[OPENMEETINGS-940] warnings are removed

Removed:
    openmeetings/trunk/singlewebapp/.classpath
    openmeetings/trunk/singlewebapp/.project
    openmeetings/trunk/singlewebapp/.settings/
    openmeetings/trunk/singlewebapp/.springBeans
Modified:
    openmeetings/trunk/singlewebapp/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-core/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-db/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-flash/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-install/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-service/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-util/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-webservice/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
    openmeetings/trunk/singlewebapp/pom.xml

Propchange: openmeetings/trunk/singlewebapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -2,4 +2,8 @@ build
 dist
 .ant-targets-build.xml
 target
+.settings
+.classpath
+.project
+.springBeans
 

Propchange: openmeetings/trunk/singlewebapp/openmeetings-core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -48,12 +48,12 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-util</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-db</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-install</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-db/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-util</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openjpa</groupId>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-flash/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Sun Apr 27 12:47:10 2014
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -42,7 +42,7 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
-						<phase>compile</phase>
+						<phase>package</phase>
 						<configuration>
 							<target>
 								<ant antfile="${basedir}/../openlaszlo.xml" target="client.only"/>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-install/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-util</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-db</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-screenshare/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -71,10 +71,9 @@
 		<plugin>
 			<groupId>com.google.code.maven-replacer-plugin</groupId>
 			<artifactId>replacer</artifactId>
-			<version>1.5.3</version>
 			<executions>
 				<execution>
-					<phase>generate-resources</phase>
+					<phase>process-resources</phase>
 					<goals>
 						<goal>replace</goal>
 					</goals>
@@ -151,16 +150,30 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>copy-dependencies</id>
+							<phase>package</phase>
+							<goals>
+								<goal>copy-dependencies</goal>
+							</goals>
+							<configuration>
+								<outputDirectory>${project.build.directory}/lib</outputDirectory>
+								<overWriteReleases>false</overWriteReleases>
+								<overWriteSnapshots>false</overWriteSnapshots>
+								<overWriteIfNewer>true</overWriteIfNewer>
+								<excludeTransitive>true</excludeTransitive>
+							</configuration>
+						</execution>
+					</executions>
 			</plugin>
 			<plugin>
-				<!-- Step 1) your obvious configuration + added one new execution for APPLICATION_TEMPLATE.jnlp file generation from template 
-					stored in /templates/APPLICATION_TEMPLATE.jnlp dir -->
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>webstart-maven-plugin</artifactId>
 				<executions>
 					<execution>
 						<id>generate-jnlp-template-for-signing</id>
-						<phase>generate-resources</phase>
+						<phase>process-resources</phase>
 						<goals>
 							<goal>jnlp</goal>
 						</goals>
@@ -199,13 +212,11 @@
 					</execution>
 					<execution>
 						<id>generate-jnlp-and-sign-libs</id>
-						<phase>generate-resources</phase>
+						<phase>process-resources</phase>
 						<goals>
 							<goal>jnlp</goal>
 						</goals>
 						<configuration>
-							<!--outputDirectory></outputDirectory --> <!-- not required?? -->
-					
 							<excludeTransitive>false</excludeTransitive>
 							<dependencies>
 								<includes>
@@ -267,10 +278,8 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<!-- Step 2) move to APPLICATION_TEMPLATE from /target/jnlp to target/jnlp/${project.build.finalName}.jar/JNLP-INF dir -->
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>truezip-maven-plugin</artifactId>
-				<version>1.1</version>
 				<executions>
 					<execution>
 						<id>move-jnlp-template</id>
@@ -286,10 +295,8 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<!-- Step 3) repeat signing of main.jar -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jarsigner-plugin</artifactId>
-				<version>1.3.2</version>
 				<executions>
 					<execution>
 						<id>sign</id>
@@ -313,22 +320,7 @@
 					<verbose>true</verbose>
 				</configuration>
 			</plugin>
-			<!-- plugin-->
-				<!-- Step 4) custom packaging -->
-				<!-- groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${maven-war-plugin.version}</version>
-				<configuration>
-					...
-					<webResources>
-						<resource>
-							<directory>${project.build.directory}/jnlp</directory>
-						</resource>
-						...
-					</webResources>
-					...
-				</configuration>
-			</plugin-->		
 		</plugins>
 	</build>
 </project>
+

Propchange: openmeetings/trunk/singlewebapp/openmeetings-service/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-core</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.wicket</groupId>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-util/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-web/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -160,6 +160,7 @@
 							<url>https://openmeetings.googlecode.com/svn/repository</url>
 							<includes>backup_*.zip</includes>
 							<toDir>${project.build.directory}/old-backups</toDir>
+							<skip>${maven.test.skip}</skip>
 						</configuration>
 					</execution>
 				</executions>
@@ -175,37 +176,32 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-util</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-db</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-core</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-install</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-service</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-webservice</artifactId>
-			<version>${openmeetings.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openmeetings</groupId>
-			<artifactId>openmeetings-flash</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -341,7 +337,7 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-core</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-webservice/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 27 12:47:10 2014
@@ -1,2 +1,5 @@
 target
+.settings
+.classpath
+.project
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Sun Apr 27 12:47:10 2014
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.openmeetings</groupId>
 		<artifactId>openmeetings-parent</artifactId>
-		<version>${openmeetings.version}</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
@@ -39,17 +39,17 @@
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-util</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-db</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>
 			<artifactId>openmeetings-core</artifactId>
-			<version>${openmeetings.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1590386&r1=1590385&r2=1590386&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sun Apr 27 12:47:10 2014
@@ -26,7 +26,7 @@
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
 	<artifactId>openmeetings-parent</artifactId>
-	<version>${openmeetings.version}</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Openmeetings Parent</name>
 	<description>TODO</description>
@@ -34,12 +34,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<wicket.mode>DEPLOYMENT</wicket.mode>
 		<db>derby</db>
-		<openmeetings.version>3.1.0-SNAPSHOT</openmeetings.version>
 		<spring.version>4.0.3.RELEASE</spring.version>
 		<junit.version>4.11</junit.version>
 		<maven.javadoc.version>2.9.1</maven.javadoc.version>
 		<maven.surefire.version>2.17</maven.surefire.version>
-		<wicket.version>6.14.0</wicket.version>
+		<wicket.version>6.15.0</wicket.version>
 		<red5-server.version>1.0.2-RELEASE</red5-server.version>
 	</properties>
 	<modules>
@@ -221,28 +220,6 @@
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-gpg-plugin</artifactId>
-					<version>1.4</version>
-					<executions>
-						<execution>
-							<id>sign-artifacts</id>
-							<phase>install</phase>
-							<goals>
-								<goal>sign</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-war-plugin</artifactId>
-					<version>2.2</version>
-					<configuration>
-						<warName>${project.artifactId}</warName>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.4</version>
 					<configuration>
@@ -272,13 +249,13 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>${maven.surefire.version}</version>
 					<configuration>
+						<forkMode>never</forkMode>
 						<includes>
 							<include>**/Test*.java</include>
 						</includes>
 					</configuration>
 					<dependencies>
 						<dependency>
-							<!-- force 4.7 runner to enable excludedGroups on Categories (& parallel) -->
 							<groupId>org.apache.maven.surefire</groupId>
 							<artifactId>surefire-junit47</artifactId>
 							<version>${maven.surefire.version}</version>
@@ -301,27 +278,6 @@
 					<artifactId>webstart-maven-plugin</artifactId>
 					<version>1.0-beta-6</version>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.8</version>
-					<executions>
-						<execution>
-							<id>copy-dependencies</id>
-							<phase>package</phase>
-							<goals>
-								<goal>copy-dependencies</goal>
-							</goals>
-							<configuration>
-								<outputDirectory>${project.build.directory}/lib</outputDirectory>
-								<overWriteReleases>false</overWriteReleases>
-								<overWriteSnapshots>false</overWriteSnapshots>
-								<overWriteIfNewer>true</overWriteIfNewer>
-								<excludeTransitive>true</excludeTransitive>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
 				
 				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
 				<plugin>
@@ -373,6 +329,16 @@
 					<artifactId>maven-resources-plugin</artifactId>
 					<version>2.6</version>
 				</plugin>
+				<plugin>
+					<groupId>com.google.code.maven-replacer-plugin</groupId>
+					<artifactId>replacer</artifactId>
+					<version>1.5.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jarsigner-plugin</artifactId>
+					<version>1.3.2</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>