On 03/07/10 09:37, Max Bowsher wrote: > Please merge the 2.0-maven branch to trunk. > > It contains the POMs built to support the upload of Guice 2.0 to the > Maven repository. > > Once they are in trunk, I will provide a patch to update them for 3.0. > > Merge specifics (assuming a Subversion 1.6.x client): > > svn merge -r 1013:HEAD ^/branches/2.0-maven > svn commit -m "Merge 2.0-maven branch into trunk."
Well, I guess nothing stops me sending the patch now, though it depends on the above-mentioned merge having taken place first - so here it is. NB: To *begin*, I've aimed for the modest goal of making POMs which are suitable just for distributing the 3.0 jars. Once that's accomplished and committed, I'll revisit the topic of making the POMs capable of assisting IDE project generation. Note for reviewer, on the fact that I deleted "<inherited>true</inherited" - it's the default, and unnecessary to specify. Max.
=== modified file 'extensions/assistedinject/pom.xml'
--- extensions/assistedinject/pom.xml 2009-07-31 21:28:50 +0000
+++ extensions/assistedinject/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-assisted-inject</artifactId>
<packaging>jar</packaging>
=== modified file 'extensions/grapher/pom.xml'
--- extensions/grapher/pom.xml 2009-07-31 21:28:50 +0000
+++ extensions/grapher/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-grapher</artifactId>
<packaging>jar</packaging>
=== modified file 'extensions/jmx/pom.xml'
--- extensions/jmx/pom.xml 2009-07-31 21:28:50 +0000
+++ extensions/jmx/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-jmx</artifactId>
<packaging>jar</packaging>
=== modified file 'extensions/jndi/pom.xml'
--- extensions/jndi/pom.xml 2009-07-31 21:28:50 +0000
+++ extensions/jndi/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-jndi</artifactId>
<packaging>jar</packaging>
=== modified file 'extensions/multibindings/pom.xml'
--- extensions/multibindings/pom.xml 2009-07-31 21:28:50 +0000
+++ extensions/multibindings/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-multibindings</artifactId>
<packaging>jar</packaging>
=== added file 'extensions/persist/pom.xml'
--- extensions/persist/pom.xml 1970-01-01 00:00:00 +0000
+++ extensions/persist/pom.xml 2010-07-03 09:17:39 +0000
@@ -0,0 +1,36 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ 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.inject.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>guice-persist</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: Persist</name>
+ <description>Tools for integrating with JPA</description>
+ <!-- Note: this pom is for dependency management only. It will not build the project -->
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- guice-persist depends on guice-servlet to implement request-scoped units of work. -->
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
=== modified file 'extensions/pom.xml'
--- extensions/pom.xml 2009-07-31 21:28:50 +0000
+++ extensions/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,7 +5,8 @@
<parent>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../guice-parent/pom.xml</relativePath>
</parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
@@ -16,6 +17,16 @@
<dependencies>
<dependency>
<groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-assisted-inject</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>${version}</version>
</dependency>
=== modified file 'extensions/throwingproviders/pom.xml'
--- extensions/throwingproviders/pom.xml 2009-07-31 21:28:50 +0000
+++ extensions/throwingproviders/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-throwing-providers</artifactId>
<packaging>jar</packaging>
=== modified file 'guice-parent/pom.xml'
--- guice-parent/pom.xml 2009-07-31 21:28:50 +0000
+++ guice-parent/pom.xml 2010-07-03 09:17:39 +0000
@@ -10,7 +10,7 @@
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
<name>Google Guice</name>
<description>Guice (pronounced 'juice') is a lightweight dependency injection
framework for Java 5 and above, brought to you by Google.</description>
@@ -62,7 +62,6 @@
<source>1.5</source>
<target>1.5</target>
</configuration>
- <inherited>true</inherited>
</plugin>
</plugins>
</pluginManagement>
=== modified file 'pom.xml'
--- pom.xml 2009-06-18 15:45:19 +0000
+++ pom.xml 2010-07-03 09:17:39 +0000
@@ -5,10 +5,12 @@
<parent>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>guice-parent/pom.xml</relativePath>
</parent>
<artifactId>guice</artifactId>
<packaging>jar</packaging>
+ <name>Google Guice: Core</name>
<!-- Note: this pom is for dependency management only. It will not build the project -->
<dependencies>
<!-- CGLib is not listed because it has been repackaged with JarJar -->
@@ -16,5 +18,13 @@
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
+
+ <!-- Not optional, even in pure-Guice, no JSR 330 applications:
+ javax.inject.Provider is referenced in Guice code. -->
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
</dependencies>
</project>
=== modified file 'servlet/pom.xml'
--- servlet/pom.xml 2009-07-31 21:28:50 +0000
+++ servlet/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,11 +5,11 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-servlet</artifactId>
<packaging>jar</packaging>
- <name>Google Guice - Extensions: Servlet</name>
+ <name>Google Guice - Extension: Servlet</name>
<description>Guice integration with servlets</description>
<!-- Note: this pom is for dependency management only. It will not build the project -->
<dependencies>
=== modified file 'spring/pom.xml'
--- spring/pom.xml 2009-07-31 21:28:50 +0000
+++ spring/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,11 +5,11 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-spring</artifactId>
<packaging>jar</packaging>
- <name>Google Guice - Extensions: Spring</name>
+ <name>Google Guice - Extension: 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>
=== modified file 'struts2/plugin/pom.xml'
--- struts2/plugin/pom.xml 2009-07-31 21:34:08 +0000
+++ struts2/plugin/pom.xml 2010-07-03 09:17:39 +0000
@@ -5,11 +5,11 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-struts2-plugin</artifactId>
<packaging>jar</packaging>
- <name>Google Guice - Extensions: Struts2 Plugin</name>
+ <name>Google Guice - Extension: 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>
signature.asc
Description: OpenPGP digital signature
