incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
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 GMT
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>
 



Mime
View raw message