Return-Path: <_www@dev.magnolia.info> Received: from dev.magnolia.info ([213.173.174.20] verified) by mail.obinary.com (CommuniGate Pro SMTP 5.1.10) with ESMTP id 14537664 for svn-list@magnolia.info; Fri, 18 Jul 2008 14:01:12 +0200 Received: by dev.magnolia.info (Postfix, from userid 70) id D41CF69B40E; Fri, 18 Jul 2008 14:01:12 +0200 (CEST) MIME-Version: 1.0 X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/ From: svn@magnolia.info Errors-To: svn@magnolia.info To: svn-list@magnolia.info Subject: [16906] [maven-release-plugin] copy for tag magnolia-bundle-parent-3.6-rc4 Reply-To: dev-list@magnolia.info Content-Type: text/html; charset=UTF-8 Message-Id: <20080718120112.D41CF69B40E@dev.magnolia.info> Date: Fri, 18 Jul 2008 14:01:12 +0200 (CEST) Content-Transfer-Encoding: quoted-printable [16906] [maven-release-plugin] copy for tag magnolia-bundle-paren= t-3.6-rc4
Revision
16906
Author
gjoseph
Date
2008-07-18 14:01:12 +0200 (Fri, 18 Jul 2008)

Log Message

[maven-release-plugin]  copy for tag magnolia-bundle-parent-3.6-rc4

Added Paths

Removed Paths

Diff

Copied: magnolia-bundle/tags/magnolia-bundle-p= arent-3.6-rc4 (from rev 16903, magnolia-bundle/trunk)

Deleted: magnolia-bundle/tags/magnolia-bundle-= parent-3.6-rc4/magnolia-bundled-webapp/pom.xml (16903 =3D> 16906)


--- magnolia-bundle/trunk/magnolia-bundled-webapp/po=
m.xml	2008-07-18 11:37:03 UTC (rev 16903)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/magnolia-bundled-=
webapp/pom.xml	2008-07-18 12:01:12 UTC (rev 16906)
@@ -1,67 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8&qu=
ot;?>
-<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:=
xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLoc=
ation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/m=
aven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>info.magnolia</groupId>
-    <artifactId>magnolia-bundle-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>magnolia-bundled-webapp</artifactId>
-  <packaging>war</packaging>
-  <name>magnolia-bundled-webapp</name>
-  <description>Magnolia pre-installed with DMS and samples.</de=
scription>
-  <dependencies>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-empty-webapp</artifactId>
-      <version>${magnoliaVersion}</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-module-samples</artifactId>
-      <version>${magnoliaVersion}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-module-dms</artifactId>
-      <version>1.2.5</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <!-- copied from magnolia-empty-webapp, in order to override its tx=
t files : -->
-  <build>
-    <resources>
-      <resource>
-        <!-- these are the resources copied by the remote-resources-p=
lugin -->
-        <directory>${basedir}/target/maven-shared-archive-resource=
s</directory>
-        <excludes>
-          <exclude>**/*</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <webResources>
-            <resource>
-              <!-- these are the resources copied by the remote-resou=
rces-plugin -->
-              <directory>${basedir}/target/maven-shared-archive-re=
sources</directory>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

Copied: magnolia-bundle/tags/magnolia-bundle-p= arent-3.6-rc4/magnolia-bundled-webapp/pom.xml (from rev 16905, magnolia-b= undle/trunk/magnolia-bundled-webapp/pom.xml) (0 =3D> 16906)


--- magnolia-bundle/tags/magnolia-bundle-parent-3.6-=
rc4/magnolia-bundled-webapp/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/magnolia-bundled-=
webapp/pom.xml	2008-07-18 12:01:12 UTC (rev 16906)
@@ -0,0 +1,67 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8&qu=
ot;?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:=
xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLoc=
ation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/m=
aven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>info.magnolia</groupId>
+    <artifactId>magnolia-bundle-parent</artifactId>
+    <version>3.6-rc4</version>
+  </parent>
+  <artifactId>magnolia-bundled-webapp</artifactId>
+  <packaging>war</packaging>
+  <name>magnolia-bundled-webapp</name>
+  <description>Magnolia pre-installed with DMS and samples.</de=
scription>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-empty-webapp</artifactId>
+      <version>${magnoliaVersion}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-samples</artifactId>
+      <version>${magnoliaVersion}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-dms</artifactId>
+      <version>1.2.5</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- copied from magnolia-empty-webapp, in order to override its tx=
t files : -->
+  <build>
+    <resources>
+      <resource>
+        <!-- these are the resources copied by the remote-resources-p=
lugin -->
+        <directory>${basedir}/target/maven-shared-archive-resource=
s</directory>
+        <excludes>
+          <exclude>**/*</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <!-- these are the resources copied by the remote-resou=
rces-plugin -->
+              <directory>${basedir}/target/maven-shared-archive-re=
sources</directory>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Deleted: magnolia-bundle/tags/magnolia-bundle-= parent-3.6-rc4/magnolia-integration-tests/pom.xml (16903 =3D> 16906)


