cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r979321 [1/2] - in /cxf/trunk: ./ distribution/ distribution/src/main/release/samples/ distribution/src/main/release/samples/aegis/ distribution/src/main/release/samples/aegis_standalone/ distribution/src/main/release/samples/callback/ dist...
Date Mon, 26 Jul 2010 15:01:12 GMT
Author: dkulp
Date: Mon Jul 26 15:01:10 2010
New Revision: 979321

URL: http://svn.apache.org/viewvc?rev=979321&view=rev
Log:
Fixes for maven 3
Change samples to use a real version number
Make distribution call samples to make sure they compile and so version
number will be updated as part of the release

Added:
    cxf/trunk/distribution/src/main/release/samples/pom.xml   (with props)
Modified:
    cxf/trunk/distribution/pom.xml
    cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
    cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml
    cxf/trunk/distribution/src/main/release/samples/callback/pom.xml
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml
    cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jms_pubsub/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jms_queue/pom.xml
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
    cxf/trunk/distribution/src/main/release/samples/js_client/pom.xml
    cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml
    cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml
    cxf/trunk/distribution/src/main/release/samples/restful_http_binding/pom.xml
    cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/pom.xml
    cxf/trunk/rt/frontend/jaxrs/pom.xml
    cxf/trunk/systests/jaxrs/pom.xml

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Mon Jul 26 15:01:10 2010
@@ -466,5 +466,12 @@
                 <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
             </properties>
         </profile>
+        <profile>
+            <!-- build the samples as well to make sure they really do build -->
+            <id>everything</id>
+            <modules>
+                <module>src/main/release/samples</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>aegis</artifactId>
-    <version>1.0</version>
     <name>CXF sample using code first POJO's and the Aegis Binding</name>
+
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
+
     <build>
         <resources>
             <resource>
@@ -98,35 +105,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>aegis-standalone</artifactId>
-    <version>1.0</version>
     <name>CXF sample using the Aegis Binding without any webservice</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -90,35 +94,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/callback/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/callback/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/callback/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/callback/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>callback</artifactId>
-    <version>1.0</version>
     <name>CXF sample using a callbak object</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-CallbackService</id>
@@ -155,35 +159,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>configuration_interceptor</artifactId>
-    <version>1.0</version>
     <name>CXF Sample of Stream GZIP Interceptor</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -136,35 +140,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-             <id>snapshots</id>
-             <repositories>
-                 <repository>
-                     <id>apache-snapshots</id>
-                     <name>Apache SNAPSHOT Repository</name>
-                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                     <snapshots>
-                         <enabled>true</enabled>
-                     </snapshots>
-                     <releases>
-                         <enabled>false</enabled>
-                     </releases>
-                 </repository>
-             </repositories>
-             <pluginRepositories>
-                 <pluginRepository>
-                     <id>apache-snapshots</id>
-                     <name>Apache Maven Plugin Snapshots</name>
-                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                     <releases>
-                         <enabled>false</enabled>
-                     </releases>
-                     <snapshots>
-                         <enabled>true</enabled>
-                     </snapshots>
-                 </pluginRepository>
-             </pluginRepositories>
-         </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/pom.xml Mon Jul 26 15:01:10 2010
@@ -19,11 +19,16 @@
 <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>
     <groupId>org.apache.cxf.samples</groupId>
-    <artifactId>wsdl_first</artifactId>
-    <version>1.0</version>
+    <artifactId>in_jvm_transport</artifactId>
     <name>Colocated Demo using Document/Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -85,35 +90,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_jaxws</artifactId>
-    <version>1.0</version>
     <name>Java First demo using JAX-WS APIs</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -84,35 +88,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_jaxws_factory_bean</artifactId>
-    <version>1.0</version>
     <name>Java First demo service using the JAXWSFactoryBeans</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -84,35 +88,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_pojo</artifactId>
-    <version>1.0</version>
     <name>Java First POJO Sample</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -84,35 +89,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_spring_support</artifactId>
-    <version>1.0</version>
     <name>Spring HTTP Sample</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -101,35 +105,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -142,11 +117,15 @@
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${cxf.version}</version>
         </dependency>
