cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r979321 [2/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
Modified: cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_policy/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_policy</artifactId>
-    <version>1.0</version>
     <name>WS-Policy 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>
@@ -129,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/ws_rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/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>ws_rm</artifactId>
-    <version>1.0</version>
     <name>WS-RM 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-sources</id>
@@ -123,35 +127,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_security/interopfest/wssc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,9 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples.interopfest</groupId>
     <artifactId>ws-sc</artifactId>
-    <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>
         <test.method>ALL</test.method>
         <test.server>MS</test.server>
         <baseLocation>http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc</baseLocation>
@@ -90,7 +95,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>
@@ -169,35 +174,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>
     
 

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,9 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples.interopfest</groupId>
     <artifactId>ws-sec10</artifactId>
-    <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>
         <test.server>MS</test.server>
         <test.method>ALL</test.method>
     </properties>
@@ -88,7 +93,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>
@@ -161,36 +166,7 @@
                 </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>
+   </profiles>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,9 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples.interopfest</groupId>
     <artifactId>ws-sec11</artifactId>
-    <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>
         <test.method>ALL</test.method>
         <test.server>MS</test.server>
     </properties>
@@ -88,7 +93,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>
@@ -161,35 +166,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>

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,9 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples.interopfest</groupId>
     <artifactId>ws-trust10</artifactId>
-    <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>
         <test.method>ALL</test.method>
 
         <wsdl.host>131.107.72.15</wsdl.host>
@@ -92,7 +97,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>
@@ -144,35 +149,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_security/interopfest/wstrust13/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,11 +20,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples.interopfest</groupId>
     <artifactId>ws-trust13</artifactId>
-    <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>
         <test.method>ALL</test.method>
     </properties>
+
+
     <build>
         <resources>
             <resource>
@@ -87,7 +94,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 +142,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_security/sign_enc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/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>wssec</artifactId>
-    <version>1.0</version>
+    <artifactId>wssec_sign_enc</artifactId>
     <name>WS-Security 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>
         <resources>
@@ -48,7 +53,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/ws_security/ut/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut/pom.xml Mon Jul 26 15:01:10 2010
@@ -19,11 +19,15 @@
 <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>wssec</artifactId>
-    <version>1.0</version>
+    <artifactId>wssec_ut</artifactId>
     <name>WS-Security 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-sources</id>
@@ -123,35 +127,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_security/ut_policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/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>wssec</artifactId>
-    <version>1.0</version>
+    <artifactId>wssec_ut_policy</artifactId>
     <name>WS-Security 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>
@@ -162,35 +167,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_security/ut_sign/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/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>wssec</artifactId>
-    <version>1.0</version>
+    <artifactId>wssec_ut_sign</artifactId>
     <name>WS-Security 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>
         <resources>
@@ -48,7 +53,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>

Modified: cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml Mon Jul 26 15:01:10 2010
@@ -20,12 +20,16 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first</artifactId>
-    <version>1.0</version>
     <packaging>war</packaging>
     <name>WSDL first 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.release.base>../..</cxf.release.base>
+        <cxf.version>${project.version}</cxf.version>
+        <cxf.release.base>${basedir}/../..</cxf.release.base>
     </properties>
     <build>
         <resources>
@@ -73,7 +77,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>
@@ -146,35 +150,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>
@@ -198,6 +173,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.7</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/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>wsdl_first_dynamic_client</artifactId>
-    <version>1.0</version>
     <name>CXF Dynamic Client 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>
         <defaultGoal>install</defaultGoal>
@@ -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>
@@ -109,35 +113,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/wsdl_first_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/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>wsdl_first_https</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using HTTPS</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>
@@ -217,36 +222,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/wsdl_first_pure_xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/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>wsdl_first_pure_xml</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using BARE Style in XML Binding (pure XML over HTTP)</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>
@@ -111,35 +115,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/wsdl_first_rpclit/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/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>wsdl_first_rpclit</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using RPC-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>
         <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>
@@ -111,35 +118,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/wsdl_first_soap12/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/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>wsdl_first_soap12</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using SOAP12 in 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 +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>
@@ -137,35 +141,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/wsdl_first_xml_wrapped/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/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>wsdl_first_xml_wrapped</artifactId>
-    <version>1.0</version>
     <name>CXF sample using WRAPPED Style in XML Binding (pure XML over HTTP)</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>
@@ -137,35 +142,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/wsdl_first_xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/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>wsdl_first_xmlbeans</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using Document/Literal Style and XMLBeans DataBinding</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,16 +50,9 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>					
-				</configuration>
-			</plugin>
-			<plugin>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-codegen-plugin</artifactId>
-				<version>LATEST</version>
+				<version>${project.version}</version>
 				<executions>
 					<execution>
 						<id>generate-sources</id>
@@ -130,35 +127,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/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Jul 26 15:01:10 2010
@@ -333,6 +333,12 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+                <version>1.1</version>
+            </dependency>
+
+            <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
                 <version>2.1_3</version>

Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Mon Jul 26 15:01:10 2010
@@ -432,6 +432,11 @@
             <plugins>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>properties-maven-plugin </artifactId>
+                    <version>1.0-alpha-2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.5</version>
                 </plugin>

Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Mon Jul 26 15:01:10 2010
@@ -60,7 +60,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: cxf/trunk/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=979321&r1=979320&r2=979321&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Mon Jul 26 15:01:10 2010
@@ -156,10 +156,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-        	<groupId>org.eclipse.jetty</groupId>
-        	<artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>



Mime
View raw message