--- magnolia-bundle/trunk/magnolia-integration-tests=
/pom.xml	2008-07-18 11:37:03 UTC (rev 16903)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/magnolia-integrat=
ion-tests/pom.xml	2008-07-18 12:01:12 UTC (rev 16906)
@@ -1,198 +0,0 @@
-<project xmlns=3D"http://maven.apache.org/POM/4.0.0&=
quot; xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance" x=
si:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.=
apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>info.magnolia</groupId>
-    <artifactId>magnolia-bundle-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
-  </parent>
-  <groupId>info.magnolia</groupId>
-  <artifactId>magnolia-integration-tests</artifactId>
-  <name>magnolia-integration-tests</name>
-  <packaging>pom</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-bundled-webapp</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- tell the compiler to compile the tests, which it does not =
do by default because this project has a packaging of type pom  -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <!-- let surefire be executed in the integration-test phase --&=
gt;
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <configuration>
-          <wait>false</wait>
-          <container>
-            <containerId>${containerId}</containerId>
-            <type>${containerType}</type>
-            <output>${project.build.directory}/${containerId}.log&=
lt;/output>
-            <log>${project.build.directory}/cargo.log</log>
-            <zipUrlInstaller>
-              <url>${url}</url>
-              <installDir>${cargo.installDir}</installDir>
-            </zipUrlInstaller>
-          </container>
-          <configuration>
-            <properties>
-              <cargo.jvmargs>-Xmx1024M -Xdebug -Xrunjdwp:transport=
=3Ddt_socket,address=3D8000,server=3Dy,suspend=3Dn ${jvmargs}</cargo.j=
vmargs>
-              <cargo.servlet.port>${port}</cargo.servlet.port&g=
t;
-              <cargo.logging>high</cargo.logging>
-            </properties>
-
-            <deployables>
-              <deployable>
-                <groupId>info.magnolia</groupId>
-                <artifactId>magnolia-bundled-webapp</artifactId=
>
-                <type>war</type>
-                <properties>
-                  <context>magnoliaAuthor</context>
-                </properties>
-              </deployable>
-              <deployable>
-                <groupId>info.magnolia</groupId>
-                <artifactId>magnolia-bundled-webapp</artifactId=
>
-                <type>war</type>
-                <properties>
-                  <context>magnoliaPublic</context>
-                </properties>
-              </deployable>
-            </deployables>
-
-          </configuration>
-        </configuration>
-
-        <executions>
-          <execution>
-            <id>start</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>stop</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>stop</goal>
-            </goals>
-          </execution>
-        </executions>
-
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>tomcat50</id>
-      <properties>
-        <containerId>tomcat5x</containerId>
-        <containerType>installed</containerType>
-        <port>8080</port>
-        <url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.3=
0/bin/jakarta-tomcat-5.0.30.zip</url>
-      </properties>
-    </profile>
-    <profile>
-      <id>tomcat55</id>
-      <properties>
-        <containerId>tomcat5x</containerId>
-        <containerType>installed</containerType>
-        <port>8080</port>
-        <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5.25/bi=
n/apache-tomcat-5.5.25.zip</url>
-      </properties>
-    </profile>
-    <profile>
-      <id>tomcat60</id>
-      <properties>
-        <containerId>tomcat5x</containerId>
-        <containerType>installed</containerType>
-        <port>8080</port>
-        <url>http://apache.mirror.testserver.li/tomcat/tomcat-6/v6=
.0.14/bin/apache-tomcat-6.0.14.zip</url>
-      </properties>
-    </profile>
-    <profile>
-      <id>jetty6</id>
-      <activation>
-        <!-- TODO : if we activate another profile, will this one be =
disabled, or are we sure the other one's properties will override these ?=
 -->
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <containerId>jetty6x</containerId>
-        <containerType>embedded</containerType>
-        <port>8080</port>
-      </properties>
-    </profile>
-    <profile>
-      <id>jboss42</id>
-      <properties>
-        <containerId>jboss4x</containerId>
-        <containerType>installed</containerType>
-        <port>8080</port>
-        <url>http://switch.dl.sourceforge.net/sourceforge/jboss/jb=
oss-4.2.2.GA.zip</url>
-        <jvmargs>
-          -Djava.security.auth.login.config=3Dfile:///Users/brainbug/Job=
s/J2Global/magnolia-trunk/magnolia-webapp/target/magnolia-webapp-3.5-SNAP=
SHOT/WEB-INF/config/jaas.config
-          -Djboss.home.dir=3D${cargo.installDir}/jboss-4.2.2.GA/jboss-4.=
2.2.GA
-          -Djboss.server.home.dir=3D${cargo.installDir}/jboss-4.2.2.GA/j=
boss-4.2.2.GA/server/default
-          -Djboss.server.home.url=3Dfile:/${cargo.installDir}/jboss-4.2.=
2.GA/jboss-4.2.2.GA/server/default
-          -Djboss.server.name=3Djboss4x
-        </jvmargs>
-      </properties>
-    </profile>
-
-    <!-- unfortunately doesn't work since JBoss doesn't recognize the=
 java.security.auth.login.config property -->
