Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pom merge conflicts #3

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Fix pom merge conflicts #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3bdbdae
Resolved merge conflicts in flash/pom.xml
Apr 5, 2013
9f994cf
Resolved merge conflicts in main pom.xml
Apr 5, 2013
f593ced
Resolved merge conflicts in proxy/upnp-proxy/pom.xml
Apr 5, 2013
52a2379
Resolved merge conflicts in proxy/upnp-proxy-gui/pom.xml
Apr 5, 2013
f054c43
Resolved merge conflicts in proxy/upnp-sample-proxy/pom.xml
Apr 5, 2013
2c10e25
Resolved merge conflicts in rui/upnp-rui/pom.xml
Apr 5, 2013
ed3f74f
Resolved merge conflicts in upnp-stack/pom.xml
Apr 5, 2013
cb7b73a
Resolved merge conflicts in tools/pom.xml
Apr 5, 2013
6634c54
Partial merge conflict resolution for tools/igd-tool/pom.xml
Apr 5, 2013
cb6740a
Added relative path back to tools/igd-tool/pom.xml
Apr 5, 2013
fb6dc22
Resolved merge conflicts in tools/control-point/pom.xml
Apr 5, 2013
f700462
Resolved merge conflicts in std/pom.xml
Apr 5, 2013
29248f7
Resolved merge conflicts in samples/washer/pom.xml
Apr 5, 2013
0650136
Resolved merge conflicts in samples/tv/pom.xml
Apr 5, 2013
70e537a
Resolved merge conflicts in samples/remote-controller/pom.xml
Apr 5, 2013
fd1ded8
Resolved merge conflicts in samples/pom.xml
Apr 5, 2013
89a4108
Resolved merge conflicts in samples/light/pom.xml
Apr 5, 2013
34a10ec
Resolved merge conflicts in samples/clock/pom.xml
Apr 5, 2013
86c8f47
Resolved merge conflicts in samples/air-conditioner/pom.xml
Apr 5, 2013
b803c5a
Resolved merge conflicts in rui/upnp-rui-server/pom.xml
Apr 5, 2013
0b32c4c
Resolved merge conflicts in rui/upnp-rui-player/pom.xml
Apr 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions flash/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,9 @@
</mailingLists>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencyManagement>
Expand Down
10 changes: 0 additions & 10 deletions proxy/upnp-proxy-gui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
10 changes: 0 additions & 10 deletions proxy/upnp-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
10 changes: 0 additions & 10 deletions proxy/upnp-sample-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
10 changes: 0 additions & 10 deletions rui/upnp-rui-player/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
10 changes: 0 additions & 10 deletions rui/upnp-rui-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
10 changes: 0 additions & 10 deletions rui/upnp-rui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
13 changes: 0 additions & 13 deletions samples/air-conditioner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
<parent>
<artifactId>cyberlink</artifactId>
<groupId>org.cybergarage.cyberlink</groupId>
<<<<<<< HEAD
<relativePath>../../</relativePath>
=======
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
<version>2</version>
</parent>

Expand All @@ -24,24 +21,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/air-conditioner</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/air-conditioner</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/air-conditioner</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/air-conditioner</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/air-conditioner</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/air-conditioner</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
13 changes: 0 additions & 13 deletions samples/clock/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
<parent>
<artifactId>cyberlink</artifactId>
<groupId>org.cybergarage.cyberlink</groupId>
<<<<<<< HEAD
<relativePath>../../</relativePath>
=======
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
<version>2</version>
</parent>

Expand All @@ -24,24 +21,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/clock</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/clock</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/clock</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/clock</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/clock</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/clock</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
13 changes: 0 additions & 13 deletions samples/light/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
<parent>
<artifactId>cyberlink</artifactId>
<groupId>org.cybergarage.cyberlink</groupId>
<<<<<<< HEAD
<relativePath>../../</relativePath>
=======
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
<version>2</version>
</parent>

Expand All @@ -24,24 +21,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/light</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/light</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/light</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
6 changes: 0 additions & 6 deletions samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@
<description>A suite of samples using the CyberLink UPnP Stack</description>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<modules>
Expand Down
13 changes: 0 additions & 13 deletions samples/remote-controller/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
<parent>
<artifactId>cyberlink</artifactId>
<groupId>org.cybergarage.cyberlink</groupId>
<<<<<<< HEAD
<relativePath>../../</relativePath>
=======
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
<version>2</version>
</parent>

Expand All @@ -24,24 +21,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/remote-controller</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/remote-controller</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/remote-controller</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/remote-controller</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/remote-controller</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/remote-controller</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
13 changes: 0 additions & 13 deletions samples/tv/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
<parent>
<artifactId>cyberlink</artifactId>
<groupId>org.cybergarage.cyberlink</groupId>
<<<<<<< HEAD
<relativePath>../../</relativePath>
=======
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
<version>2</version>
</parent>

Expand All @@ -24,24 +21,14 @@
<licenses>
<license>
<name>BSD</name>
<<<<<<< HEAD
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/LICENSE.txt</url>
=======
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/LICENSE.txt</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</license>
</licenses>

<scm>
<<<<<<< HEAD
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/tv</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/samples/tv</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/samples/tv</url>
=======
<connection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/tv</connection>
<developerConnection>scm:svn:https://cgupnpjava.svn.sourceforge.net/svnroot/cgupnpjava/trunk/cyberlink/samples/tv</developerConnection>
<url>http://cgupnpjava.svn.sourceforge.net/viewvc/cgupnpjava/trunk/cyberlink/samples/tv</url>
>>>>>>> a89f3426d42194b5e91322dd3a6dbb3ed4fa0d88
</scm>

<dependencies>
Expand Down
Loading