Skip to content

Commit

Permalink
Preparing release
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Bauer committed Jan 4, 2013
1 parent 0753925 commit 4d338cb
Show file tree
Hide file tree
Showing 24 changed files with 205 additions and 174 deletions.
2 changes: 1 addition & 1 deletion bridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Bridge</name>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Core</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/android/browser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-android</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Demo Android Browser</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/android/light/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-android</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Demo Android Light</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/android/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Demo Android</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/osgi/basicdevice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-osgi</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Demo OSGi Basic Device</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/osgi/lights/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-osgi</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Demo OSGi Lights</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Demo OSGi</name>
Expand Down
2 changes: 1 addition & 1 deletion demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Demo</name>
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>cling</artifactId>
<groupId>org.fourthline.cling</groupId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling Distribution</name>
Expand Down
13 changes: 0 additions & 13 deletions distribution/src/dist/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,3 @@ Copyright 2013, 4th Line GmbH, Switzerland, http://4thline.com/
You may at your option receive a license to this program under EITHER
the terms of the GNU Lesser General Public License (LGPL) OR the
Common Development and Distribution License (CDDL), see LICENSE.txt.

Copyright (C) 2013 4th Line GmbH, Switzerland

The contents of this file are subject to the terms of either the GNU
Lesser General Public License Version 2 or later ("LGPL") or the
Common Development and Distribution License Version 1 or later
("CDDL") (collectively, the "License"). You may not use this file
except in compliance with the License. See LICENSE.txt for more
information.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
43 changes: 43 additions & 0 deletions distribution/src/dist/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,47 @@
</includes>
</fileSet>

<!-- Cling Demo Android -->
<fileSet>
<directory>demo/android</directory>
<outputDirectory>/demo/android</outputDirectory>
<includes>
<include>pom.xml</include>
</includes>
</fileSet>
<fileSet>
<directory>demo/android/browser/target</directory>
<outputDirectory>/demo/android/browser</outputDirectory>
<includes>
<include>*.apk</include>
</includes>
</fileSet>
<fileSet>
<directory>demo/android/browser/src</directory>
<outputDirectory>/demo/android/browser/src</outputDirectory>
<includes>
<include>android/**</include>
<include>main/**</include>
<include>test/**</include>
</includes>
</fileSet>
<fileSet>
<directory>demo/android/light/target</directory>
<outputDirectory>/demo/android/light</outputDirectory>
<includes>
<include>*.apk</include>
</includes>
</fileSet>
<fileSet>
<directory>demo/android/light/src</directory>
<outputDirectory>/demo/android/light/src</outputDirectory>
<includes>
<include>android/**</include>
<include>main/**</include>
<include>test/**</include>
</includes>
</fileSet>

<!-- Cling Support -->
<fileSet>
<directory>support/src</directory>
Expand Down Expand Up @@ -105,6 +146,7 @@
</fileSet>

<!-- Cling OSGi -->
<!--
<fileSet>
<directory>osgi/basedriver/src</directory>
<outputDirectory>/osgi/src</outputDirectory>
Expand Down Expand Up @@ -161,6 +203,7 @@
<include>main/**</include>
</includes>
</fileSet>
-->

</fileSets>

Expand Down
2 changes: 1 addition & 1 deletion mediarenderer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling MediaRenderer</name>
Expand Down
2 changes: 1 addition & 1 deletion osgi/basedriver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-osgi</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling OSGi Base Driver</name>
Expand Down
2 changes: 1 addition & 1 deletion osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-alpha1</version>
</parent>

<name>Cling OSGi</name>
Expand Down
80 changes: 40 additions & 40 deletions osgi/tests/common/pom.xml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-osgi-tests</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>

<name>Cling OSGi Test Common Library</name>
<artifactId>cling-osgi-tests-common</artifactId>
<packaging>jar</packaging>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>

</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-osgi-tests</artifactId>
<version>2.0-alpha1</version>
</parent>

<name>Cling OSGi Test Common Library</name>
<artifactId>cling-osgi-tests-common</artifactId>
<packaging>jar</packaging>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit 4d338cb

Please sign in to comment.