-    <!--
-    <profile>
-      <id>jboss40</id>
-      <properties>
-        <containerId>jboss4x</containerId>
-        <containerType>installed</containerType>
-        <port>8080</port>
-        <url>http://kent.dl.sourceforge.net/sourceforge/jboss/jbos=
s-4.0.5.GA.zip</url>
-        <jvmargs>-Djava.security.auth.login.config=3D${project.bui=
ld.directory}/${project.build.finalName}/WEB-INF/config/jaas.config</j=
vmargs>
-      </properties>
-    </profile>
-    -->
-  </profiles>
-
-
-</project>
<= /a>

Copied: magnolia-bundle/tags/magnolia-bundle-p= arent-3.6-rc4/magnolia-integration-tests/pom.xml (from rev 16905, magnoli= a-bundle/trunk/magnolia-integration-tests/pom.xml) (0 =3D> 16906)


--- magnolia-bundle/tags/magnolia-bundle-parent-3.6-=
rc4/magnolia-integration-tests/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/magnolia-integrat=
ion-tests/pom.xml	2008-07-18 12:01:12 UTC (rev 16906)
@@ -0,0 +1,198 @@
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0&=
quot; xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance" x=
si:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.=
apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>info.magnolia</groupId>
+    <artifactId>magnolia-bundle-parent</artifactId>
+    <version>3.6-rc4</version>
+  </parent>
+  <groupId>info.magnolia</groupId>
+  <artifactId>magnolia-integration-tests</artifactId>
+  <name>magnolia-integration-tests</name>
+  <packaging>pom</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-bundled-webapp</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- tell the compiler to compile the tests, which it does not =
do by default because this project has a packaging of type pom  -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <!-- let surefire be executed in the integration-test phase --&=
gt;
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <configuration>
+          <wait>false</wait>
+          <container>
+            <containerId>${containerId}</containerId>
+            <type>${containerType}</type>
+            <output>${project.build.directory}/${containerId}.log&=
lt;/output>
+            <log>${project.build.directory}/cargo.log</log>
+            <zipUrlInstaller>
+              <url>${url}</url>
+              <installDir>${cargo.installDir}</installDir>
+            </zipUrlInstaller>
+          </container>
+          <configuration>
+            <properties>
+              <cargo.jvmargs>-Xmx1024M -Xdebug -Xrunjdwp:transport=
=3Ddt_socket,address=3D8000,server=3Dy,suspend=3Dn ${jvmargs}</cargo.j=
vmargs>
+              <cargo.servlet.port>${port}</cargo.servlet.port&g=
t;
+              <cargo.logging>high</cargo.logging>
+            </properties>
+
+            <deployables>
+              <deployable>
+                <groupId>info.magnolia</groupId>
+                <artifactId>magnolia-bundled-webapp</artifactId=
>
+                <type>war</type>
+                <properties>
+                  <context>magnoliaAuthor</context>
+                </properties>
+              </deployable>
+              <deployable>
+                <groupId>info.magnolia</groupId>
+                <artifactId>magnolia-bundled-webapp</artifactId=
>
+                <type>war</type>
+                <properties>
+                  <context>magnoliaPublic</context>
+                </properties>
+              </deployable>
+            </deployables>
+
+          </configuration>
+        </configuration>
+
+        <executions>
+          <execution>
+            <id>start</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>stop</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>tomcat50</id>
+      <properties>
+        <containerId>tomcat5x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.3=
0/bin/jakarta-tomcat-5.0.30.zip</url>
+      </properties>
+    </profile>
+    <profile>
+      <id>tomcat55</id>
+      <properties>
+        <containerId>tomcat5x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5.25/bi=
n/apache-tomcat-5.5.25.zip</url>
+      </properties>
+    </profile>
+    <profile>
+      <id>tomcat60</id>
+      <properties>
+        <containerId>tomcat5x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://apache.mirror.testserver.li/tomcat/tomcat-6/v6=
.0.14/bin/apache-tomcat-6.0.14.zip</url>
+      </properties>
+    </profile>
+    <profile>
+      <id>jetty6</id>
+      <activation>
+        <!-- TODO : if we activate another profile, will this one be =
disabled, or are we sure the other one's properties will override these ?=
 -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <containerId>jetty6x</containerId>
