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.

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

GEODE-4972: Move VersionManager to geode-old-versions module #1703

Merged
merged 1 commit into from Apr 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions extensions/geode-modules-tomcat8/build.gradle
Expand Up @@ -41,6 +41,7 @@ dependencies {
testCompile project(path: ':geode-junit')
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':extensions/geode-modules').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)

eclipse.classpath.file {
whenMerged { classpath ->
Expand Down
3 changes: 2 additions & 1 deletion geode-core/build.gradle
Expand Up @@ -131,7 +131,8 @@ dependencies {
jcaCompile sourceSets.main.output

testCompile project(':geode-junit')
testCompile project(':geode-old-versions')

testCompile files(project(':geode-old-versions').sourceSets.main.output)

// Test Dependencies
// External
Expand Down
1 change: 1 addition & 0 deletions geode-old-client-support/build.gradle
Expand Up @@ -22,4 +22,5 @@ dependencies {
testCompile project(':geode-junit')

testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
4 changes: 4 additions & 0 deletions geode-old-versions/build.gradle
Expand Up @@ -20,6 +20,10 @@ disableMavenPublishing()

project.ext.installs = new Properties();

dependencies {
testCompile project(":geode-junit")
}

def addOldVersion(def source, def geodeVersion, def downloadInstall) {
sourceSets.create(source, {
compileClasspath += configurations.provided
Expand Down
Expand Up @@ -26,15 +26,13 @@
import java.util.Properties;
import java.util.function.BiConsumer;

import org.apache.geode.test.dunit.Host;

/**
* VersionManager loads the class-paths for all of the releases of Geode configured for
* backward-compatibility testing in the geode-core build.gradle file.
* <p>
* Tests may use these versions in launching VMs to run older clients or servers.
*
* @see Host#getVM(String, int)
* see Host.getVM(String, int)
*/
public class VersionManager {
public static final String CURRENT_VERSION = "000";
Expand Down
Expand Up @@ -14,7 +14,6 @@
*/
package org.apache.geode.test.dunit.standalone;

import static org.apache.geode.internal.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import org.junit.Assert;
Expand Down Expand Up @@ -45,6 +44,6 @@ public void exceptionIsThrownOnUse() throws Exception {
@Test
public void managerIsAbleToFindVersions() throws Exception {
VersionManager instance = VersionManager.getInstance();
assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
Assert.assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
}
}
1 change: 1 addition & 0 deletions geode-protobuf/build.gradle
Expand Up @@ -27,4 +27,5 @@ dependencies {
testCompile 'org.powermock:powermock-api-mockito:' + project.'powermock.version'

compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
1 change: 1 addition & 0 deletions geode-web/build.gradle
Expand Up @@ -59,6 +59,7 @@ dependencies {
testCompile 'com.pholser:junit-quickcheck-guava:' + project.'junit-quickcheck.version'

testRuntime files(war.destinationDir)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}

//Remove the gradle output directories from the eclipse classpath. These
Expand Down