Skip to content

groovy: bump to 4.12 #1478

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

groovy: bump to 4.12 #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a647901
in progress
MykolaGolubyev May 15, 2023
d8c576c
version bump
MykolaGolubyev Aug 9, 2023
143de8f
Merge branch 'master' into groovy-four-upgrade
MykolaGolubyev Aug 9, 2023
8d3ea88
merge
MykolaGolubyev Aug 9, 2023
d8f0948
ci tweaks
MykolaGolubyev Aug 9, 2023
9b22a98
Merge branch 'master' into groovy-four-upgrade
MykolaGolubyev Feb 16, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
if: failure()
with:
name: failed-cli-sanity-test
path: "webtau-cli-testing/src/test/groovy/*failed*.html"
path: "webtau-cli-testing/src/test/groovy/*report.html"
retention-days: 2

- name: Upload reports testing reports
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<groovy.version>3.0.15</groovy.version>
<groovy.version>4.0.13</groovy.version>
<jackson.version>2.14.0</jackson.version>
<slf4j.version>1.7.30</slf4j.version>
<spring.version>5.3.19</spring.version>
Expand All @@ -171,19 +171,19 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-nio</artifactId>
<version>${groovy.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
<version>${groovy.version}</version>
<exclusions>
Expand All @@ -195,13 +195,13 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<version>${groovy.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test</artifactId>
<version>${groovy.version}</version>
</dependency>
Expand Down Expand Up @@ -681,15 +681,15 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.10.1</version>
<version>2.1.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions webtau-cache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-nio</artifactId>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-cli-groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions webtau-core-groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-nio</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test</artifactId>
<scope>test</scope>
</dependency>
Expand Down
1 change: 1 addition & 0 deletions ...isdocumenting/webtau/data/expectation/equality/handlers/GroovyNullCompareToHandler.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 webtau maintainers
* Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 1 addition & 0 deletions ...cumenting/webtau/data/expectation/equality/handlers/GroovyNullCompareToHandlerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 webtau maintainers
* Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 1 addition & 0 deletions ...test/groovy/org/testingisdocumenting/webtau/groovy/ast/ShouldAstTransformationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.testingisdocumenting.webtau.groovy.ast

import groovy.test.GroovyTestCase
import org.testingisdocumenting.webtau.data.ValuePath
import org.testingisdocumenting.webtau.expectation.ExpectationHandler
import org.testingisdocumenting.webtau.expectation.ExpectationHandlers
Expand Down
2 changes: 1 addition & 1 deletion webtau-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/main/java/org/testingisdocumenting/webtau/reporter/stacktrace/StackTraceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class StackTraceUtils {
"com.sun.",
"org.testingisdocumenting.webtau",
"org.apache.maven",
"org.codehaus.groovy",
"org.apache.groovy",
"org.junit",
"com.intellij",
"org.codehaus.plexus",
Expand Down
6 changes: 3 additions & 3 deletions webtau-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
</exclusion>

<exclusion>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</exclusion>

<exclusion>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-nio</artifactId>
</exclusion>

<exclusion>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
</exclusion>
</exclusions>
Expand Down
2 changes: 1 addition & 1 deletion webtau-feature-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-graphql-groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-groovy-app/src/main/groovy/org/testingisdocumenting/webtau/app/WebTauCliApp.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class WebTauCliApp implements TestListener, ReportGenerator {

@Override
void generate(WebTauReport report) {
problemCount = (int) (report.failed + report.errored)
problemCount = (int) (report.getFailed() + report.getErrored())
}

private static void setupAnsi() {
Expand Down
6 changes: 3 additions & 3 deletions webtau-groovy-ast/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test</artifactId>
<scope>test</scope>
</dependency>
Expand Down
7 changes: 4 additions & 3 deletions ...rc/main/groovy/org/testingisdocumenting/webtau/groovy/ast/ShouldAstCodeTransformer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 webtau maintainers
* Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,9 +17,6 @@

package org.testingisdocumenting.webtau.groovy.ast

import org.testingisdocumenting.webtau.WebTauCore
import groovy.transform.CompileStatic
import groovy.transform.PackageScope
import org.codehaus.groovy.ast.ClassCodeExpressionTransformer
import org.codehaus.groovy.ast.ClassNode
import org.codehaus.groovy.ast.expr.ArgumentListExpression
Expand All @@ -29,6 +27,9 @@ import org.codehaus.groovy.ast.expr.MethodCallExpression
import org.codehaus.groovy.ast.expr.PropertyExpression
import org.codehaus.groovy.ast.expr.StaticMethodCallExpression
import org.codehaus.groovy.control.SourceUnit
import org.testingisdocumenting.webtau.WebTauCore
import groovy.transform.CompileStatic
import groovy.transform.PackageScope

@PackageScope
@CompileStatic
Expand Down
1 change: 1 addition & 0 deletions ...src/main/groovy/org/testingisdocumenting/webtau/groovy/ast/ShouldAstTransformation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 webtau maintainers
* Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
*
* Licensed under the Apache License, Version 2.0 (the 'License');
Expand Down
4 changes: 2 additions & 2 deletions webtau-groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-http-groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-java-runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-junit5-groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-maven-plugin-test-skip/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-maven-plugin-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion webtau-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions webtau-reactjs/src/test-data/testData.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions webtau-repl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<artifactId>webtau-repl</artifactId>

<properties>
<jline.version>3.19.0</jline.version>
<jline.version>3.23.0</jline.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -80,7 +80,12 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>

<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion webtau-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions webtau-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-nio</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
</dependency>
</dependencies>
Expand Down Expand Up @@ -84,7 +84,7 @@
<shadedPattern>webtaushaded.org.</shadedPattern>
<excludes>
<exclude>org.testingisdocumenting.**</exclude>
<exclude>org.codehaus.groovy.**</exclude>
<exclude>org.apache.groovy.**</exclude>
<exclude>org.apache.groovy.**</exclude>
<exclude>org.w3c.**</exclude>
<exclude>org.fusesource.**</exclude>
Expand Down
Loading
Loading