Return-Path: 
 <isis-commits-return-1030-apmail-incubator-isis-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C284D2743
	for <apmail-incubator-isis-commits-archive@minotaur.apache.org>;
 Sat, 23 Apr 2011 13:11:14 +0000 (UTC)
Received: (qmail 62455 invoked by uid 500); 23 Apr 2011 13:11:14 -0000
Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org
Received: (qmail 62439 invoked by uid 500); 23 Apr 2011 13:11:14 -0000
Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:isis-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:isis-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:isis-commits@incubator.apache.org>
List-Id: <isis-commits.incubator.apache.org>
Reply-To: isis-dev@incubator.apache.org
Delivered-To: mailing list isis-commits@incubator.apache.org
Received: (qmail 62432 invoked by uid 99); 23 Apr 2011 13:11:14 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Apr 2011 13:11:14 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Apr 2011 13:11:12 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E1E5023889E1; Sat, 23 Apr 2011 13:10:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1096142 - in /incubator/isis/trunk: core/webapp/pom.xml
 pom.xml
 viewer/html/pom.xml viewer/scimpi/servlet/pom.xml
 viewer/wicket/model/pom.xml viewer/wicket/ui/pom.xml
 viewer/wicket/viewer/pom.xml
Date: Sat, 23 Apr 2011 13:10:52 -0000
To: isis-commits@incubator.apache.org
From: struberg@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110423131052.E1E5023889E1@eris.apache.org>

Author: struberg
Date: Sat Apr 23 13:10:52 2011
New Revision: 1096142

URL: http://svn.apache.org/viewvc?rev=1096142&view=rev
Log:
ISIS-87 move javax dependencies to geronimo-spec ones

Modified:
    incubator/isis/trunk/core/webapp/pom.xml
    incubator/isis/trunk/pom.xml
    incubator/isis/trunk/viewer/html/pom.xml
    incubator/isis/trunk/viewer/scimpi/servlet/pom.xml
    incubator/isis/trunk/viewer/wicket/model/pom.xml
    incubator/isis/trunk/viewer/wicket/ui/pom.xml
    incubator/isis/trunk/viewer/wicket/viewer/pom.xml

Modified: incubator/isis/trunk/core/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/pom.xml?rev=1096142&r1=1096141&r2=1096142&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/pom.xml (original)
+++ incubator/isis/trunk/core/webapp/pom.xml Sat Apr 23 13:10:52 2011
@@ -78,9 +78,8 @@
         </dependency>
 
 	    <dependency>
-		    <groupId>javax.servlet</groupId>
-		    <artifactId>servlet-api</artifactId>
-		    <scope>provided</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
 	</dependencies>
 

Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1096142&r1=1096141&r2=1096142&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Sat Apr 23 13:10:52 2011
@@ -87,10 +87,10 @@
         <checkstyle.configLocation>${trunkBaseDir}/src/site/resources/codequality/checkstyle.xml</checkstyle.configLocation>
         <pmd.ruleset>${trunkBaseDir}/src/site/resources/codequality/pmd.xml</pmd.ruleset>
 
-        <projectUrl>${project.url}</projectUrl>
-
-        <!-- plugin versions -->
-        <maven-project-info-reports-plugin>2.2</maven-project-info-reports-plugin>
+        <projectUrl>${project.url}</projectUrl>
+
+        <!-- plugin versions -->
+        <maven-project-info-reports-plugin>2.2</maven-project-info-reports-plugin>
     </properties>
 
 
@@ -216,7 +216,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-beta-1</version>
+                    <version>1.0</version>
                     <configuration>
                         <rules>
                             <requireMavenVersion>
@@ -993,16 +993,16 @@
 
             <!-- Specs -->
             <dependency>
-                <groupId>geronimo-spec</groupId>
-                <artifactId>geronimo-spec-jta</artifactId>
-                <version>1.0.1B-rc1</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+                <version>1.1.1</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.3</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                <version>1.2</version>
                 <scope>provided</scope>
