From fa6ef11ad65fa69eefc469d2684ea75414c691c3 Mon Sep 17 00:00:00 2001
From: Michael Gorovoy <michael@webtide.com>
Date: Mon, 4 Apr 2011 20:37:19 +0000
Subject: [PATCH] Set the version of jetty-test-policy artifact to 1.2

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2968 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt          | 4 ++--
 jetty-client/pom.xml | 9 ++++-----
 jetty-policy/pom.xml | 1 -
 pom.xml              | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index f2aa2998957..9360392cfe8 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -17,20 +17,20 @@ jetty-7.4.0-SNAPSHOT
  + 341006 Move inner enums out into separate file
  + 341105 Stack trace is printed for an ignored exception
  + 341145 WebAppContext MBean attribute serverClasses returns empty value
+ + 341171 Locking in HttpDestination blocks all requests to the same address
  + 341206 Stop order is wrong in HandlerWrapper
  + 341255 org.eclipse.http usage in AJP/SessionId linkage
  + 341386 Remote close not detected by HttpClient
  + 341394 Remove 'Unavailable' JMX attributes of WebAppContext MBean
  + 341439 Blocking HttpClient does not use soTimeout for timeouts
  + 341561 Exception when adding o.e.j.s.DoSFilter as managed attribute
+ + 341692 Fixed deadlock if stopped while starting
  + 341736 Split jetty-nested out of war module
  + 341726 JSONPojoConverter handles characters
- + 341692 Fixed deadlock if stopped while starting
  + JETTY-1245 Pooled Buffers implementation
  + JETTY-1354 Added jetty-nested
  + Ensure generated fragment names are unique
  + Added extra session removal test
- + 341171 Locking in HttpDestination blocks all requests to the same address
 
 jetty-7.3.1.v20110307 7 March 2011
  + 316382 Support a more strict SSL option with certificates
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index 09f19429fcd..a527f33de74 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -12,8 +12,7 @@
 
     <properties>
         <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
-        <jetty.test.keystore>1.2-SNAPSHOT</jetty.test.keystore>
-        <jetty.test.keystore.loc>target/test-policy</jetty.test.keystore.loc>
+        <jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
     </properties>
 
     <build>
@@ -70,11 +69,11 @@
                       <artifactItem>
                         <groupId>org.eclipse.jetty.toolchain</groupId>
                         <artifactId>jetty-test-policy</artifactId>
-                        <version>${jetty.test.keystore}</version>
+                        <version>${jetty.test.policy}</version>
                         <type>jar</type>
                         <overWrite>true</overWrite>
                         <includes>**/*.keystore,**/*.pem</includes>
-                        <outputDirectory>${jetty.test.keystore.loc}</outputDirectory>
+                        <outputDirectory>${jetty.test.policy.loc}</outputDirectory>
                       </artifactItem>
                     </artifactItems>
                   </configuration>
@@ -125,4 +124,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml
index c067047658a..c08717b8a39 100644
--- a/jetty-policy/pom.xml
+++ b/jetty-policy/pom.xml
@@ -10,7 +10,6 @@
   <name>Jetty :: Policy Tool</name>
   <packaging>jar</packaging>
   <properties>
-    <jetty.test.policy>1.0</jetty.test.policy>
     <jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
     <bundle-symbolic-name>${project.groupId}.policy</bundle-symbolic-name>
   </properties>
diff --git a/pom.xml b/pom.xml
index 809b8600bf8..e2c97feadc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <slf4j-version>1.5.11</slf4j-version>
     <build-support-version>1.0</build-support-version>
+    <jetty.test.policy>1.2</jetty.test.policy>
   </properties>
   <scm>
     <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</connection>