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

Jump to bottom

GEODE-6302 Add version-testing to checkPom gradle task #3107

Merged
merged 7 commits into from Jan 23, 2019
Merged

GEODE-6302 Add version-testing to checkPom gradle task #3107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b7de45
GEODE-6302 Add version-testing to checkPom gradle task
PurelyApplied Jan 22, 2019
644834d
Correct issues with refusing version specification outside dependency…
robbadler Jan 23, 2019
07e3f74
updateExpectedPoms: rename artifact and remove redundant org.apache.g…
PurelyApplied Jan 23, 2019
43cb143
Move jetty-webapp and protobuf-java version specification to dependen…
PurelyApplied Jan 23, 2019
2f07a6b
Merge remote-tracking branch 'origin/develop' into geode-6302
robbadler Jan 23, 2019
648b3a4
Re-update POMs after merge with geode-management subproject.
PurelyApplied Jan 23, 2019
ae03eea
Remove accidentally inserted space from spotless.gradle
robbadler Jan 23, 2019
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
20 changes: 20 additions & 0 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
View file
Open in desktop
Expand Up @@ -112,6 +112,11 @@
<artifactId>spring-test</artifactId>
<version>4.3.20.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
Expand Down Expand Up @@ -382,6 +387,11 @@
<artifactId>JUnitParams</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-gradle-plugin</artifactId>
<version>0.8.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -417,6 +427,11 @@
<artifactId>geode-pulse</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
Expand Down Expand Up @@ -692,6 +707,11 @@
<artifactId>commons-digester</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion geode-assembly/build.gradle
View file
Open in desktop
Expand Up @@ -27,11 +27,13 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
// disable artifact generation for this project
jar.enabled = false

project.ext {artifactName = 'apache-geode'}

publishing {
publications {
maven(MavenPublication) {
afterEvaluate {
artifactId = 'apache-geode'
artifactId = artifactName

artifacts = []

Expand Down
20 changes: 20 additions & 0 deletions geode-assembly/src/test/resources/expected-pom.xml
View file
Open in desktop
Expand Up @@ -112,6 +112,11 @@
<artifactId>spring-test</artifactId>
<version>4.3.20.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
Expand Down Expand Up @@ -382,6 +387,11 @@
<artifactId>JUnitParams</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-gradle-plugin</artifactId>
<version>0.8.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -417,6 +427,11 @@
<artifactId>geode-pulse</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
Expand Down Expand Up @@ -692,6 +707,11 @@
<artifactId>commons-digester</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
Expand Down
20 changes: 20 additions & 0 deletions geode-common/src/test/resources/expected-pom.xml
View file
Open in desktop
Expand Up @@ -111,6 +111,11 @@
<artifactId>spring-test</artifactId>
<version>4.3.20.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
Expand Down Expand Up @@ -381,6 +386,11 @@
<artifactId>JUnitParams</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-gradle-plugin</artifactId>
<version>0.8.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -416,6 +426,11 @@
<artifactId>geode-pulse</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
Expand Down Expand Up @@ -691,6 +706,11 @@
<artifactId>commons-digester</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
Expand Down
20 changes: 20 additions & 0 deletions geode-concurrency-test/src/test/resources/expected-pom.xml
View file
Open in desktop
Expand Up @@ -123,6 +123,11 @@
<artifactId>spring-test</artifactId>
<version>4.3.20.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
Expand Down Expand Up @@ -393,6 +398,11 @@
<artifactId>JUnitParams</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-gradle-plugin</artifactId>
<version>0.8.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -428,6 +438,11 @@
<artifactId>geode-pulse</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
Expand Down Expand Up @@ -703,6 +718,11 @@
<artifactId>commons-digester</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
Expand Down
22 changes: 20 additions & 2 deletions geode-connectors/src/test/resources/expected-pom.xml
View file
Open in desktop
Expand Up @@ -38,13 +38,11 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
<version>1.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-core</artifactId>
<version>1.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -187,6 +185,11 @@
<artifactId>spring-test</artifactId>
<version>4.3.20.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
Expand Down Expand Up @@ -457,6 +460,11 @@
<artifactId>JUnitParams</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-gradle-plugin</artifactId>
<version>0.8.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -492,6 +500,11 @@
<artifactId>geode-pulse</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
Expand Down Expand Up @@ -767,6 +780,11 @@
<artifactId>commons-digester</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion geode-core/build.gradle
View file
Open in desktop
Expand Up @@ -226,7 +226,7 @@ dependencies {
runtimeOnly('org.apache.logging.log4j:log4j-jul') {
ext.optional = true
}
compile('org.eclipse.jetty:jetty-webapp:' + project.'jetty.version') {
compile('org.eclipse.jetty:jetty-webapp') {
ext.optional = true
}
compileOnly('org.springframework:spring-webmvc') {
Expand Down
24 changes: 20 additions & 4 deletions geode-core/src/test/resources/expected-pom.xml
View file
Open in desktop
Expand Up @@ -198,7 +198,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.12.v20180830</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -267,19 +266,16 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
<version>1.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-json</artifactId>
<version>1.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -395,6 +391,11 @@
<artifactId>spring-test</artifactId>
<version>4.3.20.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
Expand Down Expand Up @@ -665,6 +666,11 @@
<artifactId>JUnitParams</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-gradle-plugin</artifactId>
<version>0.8.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand Down Expand Up @@ -700,6 +706,11 @@
<artifactId>geode-pulse</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner-servlet</artifactId>
Expand Down Expand Up @@ -975,6 +986,11 @@
<artifactId>commons-digester</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
Expand Down