wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jra...@apache.org
Subject svn commit: r1026449 - in /incubator/wink/trunk: wink-common/pom.xml wink-jcdi-server/pom.xml
Date Fri, 22 Oct 2010 18:59:40 GMT
Author: jramos
Date: Fri Oct 22 18:59:39 2010
New Revision: 1026449

URL: http://svn.apache.org/viewvc?rev=1026449&view=rev
Log:
[Wink-322] Fix JDK 1.5 build

Modified:
    incubator/wink/trunk/wink-common/pom.xml
    incubator/wink/trunk/wink-jcdi-server/pom.xml

Modified: incubator/wink/trunk/wink-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/pom.xml?rev=1026449&r1=1026448&r2=1026449&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/pom.xml (original)
+++ incubator/wink/trunk/wink-common/pom.xml Fri Oct 22 18:59:39 2010
@@ -84,12 +84,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-legacy</artifactId>
             <scope>test</scope>
@@ -144,4 +138,19 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>JDK5-common</id>
+            <activation>
+                <jdk>(,1.5]</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.1_spec</artifactId>
+                    <version>1.0</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

Modified: incubator/wink/trunk/wink-jcdi-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-jcdi-server/pom.xml?rev=1026449&r1=1026448&r2=1026449&view=diff
==============================================================================
--- incubator/wink/trunk/wink-jcdi-server/pom.xml (original)
+++ incubator/wink/trunk/wink-jcdi-server/pom.xml Fri Oct 22 18:59:39 2010
@@ -70,12 +70,6 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.1_spec</artifactId>
-            <scope>provided</scope>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>



Mime
View raw message