-        <!-- Jetty is needed if you're using the CXFServlet -->
+        <!-- Jetty is needed if you're not using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${cxf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+        </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java Mon Jul 26 15:01:10 2010
@@ -18,12 +18,12 @@
  */
 package demo.spring.servlet;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 public class Server {
 
@@ -37,7 +37,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.mortbay.jetty.Server server = new org.mortbay.jetty.Server();
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(9002);

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,12 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jax_rs_basic</artifactId>
-    <version>1.0</version>
     <name>JAX-RS Basic Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
         <httpclient.version>3.1</httpclient.version>
-        <jsr311.version>1.0</jsr311.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -104,35 +107,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -159,7 +133,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml Mon Jul 26 15:01:10 2010
@@ -21,11 +21,14 @@
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jax_rs_basic_https</artifactId>
     <name>JAX-RS Basic Demo With HTTPS communications</name>
-    <version>1.0</version>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
         <httpclient.version>3.1</httpclient.version>
-        <jsr311.version>1.0</jsr311.version>
     </properties>
 
     <build>
@@ -137,35 +140,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -192,7 +166,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,12 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jax_rs_content_negotiation</artifactId>
-    <version>1.0</version>
     <name>JAX-RS Content Negotiation Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
         <httpclient.version>3.1</httpclient.version>
-        <jsr311.version>1.0</jsr311.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -86,35 +89,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -141,7 +115,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jax_service_aegis_client</artifactId>
-    <version>1.0</version>
     <name>Sample of JAX-* Service Using an Aegis Client</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-            <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -84,35 +89,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jaxws_async</artifactId>
-    <version>1.0</version>
     <name>JAX-WS Asynchronous Demo using Document/Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -115,35 +120,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jaxws_dispatch_provider</artifactId>
-    <version>1.0</version>
     <name>JAX-WS Dispatch/Provider Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-SOAPService1</id>
@@ -176,35 +180,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jaxws_handlers</artifactId>
-    <version>1.0</version>
     <name>JAX-WS Handler Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
+
     <build>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
@@ -38,7 +44,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-SOAPService1</id>
@@ -128,35 +134,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jms_spec_demo</artifactId>
-    <version>1.0</version>
     <name>SOAP/JMS Transport Specification Demo using Document-Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
-        <activemq.version>[5,)</activemq.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -39,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -135,35 +139,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/jms_pubsub/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_pubsub/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_pubsub/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jms_pubsub</artifactId>
-    <version>1.0</version>
     <name>JMS Transport Publish/Subscribe Demo using Document-Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
-        <activemq.version>[5,)</activemq.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -39,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${cxf.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -135,35 +139,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/jms_queue/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_queue/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_queue/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_queue/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jms_queue</artifactId>
-    <version>1.0</version>
     <name>JMS Transport Queue Demo using Document-Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
-        <activemq.version>[5,)</activemq.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -39,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -135,35 +139,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>js_browser_client_java</artifactId>
-    <version>1.0</version>
     <name>Generated JavaScript Sample using JAX-WS and JSR-181</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -46,7 +51,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/staticContent/beverages.html" todir="${basedir}/target/classes/staticContent"/>
+                                <copy file="${basedir}/staticContent/Beverages.html" todir="${basedir}/target/classes/staticContent"/>
                                 <copy file="${basedir}/cxf.xml" todir="${basedir}/target/classes/"/>
                             </tasks>
                         </configuration>
@@ -79,35 +84,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>js_browser_client_simple</artifactId>
-    <version>1.0</version>
     <name>JavaScript Client Demo using Document/Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -126,35 +131,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/js_client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_client/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_client/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/js_client/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>js_client</artifactId>
-    <version>1.0</version>
     <name>Hello World Client Demo using JavaScript</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
-        <rhino.version>1.6R7</rhino.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -39,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -112,35 +116,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>mtom</artifactId>
-    <version>1.0</version>
     <name>MTOM Demo for SWA and XOP</name>
+
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
+
     <build>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
@@ -38,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -128,35 +135,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     
     <dependencies>

Added: cxf/trunk/distribution/src/main/release/samples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/pom.xml?rev=979321&view=auto
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/pom.xml (added)
+++ cxf/trunk/distribution/src/main/release/samples/pom.xml Mon Jul 26 15:01:10 2010
@@ -0,0 +1,129 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<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>
+    <groupId>org.apache.cxf.samples</groupId>
+    <artifactId>cxf-samples</artifactId>
+    <packaging>pom</packaging>
+    <version>2.3.0-SNAPSHOT</version>
+    <name>Apache CXF Runtime</name>
+    <url>http://cxf.apache.org</url>
+
+    <parent>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-parent</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <!-- don't deploy the samples, kind of pointless -->
+        <maven.deploy.skip>true</maven.deploy.skip>
+
+        <!-- for now -->
+        <pmd.skip>true</pmd.skip>
+        <checkstyle.skip>true</checkstyle.skip>
+    </properties>
+
+    <modules>
+        <module>in_jvm_transport</module>
+        <module>js_browser_client_simple</module>
+        <module>js_browser_client_java_first</module>
+        <module>java_first_jaxws_factory_bean</module>
+        <module>jax_rs/content_negotiation</module>
+        <module>jax_rs/basic_https</module>
+        <module>jax_rs/basic</module>
+        <module>callback</module>
+        <module>wsdl_first_pure_xml</module>
+        <module>jaxws_dispatch_provider</module>
+        <module>wsdl_first_xmlbeans</module>
+        <module>wsdl_first_soap12</module>
+        <module>wsdl_first_dynamic_client</module>
+        <module>jms_queue</module>
+        <module>restful_dispatch</module>
+        <module>wsdl_first</module>
+        <module>aegis_standalone</module>
+        <module>java_first_jaxws</module>
+        <module>ws_rm</module>
+        <module>configuration_interceptor</module>
+        <module>java_first_spring_support</module>
+        <module>ws_security/ut</module>
+        <module>ws_security/ut_sign</module>
+        <module>ws_security/sign_enc</module>
+        <module>ws_security/ut_policy</module>
+        <module>mtom</module>
+        <module>jaxws_async</module>
+        <module>java_first_pojo</module>
+        <module>ws_policy</module>
+        <module>js_client</module>
+        <module>wsdl_first_https</module>
+        <module>ws_addressing</module>
+        <module>soap_header</module>
+        <module>jms-spec-demo</module>
+        <module>wsdl_first_xml_wrapped</module>
+        <module>restful_http_binding</module>
+        <module>aegis</module>
+        <module>jax_server_aegis_client</module>
+        <module>jaxws_handlers</module>
+        <module>wsdl_first_rpclit</module>
+        <module>jms_pubsub</module>
+
+        <!--
+        these are a bit fragile as they need to go off to external sites to get stuff like
+        wsdl's and certs and such
+        -->
+        <!--module>ws_security/interopfest/wssc</module>
+        <module>ws_security/interopfest/wstrust10</module>
+        <module>ws_security/interopfest/wssec10</module>
+        <module>ws_security/interopfest/wssec11</module>
+        <module>ws_security/interopfest/wstrust13</module-->
+    </modules>
+
+
+    <profiles>
+        <profile>
+             <id>snapshots</id>
+             <repositories>
+                 <repository>
+                     <id>apache-snapshots</id>
+                     <name>Apache SNAPSHOT Repository</name>
+                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
+                     <snapshots>
+                         <enabled>true</enabled>
+                     </snapshots>
+                     <releases>
+                         <enabled>false</enabled>
+                     </releases>
+                 </repository>
+             </repositories>
+             <pluginRepositories>
+                 <pluginRepository>
+                     <id>apache-snapshots</id>
+                     <name>Apache Maven Plugin Snapshots</name>
+                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
+                     <releases>
+                         <enabled>false</enabled>
+                     </releases>
+                     <snapshots>
+                         <enabled>true</enabled>
+                     </snapshots>
+                 </pluginRepository>
+             </pluginRepositories>
+         </profile>
+    </profiles>
+</project>

Propchange: cxf/trunk/distribution/src/main/release/samples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/distribution/src/main/release/samples/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/distribution/src/main/release/samples/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,12 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>restful_dispatch</artifactId>
-    <version>1.0</version>
     <name>RESTful Hello World Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
         <httpclient.version>3.1</httpclient.version>
-        <jsr311.version>0.8</jsr311.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -105,35 +108,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -165,7 +139,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/restful_http_binding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/restful_http_binding/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/restful_http_binding/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,14 +20,16 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>restful_http_binding</artifactId>
-    <version>1.0</version>
     <name>RESTful HTTP Binding Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
         <httpclient.version>3.1</httpclient.version>
-        <jsr311.version>0.8</jsr311.version>
-        <jettison.version>1.0.1</jettison.version>
-        <jra.version>1.0-alpha-4</jra.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -105,35 +107,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -170,17 +143,14 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>${jettison.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jra</groupId>
             <artifactId>jra</artifactId>
-            <version>${jra.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>soap_header</artifactId>
-    <version>1.0</version>
     <name>Sample using SOAP Headers</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -111,35 +116,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>ws_addressing</artifactId>
-    <version>1.0</version>
     <name>WS-Addressing Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -132,35 +137,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>



Mime
View raw message