+        <containerType>embedded</containerType>
+        <port>8080</port>
+      </properties>
+    </profile>
+    <profile>
+      <id>jboss42</id>
+      <properties>
+        <containerId>jboss4x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://switch.dl.sourceforge.net/sourceforge/jboss/jb=
oss-4.2.2.GA.zip</url>
+        <jvmargs>
+          -Djava.security.auth.login.config=3Dfile:///Users/brainbug/Job=
s/J2Global/magnolia-trunk/magnolia-webapp/target/magnolia-webapp-3.5-SNAP=
SHOT/WEB-INF/config/jaas.config
+          -Djboss.home.dir=3D${cargo.installDir}/jboss-4.2.2.GA/jboss-4.=
2.2.GA
+          -Djboss.server.home.dir=3D${cargo.installDir}/jboss-4.2.2.GA/j=
boss-4.2.2.GA/server/default
+          -Djboss.server.home.url=3Dfile:/${cargo.installDir}/jboss-4.2.=
2.GA/jboss-4.2.2.GA/server/default
+          -Djboss.server.name=3Djboss4x
+        </jvmargs>
+      </properties>
+    </profile>
+
+    <!-- unfortunately doesn't work since JBoss doesn't recognize the=
 java.security.auth.login.config property -->
+    <!--
+    <profile>
+      <id>jboss40</id>
+      <properties>
+        <containerId>jboss4x</containerId>
+        <containerType>installed</containerType>
+        <port>8080</port>
+        <url>http://kent.dl.sourceforge.net/sourceforge/jboss/jbos=
s-4.0.5.GA.zip</url>
+        <jvmargs>-Djava.security.auth.login.config=3D${project.bui=
ld.directory}/${project.build.finalName}/WEB-INF/config/jaas.config</j=
vmargs>
+      </properties>
+    </profile>
+    -->
+  </profiles>
+
+
+</project>

