You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/04/26 22:22:56 UTC

svn commit: r1476383 - in /openwebbeans/trunk/webbeans-cdi11: ./ pom.xml

Author: struberg
Date: Fri Apr 26 20:22:55 2013
New Revision: 1476383

URL: http://svn.apache.org/r1476383
Log:
OWB-846 add geronimo-jcdi-1.1 api

Modified:
    openwebbeans/trunk/webbeans-cdi11/   (props changed)
    openwebbeans/trunk/webbeans-cdi11/pom.xml

Propchange: openwebbeans/trunk/webbeans-cdi11/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 26 20:22:55 2013
@@ -0,0 +1,11 @@
+target
+.metadata
+.classpath
+.project
+.settings
+*.iml
+*.ipr
+*.iws
+.idea
+.git
+.gitignore

Modified: openwebbeans/trunk/webbeans-cdi11/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-cdi11/pom.xml?rev=1476383&r1=1476382&r2=1476383&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-cdi11/pom.xml (original)
+++ openwebbeans/trunk/webbeans-cdi11/pom.xml Fri Apr 26 20:22:55 2013
@@ -24,12 +24,19 @@
         <artifactId>openwebbeans</artifactId>
         <version>1.2.0-SNAPSHOT</version>
     </parent>
+
     <artifactId>openwebbeans-cdi11</artifactId>
     <name>OpenWebBeans Core for CDI 1.1</name>
     <description>
         Apache OpenWebBeans Implementation core module implementing cdi 1.1
     </description>
 
+
+    <properties>
+        <cdi11-tck.version>1.1.0.Final</cdi11-tck.version>
+    </properties>
+
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -42,12 +49,26 @@
             <artifactId>xbean-finder-shaded</artifactId>
         </dependency>
 
+<!--X TODO remove
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
             <version>1.1</version>
             <optional>true</optional>
         </dependency>
+-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+            <optional>true</optional>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.2_spec</artifactId>
+            <version>1.0.MR2-SNAPSHOT</version>
+        </dependency>
+
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -151,32 +172,27 @@
                     </replacements>
                 </configuration>
             </plugin>
-        </plugins>
-    </build>
 
-    <reporting>
-        <plugins>
-            <!-- Apache plugins in alphabetical order -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>cim</report>
-                            <report>index</report>
-                            <report>issue-tracking</report>
-                            <report>mailing-list</report>
-                            <report>project-team</report>
-                            <report>scm</report>
-                            <report>summary</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.7</version>
+                <configuration>
+                    <sources>
+                        <source>${project.build.directory}/generated-sources</source>
+                    </sources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>add-sources</id>
+                        <goals><goal>add-source</goal></goals>
+                        <phase>process-sources</phase>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-    </reporting>
+    </build>
+
 
     <profiles>
         <profile>
@@ -213,6 +229,69 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>tck11</id>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.cdi.tck</groupId>
+                    <artifactId>cdi-tck-api</artifactId>
+                    <version>${cdi11-tck.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.cdi.tck</groupId>
+                    <artifactId>cdi-tck-impl</artifactId>
+                    <version>${cdi11-tck.version}</version>
+                    <scope>test</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.openwebbeans.arquillian</groupId>
+                    <artifactId>owb-arquillian-parent</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+
+
+                <dependency>
+                    <groupId>org.apache.xbean</groupId>
+                    <artifactId>xbean-finder-shaded</artifactId>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                    <version>6.3</version>
+                    <scope>test</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-spi</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-impl</artifactId>
+                </dependency>
+
+            </dependencies>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludedGroups>javaee-full</excludedGroups>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>standalone-suite.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>