From ab1d0fdc0bbfb7cc181229b19fea9f0ce21db1c1 Mon Sep 17 00:00:00 2001
From: mattrpav <matt@mediadriver.com>
Date: Wed, 28 Mar 2018 14:35:14 -0500
Subject: [PATCH 1/2] Update to support Wicket 7.10.0

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e723b2a88..be6286983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <connection>scm:git:git://github.com/ops4j/org.ops4j.pax.wicket.git</connection>
         <developerConnection>scm:git:git@github.com:ops4j/org.ops4j.pax.wicket.git</developerConnection>
         <url>http://github.com/ops4j/org.ops4j.pax.wicket</url>
-        <tag>pax-wicket-3.0.5</tag>
+        <tag>pax-wicket-4.0.1</tag>
     </scm>
 
     <properties>
@@ -59,9 +59,9 @@
         <felix.eventadmin.version>1.3.2</felix.eventadmin.version>
         <felix.configadmin.version>1.6.0</felix.configadmin.version>
         <felix.scr.version>1.8.2</felix.scr.version>
-        <wicket.dependency.version>7.7.0</wicket.dependency.version>
-        <wicket.dependency.version.range>[7.7,7.8)</wicket.dependency.version.range>
-        <wicket.core.dependency.version>7.7.0</wicket.core.dependency.version>
+        <wicket.dependency.version>7.10.0</wicket.dependency.version>
+        <wicket.dependency.version.range>[7.7,7.11)</wicket.dependency.version.range>
+        <wicket.core.dependency.version>7.10.0</wicket.core.dependency.version>
         <release-paxwicket-altGitURL>scm:git:git@github.com:ops4j/org.ops4j.pax.wicket.git</release-paxwicket-altGitURL>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jetty.version>9.2.22.v20170606</jetty.version>

From 37e1f2bd70de7d81e08cad7e323bdc220465f65f Mon Sep 17 00:00:00 2001
From: mattrpav <matt@mediadriver.com>
Date: Wed, 28 Mar 2018 14:57:41 -0500
Subject: [PATCH 2/2] Update integration test to use pax-wicket 4.0.0 (should
 allow for tests to pass during release as well)

TODO: Upgrade itests to use newer pax-exam that allows for running current project version as the version number
---
 .../org/ops4j/pax/wicket/it/samples/karaf/IssueTest.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.ops4j.pax.wicket.itests.karaf/src/test/java/org/ops4j/pax/wicket/it/samples/karaf/IssueTest.java b/org.ops4j.pax.wicket.itests.karaf/src/test/java/org/ops4j/pax/wicket/it/samples/karaf/IssueTest.java
index ed9f221fc..a9187a128 100644
--- a/org.ops4j.pax.wicket.itests.karaf/src/test/java/org/ops4j/pax/wicket/it/samples/karaf/IssueTest.java
+++ b/org.ops4j.pax.wicket.itests.karaf/src/test/java/org/ops4j/pax/wicket/it/samples/karaf/IssueTest.java
@@ -77,14 +77,14 @@ public final Option[] configureAdditionalProvision() {
 
         MavenUrlReference wicketFeatureRepo = maven()
                 .groupId("org.ops4j.pax.wicket").artifactId("paxwicket")
-                .version("3.0.5-SNAPSHOT").classifier("features").type("xml");
+                .version("4.0.0").classifier("features").type("xml");
 
         MavenUrlReference paxwicketFeatureRepo = maven()
                 .groupId("org.ops4j.pax.wicket").artifactId("features")
-                .version("3.0.5-SNAPSHOT").classifier("features").type("xml");
+                .version("4.0.0").classifier("features").type("xml");
         MavenUrlReference karafSampleFeatureRepo = maven()
                 .groupId("org.ops4j.pax.wicket.samples").artifactId("features")
-                .version("3.0.5-SNAPSHOT").classifier("features").type("xml");
+                .version("4.0.0").classifier("features").type("xml");
         MavenUrlReference karafStandardRepo = maven()
                 .groupId("org.apache.karaf.features").artifactId("standard").versionAsInProject().classifier("features").type("xml");
 
@@ -124,7 +124,7 @@ public void waitForever() throws IOException {
 
     @Before
     public void before() throws InterruptedException {
-        while (bundleContext.getBundle("mvn:org.ops4j.pax.wicket.samples/org.ops4j.pax.wicket.samples.issues/3.0.5-SNAPSHOT").getState() != Bundle.ACTIVE) {
+        while (bundleContext.getBundle("mvn:org.ops4j.pax.wicket.samples/org.ops4j.pax.wicket.samples.issues/4.0.0").getState() != Bundle.ACTIVE) {
             Thread.sleep(200);
         }