-            </dependency>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1115,25 +1115,25 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>2.5</version>
+                        <version>2.5</version>
                     </plugin>
 
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-project-info-reports-plugin</artifactId>
-                        <version>${maven-project-info-reports-plugin}</version>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-project-info-reports-plugin</artifactId>
+                        <version>${maven-project-info-reports-plugin}</version>
                     </plugin>
 
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>cobertura-maven-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>2.4</version>
                     </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>2.6</version>
+                        <version>2.6</version>
                         <configuration>
                             <configLocation>${checkstyle.configLocation}</configLocation>
                         </configuration>
@@ -1142,7 +1142,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-pmd-plugin</artifactId>
-                        <version>2.5</version>
+                        <version>2.5</version>
                         <configuration>
                             <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
                             <minimumTokens>100</minimumTokens>
@@ -1166,25 +1166,25 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>findbugs-maven-plugin</artifactId>
-                        <version>2.3.1</version>
+                        <version>2.3.1</version>
                     </plugin>
 
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>javancss-maven-plugin</artifactId>
-                        <version>2.0</version>
+                        <version>2.0</version>
                     </plugin>
 
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>jdepend-maven-plugin</artifactId>
-                        <version>2.0-beta-2</version>
+                        <version>2.0-beta-2</version>
                     </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jxr-plugin</artifactId>
-                        <version>2.2</version>
+                        <version>2.2</version>
                         <configuration>
                             <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
                             <linkJavadoc>true</linkJavadoc>
@@ -1195,7 +1195,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>taglist-maven-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>2.4</version>
                         <configuration>
                             <!-- causes out of memory <aggregate>true</aggregate> -->
                             <tagListOptions>
@@ -1229,7 +1229,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.7</version>
+                        <version>2.7</version>
                         <configuration>
                             <quiet>true</quiet>
                             <doctitle>${project.name} ${project.version}</doctitle>

Modified: incubator/isis/trunk/viewer/html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/pom.xml?rev=1096142&r1=1096141&r2=1096142&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/pom.xml (original)
+++ incubator/isis/trunk/viewer/html/pom.xml Sat Apr 23 13:10:52 2011
@@ -40,7 +40,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>${maven-project-info-reports-plugin}</version>
+				<version>${maven-project-info-reports-plugin}</version>
                 <inherited>false</inherited>
                 <configuration>
                 	<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -115,8 +115,8 @@
 			<artifactId>commons-lang</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

Modified: incubator/isis/trunk/viewer/scimpi/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/servlet/pom.xml?rev=1096142&r1=1096141&r2=1096142&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/servlet/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/servlet/pom.xml Sat Apr 23 13:10:52 2011
@@ -24,7 +24,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>${maven-project-info-reports-plugin}</version>
+				<version>${maven-project-info-reports-plugin}</version>
                 <inherited>false</inherited>
                 <configuration>
                 	<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -51,8 +51,8 @@
         </dependency>
 
         <dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
 			<scope>provided</scope>
 		</dependency>
 

Modified: incubator/isis/trunk/viewer/wicket/model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/pom.xml?rev=1096142&r1=1096141&r2=1096142&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/model/pom.xml Sat Apr 23 13:10:52 2011
@@ -19,17 +19,6 @@
 
 	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.3</version>
-				<scope>provided</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.viewer</groupId>

Modified: incubator/isis/trunk/viewer/wicket/ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/pom.xml?rev=1096142&r1=1096141&r2=1096142&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/ui/pom.xml Sat Apr 23 13:10:52 2011
@@ -38,17 +38,6 @@
 		</resources>
 	</build>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.3</version>
-				<scope>provided</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 		    <groupId>org.apache.isis.core</groupId>

Modified: incubator/isis/trunk/viewer/wicket/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/pom.xml?rev=1096142&r1=1096141&r2=1096142&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/pom.xml Sat Apr 23 13:10:52 2011
@@ -38,17 +38,6 @@
 		</resources>
 	</build>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.3</version>
-				<scope>provided</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.viewer</groupId>
@@ -74,8 +63,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
 			<scope>provided</scope>
 		</dependency>