chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gabri...@apache.org
Subject svn commit: r1084370 - in /chemistry/opencmis/trunk: chemistry-opencmis-dist/pom.xml chemistry-opencmis-dist/src/main/assembly/docs-assembly.xml chemistry-opencmis-dist/src/main/resources/NOTICE pom.xml src/main/assembly/docs-assembly.xml
Date Tue, 22 Mar 2011 21:51:00 GMT
Author: gabriele
Date: Tue Mar 22 21:50:59 2011
New Revision: 1084370

URL: http://svn.apache.org/viewvc?rev=1084370&view=rev
Log:
finalized last packaging  bits for 0.3.0 release

Added:
    chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/docs-assembly.xml 
 (contents, props changed)
      - copied, changed from r1084219, chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml
Removed:
    chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml
Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE
    chemistry/opencmis/trunk/pom.xml

Modified: chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml?rev=1084370&r1=1084369&r2=1084370&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml Tue Mar 22 21:50:59 2011
@@ -118,6 +118,34 @@
             </activation>
             <build>
                 <plugins>
+                    <!-- Fetches docs from ${docs.download.directory} -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>fetch-docs</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>wget</executable>
+                                    <arguments>
+                                        <argument>--directory-prefix=${docs.download.directory}</argument>
+                                        <argument>--domains=chemistry.apache.org</argument>
+                                        <argument>--mirror</argument>
+                                        <argument>-k</argument>
+                                        <argument>-np</argument>
+                                        <argument>--include-directories=/java/</argument>
+                                        <argument>--exclude-directories=/java/maven/</argument>
+                                        <argument>${docs.start.url}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <inherited>false</inherited>
@@ -138,6 +166,9 @@
                                         <descriptor>
                                             src/main/assembly/server-webapps-assembly.xml
                                         </descriptor>
+                                        <descriptor>
+                                            src/main/assembly/docs-assembly.xml
+                                        </descriptor>
                                     </descriptors>
                                 </configuration>
                             </execution>

Copied: chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/docs-assembly.xml
(from r1084219, chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml)
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/docs-assembly.xml?p2=chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/docs-assembly.xml&p1=chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml&r1=1084219&r2=1084370&rev=1084370&view=diff
==============================================================================
--- chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/docs-assembly.xml Tue
Mar 22 21:50:59 2011
@@ -35,7 +35,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/site/apidocs</directory>
+            <directory>${parentBasedir}/target/site/apidocs</directory>
             <outputDirectory>javadocs</outputDirectory>
             <includes>
                 <include>**</include>

Propchange: chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/docs-assembly.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE?rev=1084370&r1=1084369&r2=1084370&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE Tue Mar 22
21:50:59 2011
@@ -1,4 +1,4 @@
 Chemistry OpenCMIS distribution package
 
-For a complete listing ofÊLicense Notices for 3rd party libraries shipped by JARs/WARs contained
in this package, 
+For a complete listing of License Notices for 3rd party libraries shipped by JARs/WARs contained
in this package,
 please refer to the META-INF/NOTICE file contained in each OpenCMIS artifact.
\ No newline at end of file

Modified: chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1084370&r1=1084369&r2=1084370&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Tue Mar 22 21:50:59 2011
@@ -458,34 +458,6 @@
             </activation>
             <build>
                 <plugins>
-                    <!-- Fetches docs from ${docs.download.directory} -->
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>fetch-docs</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>wget</executable>
-                                    <arguments>
-                                        <argument>--directory-prefix=${docs.download.directory}</argument>
-                                        <argument>--domains=chemistry.apache.org</argument>
-                                        <argument>--mirror</argument>
-                                        <argument>-k</argument>
-                                        <argument>-np</argument>
-                                        <argument>--include-directories=/java/${version}</argument>
-                                        <argument>--exclude-directories=/java/${version}/maven/</argument>
-                                        <argument>${docs.start.url}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <!-- Generates aggregated javadocs -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -502,19 +474,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- Assemblies the doc package -->
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <attach>true</attach>
-                            <descriptors>
-                                <descriptor>src/main/assembly/docs-assembly.xml</descriptor>
-                            </descriptors>
-                            <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
-                        </configuration>
-                    </plugin>
                     <!--
                         We want to package up licenses
                         resources in the JARs produced



Mime
View raw message