incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r559040 - in /incubator/yoko/trunk: distribution/assembly-runtime-bin.xml distribution/pom.xml pom.xml
Date Tue, 24 Jul 2007 13:10:24 GMT
Author: bravi
Date: Tue Jul 24 06:10:23 2007
New Revision: 559040

URL: http://svn.apache.org/viewvc?view=rev&rev=559040
Log:
[YOKO-318] - Update for the distribution package to include the bindings module in the runtime
package.

Modified:
    incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
    incubator/yoko/trunk/distribution/pom.xml
    incubator/yoko/trunk/pom.xml

Modified: incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/assembly-runtime-bin.xml?view=diff&rev=559040&r1=559039&r2=559040
==============================================================================
--- incubator/yoko/trunk/distribution/assembly-runtime-bin.xml (original)
+++ incubator/yoko/trunk/distribution/assembly-runtime-bin.xml Tue Jul 24 06:10:23 2007
@@ -69,6 +69,8 @@
               <include>org.apache.yoko:yoko-rmi-spec:jar</include>
               <include>org.apache.yoko:yoko-spec-corba:jar</include>
               <include>org.apache.yoko:yoko-rmi-impl:jar</include>
+              <include>org.apache.yoko:yoko-api:jar</include>
+              <include>org.apache.yoko:yoko-bindings:jar</include>
               <include>org.apache.bcel:bcel:jar</include>
               <include>jakarta-regexp:jakarta-regexp:jar</include>
           </includes>

Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?view=diff&rev=559040&r1=559039&r2=559040
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Tue Jul 24 06:10:23 2007
@@ -47,92 +47,14 @@
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-rmi-impl</artifactId>
         </dependency>
-        <!-- moved to the profile for M2 release
-        Use the profile runtime for just the runtime pieces
-        <dependency>
-            <groupId>org.apache.yoko</groupId>
-            <artifactId>yoko-tools</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-bindings</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        -->
     </dependencies>
 
     <build>
         <plugins>
-            <!-- moved to the profile for M2 release
-            Use the profile runtime for just the runtime pieces
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <id>distribution-src-epl</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <mainClass>yokoinstaller.Installer</mainClass>

-                                </manifest>                               
-                                <manifestEntries>                                 
  
-                                    <Specification-Title>${yoko.name}</Specification-Title>
-                                    <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                                    <Specification-Version>${version}</Specification-Version>
-                                    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                                    <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
-                                </manifestEntries>                                
-                            </archive>
-                            <descriptors>
-                                <descriptor>assembly-bin.xml</descriptor>
-                                <descriptor>assembly-src.xml</descriptor>
-                            </descriptors>
-                            <finalName>yoko-${version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>unpack-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.yoko</groupId>
-                                    <artifactId>yoko-api</artifactId>
-                                    <version>${version}</version>
-                                    <classifier>javadoc</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?view=diff&rev=559040&r1=559039&r2=559040
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Tue Jul 24 06:10:23 2007
@@ -41,14 +41,8 @@
         <module>yoko-spec-corba</module>
         <module>rmi-spec</module>
         <module>rmi-impl</module>
-        <!-- moved to the profile for M2 release
-        Use the profile runtime for just the runtime pieces
         <module>api</module>
-        <module>tools</module>
-        <module>maven-plugins</module>
         <module>bindings</module>
-        <module>distribution</module>
-        -->
         <!-- These are not ready yet
         <module>system_tests</module>
         -->
@@ -434,6 +428,18 @@
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.0-beta-6</version>
+                    <configuration>
+                        <tagBase>https://svn.apache.org/repos/asf/incubator/yoko/tags</tagBase>
+                        <useReleaseProfile>false</useReleaseProfile>
+                        <preparationGoals>clean install</preparationGoals>
+                        <goals>deploy</goals>
+                        <arguments>-Pfull,release,deploy</arguments>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.0-alpha-1</version>
                 </plugin>
@@ -621,10 +627,8 @@
            <activeByDefault>true</activeByDefault>
         </activation>
         <modules>
-            <module>api</module>
             <module>tools</module>
             <module>maven-plugins</module>
-            <module>bindings</module>
             <module>distribution</module>
         </modules>
      </profile>
@@ -687,10 +691,7 @@
               </execution>
             </executions>
           </plugin>
-          <!--plugin>
-            This does NOT work yet.   They will not have the NOTICE/DISCLAIMER/LICENSE.
-            Once Yoko moves to the remote-resources to take care of them, this can be uncommented
-
+          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>2.2</version>
@@ -702,7 +703,7 @@
                 </goals>
               </execution>
             </executions>
-          </plugin-->
+          </plugin>
         </plugins>
       </build>
     </profile>



Mime
View raw message