Author: gk5885
Date: Mon May 25 19:58:37 2009
New Revision: 989

Modified:
    branches/1.0-maven/guice-parent/pom.xml
    branches/1.0-maven/integration-parent/pom.xml
    branches/1.0-maven/pom.xml
    branches/1.0-maven/servlet/pom.xml
    branches/1.0-maven/spring/pom.xml
    branches/1.0-maven/struts2/plugin/pom.xml

Log:
I have made a few changes to the poms and will be submitting it to the repo  
shortly.
   - I have added comments that these poms WILL NOT and won't ever build the  
project.  They provide enough metadata to be valid for dependency  
management only.
   - I have changed the com.google.guice groupId to com.google.inject
   - I pulled the spring and webwork dependencies down from the parent  
dependency management as they are not used across projects.
   - I fixed the issue with the groupId reference in the parent.  Good catch.



Modified: branches/1.0-maven/guice-parent/pom.xml
==============================================================================
--- branches/1.0-maven/guice-parent/pom.xml     (original)
+++ branches/1.0-maven/guice-parent/pom.xml     Mon May 25 19:58:37 2009
@@ -7,7 +7,7 @@
      <artifactId>google</artifactId>
      <version>1</version>
    </parent>
-  <groupId>com.google.guice</groupId>
+  <groupId>com.google.inject</groupId>
    <artifactId>guice-parent</artifactId>
    <packaging>pom</packaging>
    <version>1.0</version>
@@ -39,7 +39,7 @@
    <dependencyManagement>
      <dependencies>
        <dependency>
-        <groupId>${groupId}</groupId>
+        <groupId>com.google.inject</groupId>
          <artifactId>guice</artifactId>
          <version>${version}</version>
        </dependency>

Modified: branches/1.0-maven/integration-parent/pom.xml
==============================================================================
--- branches/1.0-maven/integration-parent/pom.xml       (original)
+++ branches/1.0-maven/integration-parent/pom.xml       Mon May 25 19:58:37 2009
@@ -3,11 +3,11 @@
      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0  
http://maven.apache.org/maven-v4_0_0.xsd";>
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>com.google.guice</groupId>
+    <groupId>com.google.inject</groupId>
      <artifactId>guice-parent</artifactId>
      <version>1.0</version>
    </parent>
-  <groupId>com.google.guice.integration</groupId>
+  <groupId>com.google.inject.integration</groupId>
    <artifactId>integration</artifactId>
    <packaging>pom</packaging>
    <name>Google Guice - Integration</name>
@@ -23,24 +23,6 @@
          <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
          <version>2.5</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>2.0.2</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>opensymphony</groupId>
-        <artifactId>xwork</artifactId>
-        <version>2.0.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-core</artifactId>
-        <version>2.0.5</version>
          <scope>provided</scope>
        </dependency>
      </dependencies>

Modified: branches/1.0-maven/pom.xml
==============================================================================
--- branches/1.0-maven/pom.xml  (original)
+++ branches/1.0-maven/pom.xml  Mon May 25 19:58:37 2009
@@ -3,15 +3,15 @@
      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0  
http://maven.apache.org/maven-v4_0_0.xsd";>
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>com.google.guice</groupId>
+    <groupId>com.google.inject</groupId>
      <artifactId>guice-parent</artifactId>
      <version>1.0</version>
    </parent>
    <artifactId>guice</artifactId>
    <packaging>jar</packaging>
+  <!-- Note: this pom is for dependency management only.  It will not  
build the project -->
    <dependencies>
-    <!-- Google Collections and CGLib are not listed because they have been
-         repackaged with JarJar -->
+    <!-- CGLib is not listed because it has been repackaged with JarJar -->
      <dependency>
        <groupId>aopalliance</groupId>
        <artifactId>aopalliance</artifactId>

Modified: branches/1.0-maven/servlet/pom.xml
==============================================================================
--- branches/1.0-maven/servlet/pom.xml  (original)
+++ branches/1.0-maven/servlet/pom.xml  Mon May 25 19:58:37 2009
@@ -3,7 +3,7 @@
      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0  
http://maven.apache.org/maven-v4_0_0.xsd";>
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>com.google.guice.integration</groupId>
+    <groupId>com.google.inject.integration</groupId>
      <artifactId>integration</artifactId>
      <version>1.0</version>
    </parent>
@@ -11,9 +11,10 @@
    <packaging>jar</packaging>
    <name>Google Guice - Integration: Servlet</name>
    <description>Guice integration with servlets</description>
+  <!-- Note: this pom is for dependency management only.  It will not  
build the project -->
    <dependencies>
      <dependency>
-      <groupId>com.google.guice</groupId>
+      <groupId>com.google.inject</groupId>
        <artifactId>guice</artifactId>
      </dependency>
      <dependency>

Modified: branches/1.0-maven/spring/pom.xml
==============================================================================
--- branches/1.0-maven/spring/pom.xml   (original)
+++ branches/1.0-maven/spring/pom.xml   Mon May 25 19:58:37 2009
@@ -3,7 +3,7 @@
      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0  
http://maven.apache.org/maven-v4_0_0.xsd";>
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>com.google.guice.integration</groupId>
+    <groupId>com.google.inject.integration</groupId>
      <artifactId>integration</artifactId>
      <version>1.0</version>
    </parent>
@@ -11,14 +11,17 @@
    <packaging>jar</packaging>
    <name>Google Guice - Integration: Spring</name>
    <description>Guice integration with the Spring container</description>
+  <!-- Note: this pom is for dependency management only.  It will not  
build the project -->
    <dependencies>
      <dependency>
-      <groupId>com.google.guice</groupId>
+      <groupId>com.google.inject</groupId>
        <artifactId>guice</artifactId>
      </dependency>
      <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-beans</artifactId>
+      <version>2.0.2</version>
+      <scope>provided</scope>
      </dependency>
    </dependencies>
  </project>

Modified: branches/1.0-maven/struts2/plugin/pom.xml
==============================================================================
--- branches/1.0-maven/struts2/plugin/pom.xml   (original)
+++ branches/1.0-maven/struts2/plugin/pom.xml   Mon May 25 19:58:37 2009
@@ -3,7 +3,7 @@
      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0  
http://maven.apache.org/maven-v4_0_0.xsd";>
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>com.google.guice.integration</groupId>
+    <groupId>com.google.inject.integration</groupId>
      <artifactId>integration</artifactId>
      <version>1.0</version>
    </parent>
@@ -11,22 +11,27 @@
    <packaging>jar</packaging>
    <name>Google Guice - Integration: Struts2 Plugin</name>
    <description>Guice integration with Struts2 as a plugin</description>
+  <!-- Note: this pom is for dependency management only.  It will not  
build the project -->
    <dependencies>
      <dependency>
-      <groupId>com.google.guice</groupId>
+      <groupId>com.google.inject</groupId>
        <artifactId>guice</artifactId>
      </dependency>
      <dependency>
-      <groupId>com.google.guice.integration</groupId>
+      <groupId>com.google.inject.integration</groupId>
        <artifactId>guice-servlet</artifactId>
      </dependency>
      <dependency>
        <groupId>opensymphony</groupId>
        <artifactId>xwork</artifactId>
+      <version>2.0.0</version>
+      <scope>provided</scope>
      </dependency>
      <dependency>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-core</artifactId>
+      <version>2.0.5</version>
+      <scope>provided</scope>
      </dependency>
    </dependencies>
  </project>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"google-guice-dev" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/google-guice-dev?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to