From 71cfc745c0d61160e14d2dfae7ce854e58aa53b6 Mon Sep 17 00:00:00 2001
From: Bartosz Firyn <bartosz.firyn@alcatel-lucent.com>
Date: Sun, 13 Jan 2013 12:51:00 +0100
Subject: [PATCH] Fix Travis build failing due to launch4j config

---
 pom.xml                                       |  10 +-
 .../webcam-capture-executable/pom.xml         | 112 ++++++++++--------
 webcam-capture/pom.xml                        |   3 +-
 3 files changed, 70 insertions(+), 55 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c39a79b..77749e9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,9 +282,9 @@
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-	        	<artifactId>maven-site-plugin</artifactId>
-	        	<version>3.0</version>
-	        </plugin>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.0</version>
+			</plugin>
 		</plugins>
 	
 		<pluginManagement>
@@ -430,8 +430,8 @@
 				<artifactId>maven-overview-plugin</artifactId>
 				<version>1.6</version>
 				<configuration>
-                    <width>700</width>
-                    <height>700</height>
+					<width>700</width>
+					<height>700</height>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/webcam-capture-examples/webcam-capture-executable/pom.xml b/webcam-capture-examples/webcam-capture-executable/pom.xml
index e7da64b7..b98e366c 100644
--- a/webcam-capture-examples/webcam-capture-executable/pom.xml
+++ b/webcam-capture-examples/webcam-capture-executable/pom.xml
@@ -27,6 +27,66 @@
 		</dependency>
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>build-executable</id>
+			<activation>
+				<os>
+					<family>Windows</family>
+				</os>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>com.akathist.maven.plugins.launch4j</groupId>
+						<artifactId>launch4j-maven-plugin</artifactId>
+						<version>1.5.1</version>
+						<executions>
+							<execution>
+								<id>l4j-gui</id>
+								<phase>package</phase>
+								<goals>
+									<goal>launch4j</goal>
+								</goals>
+								<configuration>
+									<headerType>gui</headerType>
+									<outfile>${project.build.directory}/capture.exe</outfile>
+									<jar>${project.build.directory}/${project.artifactId}-${project.version}.jar</jar>
+									<errTitle>Error</errTitle>
+									<icon>src/main/resources/Security-Camera.ico</icon>
+									<classPath>
+										<mainClass>com.github.sarxos.webcam.WebcamExecutableExample</mainClass>
+										<addDependencies>true</addDependencies>
+										<jarLocation>libs</jarLocation>
+									</classPath>
+									<jre>
+										<minVersion>1.5.0</minVersion>
+										<maxVersion>1.6.0</maxVersion>
+									</jre>
+									<singleInstance>
+										<mutexName>WebcamCapture</mutexName>
+										<windowTitle>${project.name}</windowTitle>
+									</singleInstance>					
+									<versionInfo>
+										<fileVersion>1.2.3.4</fileVersion>
+										<txtFileVersion>v1.2.3.4</txtFileVersion>
+										<fileDescription>${project.name}</fileDescription>
+										<copyright>Bartosz Firyn</copyright>
+										<productVersion>1.2.3.4</productVersion>
+										<txtProductVersion>v1.2.3.4</txtProductVersion>
+										<productName>${project.name}</productName>
+										<internalName>${project.name}</internalName>
+										<originalFilename>capture.exe</originalFilename>
+									</versionInfo>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -54,52 +114,8 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>com.akathist.maven.plugins.launch4j</groupId>
-				<artifactId>launch4j-maven-plugin</artifactId>
-				<version>1.5.1</version>
-				<executions>
-					<execution>
-						<id>l4j-gui</id>
-						<phase>package</phase>
-						<goals>
-							<goal>launch4j</goal>
-						</goals>
-						<configuration>
-							<headerType>gui</headerType>
-							<outfile>${project.build.directory}/capture.exe</outfile>
-							<jar>${project.build.directory}/${project.artifactId}-${project.version}.jar</jar>
-							<errTitle>Error</errTitle>
-							<icon>src/main/resources/Security-Camera.ico</icon>
-							<classPath>
-								<mainClass>com.github.sarxos.webcam.WebcamExecutableExample</mainClass>
-								<addDependencies>true</addDependencies>
-								<jarLocation>libs</jarLocation>
-							</classPath>
-							<jre>
-								<minVersion>1.5.0</minVersion>
-								<maxVersion>1.6.0</maxVersion>
-							</jre>
-							<singleInstance>
-								<mutexName>WebcamCapture</mutexName>
-								<windowTitle>${project.name}</windowTitle>
-							</singleInstance>					
-							<versionInfo>
-								<fileVersion>1.2.3.4</fileVersion>
-								<txtFileVersion>v1.2.3.4</txtFileVersion>
-								<fileDescription>${project.name}</fileDescription>
-								<copyright>Bartosz Firyn</copyright>
-								<productVersion>1.2.3.4</productVersion>
-								<txtProductVersion>v1.2.3.4</txtProductVersion>
-								<productName>${project.name}</productName>
-								<internalName>${project.name}</internalName>
-								<originalFilename>capture.exe</originalFilename>
-							</versionInfo>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
+
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -115,9 +131,7 @@
 										<artifactId>maven-dependency-plugin</artifactId>
 										<versionRange>[2.5.1,)</versionRange>
 										<goals>
-											<goal>
-												copy-dependencies
-											</goal>
+											<goal>copy-dependencies</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>
@@ -131,4 +145,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/webcam-capture/pom.xml b/webcam-capture/pom.xml
index 4e3e3c07..80c9df84 100644
--- a/webcam-capture/pom.xml
+++ b/webcam-capture/pom.xml
@@ -124,7 +124,8 @@
 							com.github.sarxos.webcam.util,
 						</Export-Package>
 						<Private-Package>
-							!*,
+							com.github.sarxos.webcam.ds,
+							com.github.sarxos.webcam.ds.*,
 						</Private-Package>
 						<Include-Resources>{maven-resources}</Include-Resources>
 					</instructions>