You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/03/08 07:28:32 UTC

svn commit: r515939 - in /incubator/tuscany/branches/sca-java-integration: pom/parent/pom.xml sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml sca/pom.xml spec/sca-api-r1.0/pom.xml testing/sca/interop/clients/pom.xml testing/sca/pom.xml

Author: rfeng
Date: Wed Mar  7 22:28:31 2007
New Revision: 515939

URL: http://svn.apache.org/viewvc?view=rev&rev=515939
Log:
[sca-integration-branch] Move to Surefire 2.3 and JUnit 4.2

Modified:
    incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/pom.xml
    incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml
    incubator/tuscany/branches/sca-java-integration/testing/sca/interop/clients/pom.xml
    incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml

Modified: incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml?view=diff&rev=515939&r1=515938&r2=515939
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml Wed Mar  7 22:28:31 2007
@@ -124,6 +124,35 @@
                 </includes>
             </resource>
         </resources>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.0.2</version>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <includes>
+                            <include>**/*TestCase.java</include>
+                        </includes>
+                        <reportFormat>brief</reportFormat>
+                        <useFile>false</useFile>
+                        <forkMode>once</forkMode>
+                        <argLine>-ea</argLine>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml?view=diff&rev=515939&r1=515938&r2=515939
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml Wed Mar  7 22:28:31 2007
@@ -58,6 +58,7 @@
              <plugin>
         		<groupId>org.apache.maven.plugins</groupId>
         		<artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.3</version>
         		<configuration>
           			<skip>true</skip>
        			 </configuration>

Modified: incubator/tuscany/branches/sca-java-integration/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/pom.xml?view=diff&rev=515939&r1=515938&r2=515939
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/pom.xml Wed Mar  7 22:28:31 2007
@@ -180,7 +180,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>3.8.1</version>
+                <version>4.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml?view=diff&rev=515939&r1=515938&r2=515939
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml Wed Mar  7 22:28:31 2007
@@ -29,7 +29,7 @@
     <name>SCA API Version 1.0</name>
     <description>API classes for the Service Component Architecture</description>
     <version>0.1-integration-incubating-SNAPSHOT</version>
-    <packaging>osgi-bundle</packaging>
+    <packaging>jar</packaging>
 
     <properties>
         <specVersion>1.0</specVersion>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <version>4.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -75,25 +75,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix.plugins</groupId>
-                <artifactId>maven-osgi-plugin</artifactId>
-                <version>0.8.0-SNAPSHOT</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <osgiManifest>
-                        <bundleName>${pom.name}</bundleName>
-                        <bundleDescription>${pom.description}</bundleDescription>
-                        <bundleVendor>${pom.organization.name}</bundleVendor>
-                        <bundleLocalization>plugin</bundleLocalization>
-                        <bundleSymbolicName>org.osoa.sca</bundleSymbolicName>
-                        <exportPackage>org.osoa.sca;version="${specVersion}", org.osoa.sca.annotations;version="${specVersion}"</exportPackage>
-                    </osgiManifest>
                 </configuration>
             </plugin>
         </plugins>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/interop/clients/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/interop/clients/pom.xml?view=diff&rev=515939&r1=515938&r2=515939
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/interop/clients/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/interop/clients/pom.xml Wed Mar  7 22:28:31 2007
@@ -37,6 +37,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.3</version>
                 <configuration>
                     <includes>
                         <include>**/*TestCase.java</include>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml?view=diff&rev=515939&r1=515938&r2=515939
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml Wed Mar  7 22:28:31 2007
@@ -130,6 +130,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.0.2</version>
                     <configuration>
                         <source>1.5</source>
                         <target>1.5</target>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org