Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to support Wicket 7.10.0 #24

Open
wants to merge 2 commits into
base: v4.x.y
Choose a base branch
from
Open

Update to support Wicket 7.10.0 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab1d0fd
Update to support Wicket 7.10.0
Mar 28, 2018
37e1f2b
Update integration test to use pax-wicket 4.0.0 (should allow for tes…
Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ax.wicket.itests.karaf/src/test/java/org/ops4j/pax/wicket/it/samples/karaf/IssueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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);
}

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<connection>scm:git:git://github.com/ops4j/org.ops4j.pax.wicket.git</connection>
<developerConnection>scm:git:[email protected]: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>
Expand All @@ -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:[email protected]: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>
Expand Down