Deleted: magnolia-bundle/tags/magnolia-bundle-= parent-3.6-rc4/magnolia-tomcat-bundle/pom.xml (16903 =3D> 16906)


--- magnolia-bundle/trunk/magnolia-tomcat-bundle/pom=
.xml	2008-07-18 11:37:03 UTC (rev 16903)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/magnolia-tomcat-b=
undle/pom.xml	2008-07-18 12:01:12 UTC (rev 16906)
@@ -1,94 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8&qu=
ot;?>
-<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:=
xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLoc=
ation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/m=
aven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>info.magnolia</groupId>
-    <artifactId>magnolia-bundle-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>magnolia-tomcat-bundle</artifactId>
-  <packaging>pom</packaging>
-  <name>magnolia-tomcat-bundle</name>
-  <description>Magnolia bundled with Tomcat 5.5</description>=
;
-
-  <dependencies>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-bundled-webapp</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-module-workflow</artifactId>
-      <version>${magnoliaVersion}</version>
-      <classifier>bundle</classifier>
-      <type>tar.gz</type>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>info.magnolia</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.0.2</version>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <id>get-tomcat</id>
-            <goals>
-              <goal>download</goal>
-            </goals>
-            <configuration>
-              <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5=
.25/bin/apache-tomcat-5.5.25.tar.gz</url>
-              <destDir>${basedir}/target/extracted-tomcat</dest=
Dir>
-            </configuration>
-          </execution>
-          <execution>
-            <phase>process-resources</phase>
-            <id>get-tomcat-compat-package</id>
-            <goals>
-              <goal>download</goal>
-            </goals>
-            <configuration>
-              <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5=
.25/bin/apache-tomcat-5.5.25-compat.tar.gz</url>
-              <destDir>${basedir}/target/extracted-tomcat-compat&l=
t;/destDir>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <downloadDir>tmp</downloadDir>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <!-- Needs at least version 2.2-beta-2 of the maven-assembly-=
plugin, for it resolves the following issues:
-             http://jira.codehaus.org/browse/MASSEMBLY-73
-             http://jira.codehaus.org/browse/MASSEMBLY-221
-             http://jira.codehaus.org/browse/MASSEMBLY-250 -->
-        <executions>
-          <execution>
-            <!-- using the same id as the parent to override its conf=
iguration ! -->
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-            <configuration>
-              <finalName>magnolia-${project.version}</finalName=
>
-              <descriptors>
-                <descriptor>src/release/bundle-jdk15.xml</descr=
iptor>
-                <descriptor>src/release/bundle-jdk14.xml</descr=
iptor>
-                <!--<descriptor>src/release/src.xml</descrip=
tor>-->
-                <!--<descriptor>src/release/wars.xml</descri=
ptor>-->
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

Copied: magnolia-bundle/tags/magnolia-bundle-p= arent-3.6-rc4/magnolia-tomcat-bundle/pom.xml (from rev 16905, magnolia-bu= ndle/trunk/magnolia-tomcat-bundle/pom.xml) (0 =3D> 16906)


