Valid poms

4 messages Options
Embed this post
Permalink
Rémi Dewitte-2

Valid poms

Reply Threaded More More options
Print post
Permalink
Hello,

Nice work Thierry on editions. A bit tough to make it work with maven at first look. Here is a patch to do so.

There is an issue with the osgi package. I could not figure how to make use of <maven> inside library.xml.

Bonus question, how to develop an extension module independent of the edition using maven ? I have the feeling that we miss the API/Engine separation we had with 1.0.

Thanks,
Rémi

[valid-poms.diff]

Index: build/tmpl/poms/org.restlet.test.pom
===================================================================
--- build/tmpl/poms/org.restlet.test.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.test.pom (working copy)
@@ -29,87 +29,87 @@
  <version>${lib-junit-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.gwt</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.atom</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.freemarker</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.grizzly</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.gwt</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.httpclient</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.jaxb</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.jaxrs</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.jetty</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.lucene</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.net</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.rdf</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.simple</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.spring</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.velocity</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.wadl</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.oauth.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.oauth.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.oauth.pom (working copy)
@@ -27,7 +27,7 @@
  <version>${lib-oauth-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.xstream.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.xstream.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.xstream.pom (working copy)
@@ -24,7 +24,7 @@
  <version>${lib-jettison-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.freemarker.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.freemarker.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.freemarker.pom (working copy)
@@ -19,7 +19,7 @@
  <version>${lib-freemarker-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.servlet.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.servlet.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.servlet.pom (working copy)
@@ -20,7 +20,7 @@
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.javamail.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.javamail.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.javamail.pom (working copy)
@@ -19,12 +19,12 @@
  <version>${lib-javamail-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.xml</artifactId>
  <version>${version}</version>
  </dependency>        
Index: build/tmpl/poms/org.restlet.ext.jaxrs.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.jaxrs.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.jaxrs.pom (working copy)
@@ -40,17 +40,17 @@
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.lib.javax.ws.rs</artifactId>
  <version>${lib-jaxrs-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.lib.org.json</artifactId>
  <version>${lib-json-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.wadl.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.wadl.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.wadl.pom (working copy)
@@ -14,12 +14,12 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.xml</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.simple.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.simple.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.simple.pom (working copy)
@@ -14,12 +14,12 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.lib.org.simpleframework</artifactId>
  <version>${lib-simple-version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.example.pom
===================================================================
--- build/tmpl/poms/org.restlet.example.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.example.pom (working copy)
@@ -14,12 +14,12 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.lib.com.db4o</artifactId>
  <version>${lib-db4o-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.lib.com.db4o.nativequery</artifactId>
  <version>${lib-db4o-version}</version>
  </dependency>
@@ -29,57 +29,57 @@
  <version>${lib-junit-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.atom</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.freemarker</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.jaxb</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.jaxrs</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.jetty</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.jibx</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.json</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.rdf</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.spring</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.velocity</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.velocity.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.velocity.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.velocity.pom (working copy)
@@ -19,7 +19,7 @@
  <version>${lib-velocity-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.jetty.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.jetty.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.jetty.pom (working copy)
@@ -34,7 +34,7 @@
  <version>${lib-jetty-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.jdbc.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.jdbc.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.jdbc.pom (working copy)
@@ -19,7 +19,7 @@
  <version>${lib-dbcp-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.pom
===================================================================
--- build/tmpl/poms/org.restlet.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.pom (working copy)
@@ -16,9 +16,9 @@
  <dependency>
  <groupId>org.osgi</groupId>
  <artifactId>osgi_R4_core</artifactId>
- <version>${lib-osgi-version}</version>
+ <version>1.0</version>
  <scope>compile</scope>
  </dependency>
  </dependencies>
 
-</project>
\ No newline at end of file
+</project>
Index: build/tmpl/poms/org.restlet.ext.rome.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.rome.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.rome.pom (working copy)
@@ -14,7 +14,7 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.json.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.json.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.json.pom (working copy)
@@ -14,12 +14,12 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.lib.org.json</artifactId>
  <version>${lib-json-version}</version>
  </dependency>
Index: build/tmpl/poms/com.db4o.nativequery.pom
===================================================================
--- build/tmpl/poms/com.db4o.nativequery.pom (revision 5295)
+++ build/tmpl/poms/com.db4o.nativequery.pom (working copy)
@@ -13,7 +13,7 @@
    <version>@version@</version>
    <dependencies>
       <dependency>
-         <groupId>org.restlet</groupId>
+         <groupId>${groupId}</groupId>
          <artifactId>org.restlet.lib.edu.purdue.cs.bloat</artifactId>
          <version>${lib-bloat-version}</version>
       </dependency>
Index: build/tmpl/poms/org.restlet.ext.grizzly.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.grizzly.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.grizzly.pom (working copy)
@@ -19,7 +19,7 @@
  <version>${lib-grizzly-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.lucene.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.lucene.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.lucene.pom (working copy)
@@ -24,12 +24,12 @@
  <version>${lib-tika-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.xml</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.fileupload.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.fileupload.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.fileupload.pom (working copy)
@@ -20,7 +20,7 @@
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.jaxb.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.jaxb.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.jaxb.pom (working copy)
@@ -19,12 +19,12 @@
  <version>${lib-jaxb-ri-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.xml</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.net.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.net.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.net.pom (working copy)
@@ -14,7 +14,7 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.jibx.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.jibx.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.jibx.pom (working copy)
@@ -19,12 +19,12 @@
  <version>${lib-jibx-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.xml</artifactId>
  <version>${version}</version>
  </dependency>        
Index: build/tmpl/poms/com.db4o.pom
===================================================================
--- build/tmpl/poms/com.db4o.pom (revision 5295)
+++ build/tmpl/poms/com.db4o.pom (working copy)
@@ -13,7 +13,7 @@
    <version>@version@</version>
    <dependencies>
       <dependency>
-         <groupId>org.restlet</groupId>
+         <groupId>${groupId}</groupId>
          <artifactId>org.restlet.lib.edu.purdue.cs.bloat</artifactId>
          <version>${lib-bloat-version}</version>
       </dependency>
Index: build/tmpl/poms/org.restlet.ext.atom.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.atom.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.atom.pom (working copy)
@@ -14,12 +14,12 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
         <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.xml</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.xml.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.xml.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.xml.pom (working copy)
@@ -14,7 +14,7 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.gwt.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.gwt.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.gwt.pom (working copy)
@@ -20,12 +20,12 @@
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.servlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.ssl.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.ssl.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.ssl.pom (working copy)
@@ -14,7 +14,7 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.spring.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.spring.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.spring.pom (working copy)
@@ -20,12 +20,12 @@
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.servlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.rdf.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.rdf.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.rdf.pom (working copy)
@@ -14,12 +14,12 @@
 
  <dependencies>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.xml</artifactId>
  <version>${version}</version>
         </dependency>
Index: build/tmpl/poms/org.restlet.ext.xdb.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.xdb.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.xdb.pom (working copy)
@@ -20,12 +20,12 @@
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet.ext.servlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/poms/org.restlet.ext.httpclient.pom
===================================================================
--- build/tmpl/poms/org.restlet.ext.httpclient.pom (revision 5295)
+++ build/tmpl/poms/org.restlet.ext.httpclient.pom (working copy)
@@ -19,7 +19,7 @@
  <version>${lib-httpclient-version}</version>
  </dependency>
  <dependency>
- <groupId>org.restlet</groupId>
+ <groupId>${groupId}</groupId>
  <artifactId>org.restlet</artifactId>
  <version>${version}</version>
  </dependency>
Index: build/tmpl/editions/build.xml
===================================================================
--- build/tmpl/editions/build.xml (revision 5295)
+++ build/tmpl/editions/build.xml (working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 
 <!-- ===============================================================
      Restlet build script - Copyright 2005-2009 Noelios Technologies
@@ -402,16 +402,6 @@
  <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@group-id@" value="${mod-maven-groupId}" />
  <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@artifact-id@" value="${mod-pom-@{name}-artifactId}" />
  <copy file="${temp}/poms/${mod-@{name}-id}.pom" tofile="${pom-mods}/${mod-@{name}-id}/pom.xml" overwrite="true" />
-
- <!-- Generation of the pom.xml file for the source code-->
- <copy file="${tmpl}/poms/${mod-@{name}-id}.pom" tofile="${temp}/poms/${mod-@{name}-id}.pom" overwrite="true" />
- <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@parent-group-id@" value="org.restlet" />
- <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@parent-artifact-id@" value="org.restlet.parent" />
- <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@parent-version@" value="${parent-maven-version}" />
- <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@lib-@{name}-version@" value="${mod-pom-@{name}-version}" />
- <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@group-id@" value="${mod-maven-groupId}" />
- <replace file="${temp}/poms/${mod-@{name}-id}.pom" token="@artifact-id@" value="${mod-pom-@{name}-artifactId}" />
- <copy file="${temp}/poms/${mod-@{name}-id}.pom" tofile="${mods}/${mod-@{name}-id}/pom.xml" overwrite="true" />
 
  </sequential>
  </macrodef>

Thierry Boileau

Re: Valid poms

Reply Threaded More More options
Print post
Permalink
Salut Rémi,

thanks a lot for your contribution, I've updated the trunk, and the pom
files of the 2.0m4.

 >Bonus question, how to develop an extension module independent of the
edition using maven ? I have the feeling that we miss the API/Engine
separation we had with 1.0.
Yes you're right. Actually, there was no need anymore to separate
formally in two modules these aspects. So, the engine is located under
the package org.restlet.engine.

best regards,
Thierry Boileau

> Hello,
>
> Nice work Thierry on editions. A bit tough to make it work with maven
> at first look. Here is a patch to do so.
>
> There is an issue with the osgi package. I could not figure how to
> make use of <maven> inside library.xml.
>
> Bonus question, how to develop an extension module independent of the
> edition using maven ? I have the feeling that we miss the API/Engine
> separation we had with 1.0.
>
> Thanks,
> Rémi

------------------------------------------------------
http://restlet.tigris.org/ds/viewMessage.do?dsForumId=7458&dsMessageId=2384398
Rémi Dewitte-2

Re: Valid poms

Reply Threaded More More options
Print post
Permalink
Hello,

I think we should simply remove all pom.xml in modules and libraries since as far as I understand they cannot be used anymore.

About developing maven extension out of the restlet build system, when I use maven dependency mechanism, even if I develop an extension that could be used with jse and jee edition I am forced to depend on a specific edition. To be more concrete, there is no dependency I can define as such :
        <dependency>
            <groupId>org.restlet.api</groupId>
            <artifactId>org.restlet</artifactId>
            <version>${restlet.version}</version>
        </dependency>

I am not sure if using scope "provided" would help on this.

Anyway thanks,
Rémi


On Mon, Aug 17, 2009 at 17:07, Thierry Boileau <[hidden email]> wrote:
Salut Rémi,

thanks a lot for your contribution, I've updated the trunk, and the pom
files of the 2.0m4.

 >Bonus question, how to develop an extension module independent of the
edition using maven ? I have the feeling that we miss the API/Engine
separation we had with 1.0.
Yes you're right. Actually, there was no need anymore to separate
formally in two modules these aspects. So, the engine is located under
the package org.restlet.engine.

best regards,
Thierry Boileau

> Hello,
>
> Nice work Thierry on editions. A bit tough to make it work with maven
> at first look. Here is a patch to do so.
>
> There is an issue with the osgi package. I could not figure how to
> make use of <maven> inside library.xml.
>
> Bonus question, how to develop an extension module independent of the
> edition using maven ? I have the feeling that we miss the API/Engine
> separation we had with 1.0.
>
> Thanks,
> Rémi

------------------------------------------------------
http://restlet.tigris.org/ds/viewMessage.do?dsForumId=7458&dsMessageId=2384398

jlouvel

RE: Valid poms

Reply Threaded More More options
Print post
Permalink
Some javascript/style in this post has been disabled (why?)

Hi Rémi,

 

The SVN trunk is still our day to day development base. Even if it is used to generate the source code of all editions, the source code can still be compiled and tested (in JSE/JEE environment only).

 

Therefore, it still seems useful to have those POMs to let Maven developers play with the SVN trunk and contribute patches not specific to a given edition.

 

Regarding your last question, I’m not sure to understand it… The current mechanism to generate POM files for Restlet extensions is to add a template POM file in “\build\tmpl\poms” and to add a “module.xml” file in the extension directory. The build system will take care of the rest, not need to tweak the “build.xml” Ant script anymore.

 

Best regards,
Jerome Louvel
--
Restlet ~ Founder and Lead developer ~ http://www.restlet.org
Noelios Technologies ~ Co-founder ~
http://www.noelios.com

 

 

 

 

De : [hidden email] [mailto:[hidden email]] De la part de Rémi Dewitte
Envoyé : vendredi 21 août 2009 13:57
À : [hidden email]
Objet : Re: Valid poms

 

Hello,

I think we should simply remove all pom.xml in modules and libraries since as far as I understand they cannot be used anymore.

About developing maven extension out of the restlet build system, when I use maven dependency mechanism, even if I develop an extension that could be used with jse and jee edition I am forced to depend on a specific edition. To be more concrete, there is no dependency I can define as such :
        <dependency>
            <groupId>org.restlet.api</groupId>
            <artifactId>org.restlet</artifactId>
            <version>${restlet.version}</version>
        </dependency>

I am not sure if using scope "provided" would help on this.

Anyway thanks,
Rémi

On Mon, Aug 17, 2009 at 17:07, Thierry Boileau <[hidden email]> wrote:

Salut Rémi,

thanks a lot for your contribution, I've updated the trunk, and the pom
files of the 2.0m4.


 >Bonus question, how to develop an extension module independent of the
edition using maven ? I have the feeling that we miss the API/Engine
separation we had with 1.0.

Yes you're right. Actually, there was no need anymore to separate
formally in two modules these aspects. So, the engine is located under
the package org.restlet.engine.

best regards,
Thierry Boileau


> Hello,
>
> Nice work Thierry on editions. A bit tough to make it work with maven
> at first look. Here is a patch to do so.
>
> There is an issue with the osgi package. I could not figure how to
> make use of <maven> inside library.xml.
>
> Bonus question, how to develop an extension module independent of the
> edition using maven ? I have the feeling that we miss the API/Engine
> separation we had with 1.0.
>
> Thanks,

> Rémi

------------------------------------------------------
http://restlet.tigris.org/ds/viewMessage.do?dsForumId=7458&dsMessageId=2384398