Commit de42ec77 authored by nshah's avatar nshah

Manually commiting changes for the Bundle 1.2.3 release tag. These will be...

Manually commiting changes for the Bundle 1.2.3 release tag. These will be picked up automatically from trunk next time
parent 5ec19f95
......@@ -5,7 +5,7 @@
<parent>
<artifactId>stubs-parent</artifactId>
<groupId>com.cablelabs.ocap</groupId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.3</version>
</parent>
<artifactId>ocap_api</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>stubs-parent</artifactId>
<groupId>com.cablelabs.ocap</groupId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.3</version>
</parent>
<artifactId>ocap_ds</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>stubs-parent</artifactId>
<groupId>com.cablelabs.ocap</groupId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.3</version>
</parent>
<artifactId>ocap_dvr</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>stubs-parent</artifactId>
<groupId>com.cablelabs.ocap</groupId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.3</version>
</parent>
<artifactId>ocap_fp</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>stubs-parent</artifactId>
<groupId>com.cablelabs.ocap</groupId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.3</version>
</parent>
<artifactId>ocap_hn</artifactId>
......
......@@ -4,7 +4,7 @@
<groupId>com.cablelabs.ocap</groupId>
<artifactId>stubs-parent</artifactId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.3</version>
<packaging>pom</packaging>
<name>OCAP RI Stubs</name>
<url>http://www.opencable.com</url>
......@@ -28,10 +28,23 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>MM/dd/yyyy</maven.build.timestamp.format>
<!--
The following properties are used within javadoc and release files to specify the version
of various specs being used
-->
<pbp.version>1.1.2</pbp.version>
<javatv.version>1.1.1</javatv.version>
<mhp.version.1>1.0.1</mhp.version.1>
<mhp.version.2>1.1.3</mhp.version.2>
<ocap.ds.spec.version>I05</ocap.ds.spec.version>
<ocap.dvr.spec.version>I08</ocap.dvr.spec.version>
<ocap.fp.spec.version>I05</ocap.fp.spec.version>
<ocap.hn.spec.version>I09</ocap.hn.spec.version>
</properties>
<build>
<plugins>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
......@@ -64,34 +77,28 @@
<phase>pre-site</phase>
</execution>
</executions>
</plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<inherited>false</inherited>
<configuration>
<descriptors>
<descriptor>src/assemble/docszip.xml</descriptor>
</descriptors>
</configuration>
<inherited>false</inherited>
<executions>
<execution>
<id>docszip</id>
<goals>
<goal>single</goal>
</goals>
<configuration>
<configuration>
<descriptors>
<descriptor>src/assemble/docszip.xml</descriptor>
</descriptors>
<finalName>ocap_stubs-${project.version}</finalName>
</configuration>
<phase>site</phase>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>
......@@ -107,4 +114,4 @@
<url>https://community.cablelabs.com/mvn/cl-internal-snapshots</url>
</snapshotRepository>
</distributionManagement>
</project>
\ No newline at end of file
</project>
......@@ -5,12 +5,22 @@
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.reporting.outputDirectory}/apidocs</directory>
<outputDirectory>/doc</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>overview-summary.html</exclude>
</excludes>
</fileSet>
</fileSets>
<files>
<file>
<source>${project.reporting.outputDirectory}/apidocs/overview-summary.html</source>
<outputDirectory>/doc</outputDirectory>
<filtered>true</filtered>
</file>
</files>
</assembly>
......@@ -4,19 +4,19 @@
<br/>
It includes:<br/>
<ul>
<li>PBP 1.1.2</li>
<li>JavaTV 1.1.1</li>
<li>MHP 1.0.3</li>
<li>MHP 1.1.3</li>
<li>OCAP 1.2.3</li>
<li>PBP ${pbp.version}</li>
<li>JavaTV ${javatv.version}</li>
<li>MHP ${mhp.version.1}</li>
<li>MHP ${mhp.version.2}</li>
<li>OCAP ${project.version}</li>
</ul>
<br/>
and Extensions:<br/>
<ul>
<li>OCAP Device Settings I05</li>
<li>OCAP DVR I08</li>
<li>OCAP Front Panel I05</li>
<li>OCAP Home Networking I09</li>
<li>OCAP Device Settings ${ocap.ds.spec.version}</li>
<li>OCAP DVR ${ocap.dvr.spec.version}</li>
<li>OCAP Front Panel ${ocap.fp.spec.version}</li>
<li>OCAP Home Networking ${ocap.hn.spec.version}</li>
<li>#org.ocap.shared.* packages are also included</li>
</ul>
</body>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>stubs-parent</artifactId>
<groupId>com.cablelabs.ocap</groupId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.3</version>
</parent>
<artifactId>stubs-pkg</artifactId>
......@@ -81,20 +81,13 @@
</dependencies>
<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<inherited>false</inherited>
<configuration>
<descriptors>
<descriptor>src/assemble/srczip.xml</descriptor>
</descriptors>
</configuration>
<inherited>false</inherited>
<executions>
<execution>
<id>srczip</id>
......@@ -102,10 +95,15 @@
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/assemble/srczip.xml</descriptor>
</descriptors>
<finalName>ocap_stubs-${project.version}</finalName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
......@@ -132,10 +130,8 @@
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
......@@ -21,4 +21,11 @@
</includes>
</dependencySet>
</dependencySets>
<files>
<file>
<source>ReleaseNotes.txt</source>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
</file>
</files>
</assembly>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment