Skip to content

Commit

Permalink
Harmonize Apache httpclient components to 4.5.9, refs sarxos#761
Browse files Browse the repository at this point in the history
  • Loading branch information
@sarxos
sarxos committed Mar 30, 2020
1 parent 2833769 commit ed8f434
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 24 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>oss-parent</artifactId>
<groupId>com.github.sarxos</groupId>
<version>4</version>
<artifactId>oss-parent</artifactId>
<version>6</version>
</parent>

<artifactId>webcam-capture-parent</artifactId>
Expand Down Expand Up @@ -194,7 +194,7 @@
<format>xml</format>
<maxmem>256m</maxmem>
<aggregate>true</aggregate>
<check/>
<check></check>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions webcam-capture-addons/webcam-capture-addon-spycam/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.6</version>
<version>4.5.9</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.1.3</version>
<version>4.5.9</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-ffmpeg-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-fswebcam/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-gst1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-gstreamer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions webcam-capture-drivers/driver-ipcam/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand All @@ -32,12 +32,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
<version>4.5.9</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.3</version>
<version>4.5.9</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-jmf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-lti-civil/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-mjpeg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-opencv/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions webcam-capture-drivers/driver-openimaj/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand All @@ -27,8 +27,8 @@
<version>0.7.0</version>
<exclusions>
<exclusion>
<groupId>com.google.android.tools</groupId>
<artifactId>dx</artifactId>
<groupId>com.google.android.tools</groupId>
</exclusion>
</exclusions>
</dependency>
Expand Down
3 changes: 2 additions & 1 deletion webcam-capture-drivers/driver-raspberrypi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand All @@ -14,6 +14,7 @@

<name>Webcam Capture - Raspberry Pi camera Driver</name>
<description>Webcam Capture driver for capturing images for raspberrypi camera</description>

<developers>
<developer>
<id>alexmao86</id>
Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-screencapture/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-v4l4j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/driver-vlcj/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-drivers</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-drivers</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture-drivers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-parent</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-parent</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion webcam-capture/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>webcam-capture-parent</artifactId>
<groupId>com.github.sarxos</groupId>
<artifactId>webcam-capture-parent</artifactId>
<version>0.3.13-SNAPSHOT</version>
</parent>

Expand Down

0 comments on commit ed8f434

Please sign in to comment.