tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelvingood...@apache.org
Subject svn commit: r662792 - in /incubator/tuscany/tags/java/sdo/1.1.1-RC2: BUILDING distribution/src/main/assembly/bin.xml impl/pom.xml
Date Tue, 03 Jun 2008 13:35:38 GMT
Author: kelvingoodson
Date: Tue Jun  3 06:35:38 2008
New Revision: 662792

URL: http://svn.apache.org/viewvc?rev=662792&view=rev
Log:
Fix missing emf jars,  unnecessary inclusion of felix jars and bump required version of maven
to 2.0.9 to avoid hitting http://jira.codehaus.org/browse/MJAVADOC-135 

Modified:
    incubator/tuscany/tags/java/sdo/1.1.1-RC2/BUILDING
    incubator/tuscany/tags/java/sdo/1.1.1-RC2/distribution/src/main/assembly/bin.xml
    incubator/tuscany/tags/java/sdo/1.1.1-RC2/impl/pom.xml

Modified: incubator/tuscany/tags/java/sdo/1.1.1-RC2/BUILDING
URL: http://svn.apache.org/viewvc/incubator/tuscany/tags/java/sdo/1.1.1-RC2/BUILDING?rev=662792&r1=662791&r2=662792&view=diff
==============================================================================
--- incubator/tuscany/tags/java/sdo/1.1.1-RC2/BUILDING (original)
+++ incubator/tuscany/tags/java/sdo/1.1.1-RC2/BUILDING Tue Jun  3 06:35:38 2008
@@ -1,7 +1,3 @@
-Building the SDO Release from a Source Distribution
-===================================================
-
-
 Note,  these instructions are for building the SDO binary release from
 source, not for establishing a development environment.  If you wish to
 participate in sdo development, follow the instructions at 
@@ -12,23 +8,19 @@
 -------------
 
 1) Install J2SE JDK 1.4.2 or above
-2) Install Maven: Download Maven 2.0.7 (download from http://maven.apache.org/download.html)
Follow the maven instructions for
+2) Install Maven: Download Maven 2.0.9 (download from http://maven.apache.org/download.html)
Follow the maven instructions for
 configuring the JAVA_HOME environment variable, and ensuring that the "mvn" command is on
your execution PATH.
 
 Building
 --------
 
-1) If you have chosen to install a JDK at version 5 then all will be fine,  but there is
one value add component in the
-   Tuscany SDO implementation which relies on new JDK 5.0 features.  If you do not wish to
use JDK 5 for the following
-   build step, then you will need to do mvn -Pjava_1_4_maven, as this profile option excludes
the JDK5 dependent features.
-2) In a command window/shell, change to the top level directory of the Tuscany SDO Java source
distribution.
-3) Execute: mvn
+1) Open a command window/shell and change to the top level directory of the Tuscany SDO Java
source distribution.
+3) If using JDK 5, execute: mvn
+   If using JDK 1.4.* execute mvn -Pjava_1_4_maven
    This will install the sdo implementation and tools jars in your local maven repository
-4) If you wish to rebuild the Tuscany SDO Java binary dstribution change directory to "distribution"
and run mvn
+4) If you wish to rebuild the Tuscany SDO Java binary distribution change directory to "distribution"
and run mvn
    This will create archives of the binary and source distributions in the target subdirectory
of the distribution directory
 
 Note: Depending on the load being experienced by remote Maven 2.0 repositories you may have
to execute mvn several
     times until required dependencies are all located in your local maven repository.  After
you have completed a
     full successful build you can use "mvn -o" which builds without trying to access updated
build dependencies (offline mode) and is much faster.
-
-

Modified: incubator/tuscany/tags/java/sdo/1.1.1-RC2/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/tags/java/sdo/1.1.1-RC2/distribution/src/main/assembly/bin.xml?rev=662792&r1=662791&r2=662792&view=diff
==============================================================================
--- incubator/tuscany/tags/java/sdo/1.1.1-RC2/distribution/src/main/assembly/bin.xml (original)
+++ incubator/tuscany/tags/java/sdo/1.1.1-RC2/distribution/src/main/assembly/bin.xml Tue Jun
 3 06:35:38 2008
@@ -120,13 +120,6 @@
     <dependencySets>
         <dependencySet>
             <outputDirectory>tuscany-sdo-${sdo.version}/lib</outputDirectory>
-            <includes>
-            	<include>org.apache.tuscany.sdo:tuscany-sdo-api-r2.1</include>
-                <include>org.apache.tuscany.sdo:tuscany-sdo-lib</include>
-                <include>org.apache.tuscany.sdo:tuscany-sdo-impl</include>
-                <include>org.apache.tuscany.sdo:tuscany-sdo-tools</include>
-                <include>org.apache.tuscany.sdo:sample-sdo</include>
-            </includes>
             <fileMode>0644</fileMode>
         </dependencySet>
 

Modified: incubator/tuscany/tags/java/sdo/1.1.1-RC2/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/tags/java/sdo/1.1.1-RC2/impl/pom.xml?rev=662792&r1=662791&r2=662792&view=diff
==============================================================================
--- incubator/tuscany/tags/java/sdo/1.1.1-RC2/impl/pom.xml (original)
+++ incubator/tuscany/tags/java/sdo/1.1.1-RC2/impl/pom.xml Tue Jun  3 06:35:38 2008
@@ -108,6 +108,7 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
             <version>1.0.1</version>
+            <scope>provided</scope>
         </dependency>
 
        <!-- dependencies for test cases -->



Mime
View raw message