Author: dkulp
Date: Tue Jul 27 20:49:49 2010
New Revision: 979864
URL: http://svn.apache.org/viewvc?rev=979864&view=rev
Log:
Another attempt to make Benson happy. :-)
Modified:
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_client/pom.xml
cxf/trunk/distribution/src/main/release/samples/pom.xml
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=979864&r1=979863&r2=979864&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 Tue
Jul 27 20:49:49 2010
@@ -165,7 +165,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${activemq.version}</version>
</dependency>
</dependencies>
</project>
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=979864&r1=979863&r2=979864&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 Tue Jul
27 20:49:49 2010
@@ -165,7 +165,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${activemq.version}</version>
</dependency>
</dependencies>
</project>
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=979864&r1=979863&r2=979864&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 Tue Jul
27 20:49:49 2010
@@ -165,7 +165,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>${activemq.version}</version>
</dependency>
</dependencies>
</project>
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=979864&r1=979863&r2=979864&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 Tue Jul
27 20:49:49 2010
@@ -141,7 +141,6 @@
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
- <version>${rhino.version}</version>
</dependency>
</dependencies>
</project>
Modified: 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=979864&r1=979863&r2=979864&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/pom.xml Tue Jul 27 20:49:49
2010
@@ -22,22 +22,12 @@
<artifactId>cxf-samples</artifactId>
<packaging>pom</packaging>
<version>2.3.0-SNAPSHOT</version>
- <name>Apache CXF Runtime</name>
+ <name>Apache CXF Samples</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>
@@ -93,37 +83,74 @@
<module>ws_security/interopfest/wssec11</module>
<module>ws_security/interopfest/wstrust13</module-->
</modules>
-
-
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<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>
+ <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>