--- magnolia-bundle/tags/magnolia-bundle-parent-3.6-=
rc4/magnolia-tomcat-bundle/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/magnolia-tomcat-b=
undle/pom.xml	2008-07-18 12:01:12 UTC (rev 16906)
@@ -0,0 +1,94 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8&qu=
ot;?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:=
xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLoc=
ation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/m=
aven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>info.magnolia</groupId>
+    <artifactId>magnolia-bundle-parent</artifactId>
+    <version>3.6-rc4</version>
+  </parent>
+  <artifactId>magnolia-tomcat-bundle</artifactId>
+  <packaging>pom</packaging>
+  <name>magnolia-tomcat-bundle</name>
+  <description>Magnolia bundled with Tomcat 5.5</description>=
;
+
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-bundled-webapp</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-workflow</artifactId>
+      <version>${magnoliaVersion}</version>
+      <classifier>bundle</classifier>
+      <type>tar.gz</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>info.magnolia</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.2</version>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <id>get-tomcat</id>
+            <goals>
+              <goal>download</goal>
+            </goals>
+            <configuration>
+              <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5=
.25/bin/apache-tomcat-5.5.25.tar.gz</url>
+              <destDir>${basedir}/target/extracted-tomcat</dest=
Dir>
+            </configuration>
+          </execution>
+          <execution>
+            <phase>process-resources</phase>
+            <id>get-tomcat-compat-package</id>
+            <goals>
+              <goal>download</goal>
+            </goals>
+            <configuration>
+              <url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5=
.25/bin/apache-tomcat-5.5.25-compat.tar.gz</url>
+              <destDir>${basedir}/target/extracted-tomcat-compat&l=
t;/destDir>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <downloadDir>tmp</downloadDir>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <!-- Needs at least version 2.2-beta-2 of the maven-assembly-=
plugin, for it resolves the following issues:
+             http://jira.codehaus.org/browse/MASSEMBLY-73
+             http://jira.codehaus.org/browse/MASSEMBLY-221
+             http://jira.codehaus.org/browse/MASSEMBLY-250 -->
+        <executions>
+          <execution>
+            <!-- using the same id as the parent to override its conf=
iguration ! -->
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+            <configuration>
+              <finalName>magnolia-${project.version}</finalName=
>
+              <descriptors>
+                <descriptor>src/release/bundle-jdk15.xml</descr=
iptor>
+                <descriptor>src/release/bundle-jdk14.xml</descr=
iptor>
+                <!--<descriptor>src/release/src.xml</descrip=
tor>-->
+                <!--<descriptor>src/release/wars.xml</descri=
ptor>-->
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Deleted: magnolia-bundle/tags/magnolia-bundle-= parent-3.6-rc4/pom.xml (16903 =3D> 16906)


--- magnolia-bundle/trunk/pom.xml	2008-07-18 11:37:0=
3 UTC (rev 16903)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/pom.xml	2008-07-1=
8 12:01:12 UTC (rev 16906)
@@ -1,92 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8&qu=
ot;?>
-<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:=
xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLoc=
ation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/m=
aven-v4_0_0.xsd ">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>magnolia-parent-pom</artifactId>
-    <groupId>info.magnolia</groupId>
-    <version>4</version>
-  </parent>
-  <artifactId>magnolia-bundle-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>3.6.1-SNAPSHOT</version>
-  <name>magnolia-bundle-parent</name>
-  <scm>
-    <connection>scm:svn:http://svn.magnolia.info/svn/magnolia-bund=
le/trunk</connection>
-    <developerConnection>scm:svn:http://svn.magnolia.info/svn/magn=
olia-bundle/trunk</developerConnection>
-    <url>http://svn.magnolia.info/view/magnolia-bundle/trunk</u=
rl>
-  </scm>
-  <properties>
-    <magnoliaEdition>Community Edition</magnoliaEdition>
-    <magnoliaVersion>3.6-rc3</magnoliaVersion>
-  </properties>
-
-  <modules>
-    <module>magnolia-bundled-webapp</module>
-    <module>magnolia-integration-tests</module>
-    <module>magnolia-tomcat-bundle</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>=
;
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>info.magnolia</groupId>
-        <artifactId>maven-setproperty-plugin</artifactId>
-        <version>1.0.1</version>
-        <executions>
-          <!-- set the current date -->
-          <execution>
-            <phase>generate-resources</phase>
-            <id>currentDate</id>
-            <goals>
-              <goal>set-property</goal>
-            </goals>
-            <configuration>
-              <properties>
-                <property implementation=3D"info.magnolia.maven.=
setproperty.CurrentDateValueProvider">
-                  <name>magnoliaCurrentDate</name>
-                  <format>d. MMMM yyyy</format>
-                </property>
-                <!-- don't use magnolia.version. By some plugins it w=
ould get treated as project.version -->
-                <property implementation=3D"info.magnolia.maven.=
setproperty.VersionNameValueProvider">
-                  <name>magnoliaNiceVersion</name>
-                </property>
-                <!-- set the release date (default current) -->
-                <property implementation=3D"info.magnolia.maven.=
setproperty.CurrentDateValueProvider">
-                  <name>magnoliaReleaseDate</name>
-                  <format>d. MMMM yyyy</format>
-                </property>
-              </properties>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId&g=
t;
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <resourceBundles>
-            <resourceBundle>info.magnolia:magnolia-build-tools-dua=
l-licensed:1.3</resourceBundle>
-          </resourceBundles>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>

