Skip to content

Commit

Permalink
Fix project setup [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
@sarxos
sarxos committed Jul 23, 2012
1 parent 6c702d6 commit 6c99931
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 103 deletions.
15 changes: 6 additions & 9 deletions .gitignore
View file
@@ -1,11 +1,8 @@
.settings
target
webcam-capture-driver-civil/.settings
webcam-capture-driver-civil/target
webcam-capture-driver-jmf/.settings
webcam-capture-driver-jmf/target
webcam-capture/.settings
webcam-capture/target
webcam-capture-driver-openimaj/.settings
webcam-capture-driver-openimaj/target

*/.settings
*/target
release.properties
pom.xml.releaseBackup
*/pom.xml.releaseBackup
*/release.properties
174 changes: 84 additions & 90 deletions pom.xml
View file
Expand Up @@ -6,7 +6,7 @@

<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-parent</artifactId>
<version>0.3.2-SNAPSHOT</version>
<version>0.3.2</version>
<packaging>pom</packaging>

<name>Webcam Capture - Root POM</name>
Expand Down Expand Up @@ -50,6 +50,10 @@
<module>webcam-capture-driver-openimaj</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -71,6 +75,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand All @@ -91,6 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -104,9 +110,36 @@
</plugins>
</build>
</profile>
<profile>
<id>assembly</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<configuration>
<descriptors>
<descriptor>distribution.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>

<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -135,17 +168,17 @@
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<!-- <version>2.5.1</version> -->
<version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -192,50 +225,8 @@
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.0</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>webcam-capture-openimaj-ds/README</file>
<replacements>
<replacement>
<token>${version}</token>
<value>${project.version}</value>
</replacement>
</replacements>
</configuration>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<configuration>
<descriptors>
<descriptor>distribution.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>

<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
Expand All @@ -247,6 +238,7 @@

<reporting>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand All @@ -256,85 +248,87 @@
<keywords>cam,webcam,camera,spycam,capture</keywords>
</configuration>
</plugin>
</plugins>
</reporting>


<!--
<reporting>
<plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
<configuration>
<tags>
<tag>TODO</tag>
<tag>@todo</tag>
<tag>FIXME</tag>
<tag>XXX</tag>
</tags>
<aggregate>true</aggregate>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1.2</version>
<reportSets>
<reportSet>
<id>aggregate</id>
<reports>
<report>aggregate</report>
<report>index</report>
<report>dependencies</report>
</reports>
</reportSet>
</reportSets>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<groupId>com.googlecode.maven-overview-plugin</groupId>
<artifactId>maven-overview-plugin</artifactId>
<version>1.6</version>
<inherited>false</inherited>
<configuration>
<linkJavadoc>true</linkJavadoc>
<aggregate>true</aggregate>
<includes>com.github.sarxos.webcam</includes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<configuration>
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
<targetJdk>1.6</targetJdk>
<linkJavadoc>true</linkJavadoc>
<aggregate>true</aggregate>
</configuration>
</plugin>

<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1.2</version>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<reportSets>
<reportSet>
<id>aggregate</id>
<reports>
<report>index</report>
<report>dependencies</report>
<report>aggregate</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
<configuration>
<tags>
<tag>TODO</tag>
<tag>@todo</tag>
<tag>FIXME</tag>
<tag>XXX</tag>
</tags>
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
<targetJdk>1.6</targetJdk>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>com.googlecode.maven-overview-plugin</groupId>
<artifactId>maven-overview-plugin</artifactId>
<version>1.6</version>
<inherited>false</inherited>
<configuration>
<includes>com.github.sarxos.webcam</includes>
</configuration>
</plugin>
-->

</plugins>
</reporting>
-->

</project>
2 changes: 1 addition & 1 deletion webcam-capture-driver-civil/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-parent</artifactId>
<version>0.3.2-SNAPSHOT</version>
<version>0.3.2</version>
</parent>

<artifactId>webcam-capture-driver-civil</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions webcam-capture-driver-jmf/pom.xml
View file
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-parent</artifactId>
<version>0.3.2-SNAPSHOT</version>
<version>0.3.2</version>
</parent>

<artifactId>webcam-capture-driver-jmf</artifactId>
<name>Webcam Capture - JMF Driver</name>
<description>This is JMF implementation of webcam data source. It allows you to capture webcam media with JMF or FMJ installed.</description>
<description>This is JMF implementation of webcam driver. It allows you to capture webcam media with JMF or FMJ installed.</description>

<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-driver-openimaj/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-parent</artifactId>
<version>0.3.2-SNAPSHOT</version>
<version>0.3.2</version>
</parent>

<artifactId>webcam-capture-driver-openimaj</artifactId>
Expand Down

0 comments on commit 6c99931

Please sign in to comment.