Copied: magnolia-bundle/tags/magnolia-bundle-p= arent-3.6-rc4/pom.xml (from rev 16905, magnolia-bundle/trunk/pom.xml) (0 = =3D> 16906)


--- magnolia-bundle/tags/magnolia-bundle-parent-3.6-=
rc4/pom.xml	                        (rev 0)
+++ magnolia-bundle/tags/magnolia-bundle-parent-3.6-rc4/pom.xml	2008-07-1=
8 12:01:12 UTC (rev 16906)
@@ -0,0 +1,92 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8&qu=
ot;?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:=
xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLoc=
ation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/m=
aven-v4_0_0.xsd ">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>magnolia-parent-pom</artifactId>
+    <groupId>info.magnolia</groupId>
+    <version>4</version>
+  </parent>
+  <artifactId>magnolia-bundle-parent</artifactId>
+  <packaging>pom</packaging>
+  <version>3.6-rc4</version>
+  <name>magnolia-bundle-parent</name>
+  <scm>
+    <connection>scm:svn:http://svn.magnolia.info/svn/magnolia-bund=
le/tags/magnolia-bundle-parent-3.6-rc4</connection>
+    <developerConnection>scm:svn:http://svn.magnolia.info/svn/magn=
olia-bundle/tags/magnolia-bundle-parent-3.6-rc4</developerConnection&g=
t;
+    <url>http://svn.magnolia.info/view/magnolia-bundle/tags/magnol=
ia-bundle-parent-3.6-rc4</url>
+  </scm>
+  <properties>
+    <magnoliaEdition>Community Edition</magnoliaEdition>
+    <magnoliaVersion>3.6-rc4</magnoliaVersion>
+  </properties>
+
+  <modules>
+    <module>magnolia-bundled-webapp</module>
+    <module>magnolia-integration-tests</module>
+    <module>magnolia-tomcat-bundle</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <autoVersionSubmodules>true</autoVersionSubmodules>=
;
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>info.magnolia</groupId>
+        <artifactId>maven-setproperty-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <!-- set the current date -->
+          <execution>
+            <phase>generate-resources</phase>
+            <id>currentDate</id>
+            <goals>
+              <goal>set-property</goal>
+            </goals>
+            <configuration>
+              <properties>
+                <property implementation=3D"info.magnolia.maven.=
setproperty.CurrentDateValueProvider">
+                  <name>magnoliaCurrentDate</name>
+                  <format>d. MMMM yyyy</format>
+                </property>
+                <!-- don't use magnolia.version. By some plugins it w=
ould get treated as project.version -->
+                <property implementation=3D"info.magnolia.maven.=
setproperty.VersionNameValueProvider">
+                  <name>magnoliaNiceVersion</name>
+                </property>
+                <!-- set the release date (default current) -->
+                <property implementation=3D"info.magnolia.maven.=
setproperty.CurrentDateValueProvider">
+                  <name>magnoliaReleaseDate</name>
+                  <format>d. MMMM yyyy</format>
+                </property>
+              </properties>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId&g=
t;
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <resourceBundles>
+            <resourceBundle>info.magnolia:magnolia-build-tools-dua=
l-licensed:1.3</resourceBundle>
+          </resourceBundles>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>