Skip to content

Commit

Permalink
feat: gradle base API based on v8.2.1
Browse files Browse the repository at this point in the history 
Signed-off-by: Marc Nuri <[email protected]>
  • Loading branch information
@manusa
manusa committed Aug 4, 2023
1 parent 928dd9f commit 2ebfc66
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 173 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* Fix #5368: added support for additional ListOptions fields

#### Dependency Upgrade
* Fix #5373: Gradle base API based on v8.2.1

#### New Features

Expand Down
69 changes: 17 additions & 52 deletions java-generator/gradle-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,33 +45,28 @@
<artifactId>java-generator-core</artifactId>
</dependency>


<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy-api.version}</version>
<type>pom</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-base-services</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-core</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-core-api</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-logging</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-plugins</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-model-core</artifactId>
<artifactId>gradle-all</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
Expand All @@ -82,36 +77,6 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>

<!-- Gradle plugin test -->
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-base-services-groovy</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-messaging</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-native</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-platform-jvm</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-process-services</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-tooling-api</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-test-kit</artifactId>
</dependency>
</dependencies>

</project>
33 changes: 9 additions & 24 deletions java-generator/it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,36 +69,21 @@
<!-- Gradle plugin test -->
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-base-services-groovy</artifactId>
<artifactId>gradle-all</artifactId>
<scope>test</scope>
</dependency>
<!-- Gradle needs these on the classpath -->
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-messaging</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-native</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-platform-jvm</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-process-services</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-tooling-api</artifactId>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-test-kit</artifactId>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<scope>test</scope>
</dependency>
<!-- Gradle execution will need these on the classpath -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion ...erator/it/src/main/java-templates/io/fabric8/java/generator/testing/GradleProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

public final class GradleProperties {
public static String binariesVersion() {
return "${gradle-binaries.version}";
return "${gradle-api.version}";
}

private GradleProperties() {
Expand Down
2 changes: 1 addition & 1 deletion java-generator/it/src/test/java/io/fabric8/java/generator/gradle/plugin/SimpleIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
class SimpleIT {

@RegisterExtension
private final ITGradleRunnerExtension gradleRunner = new ITGradleRunnerExtension();
final ITGradleRunnerExtension gradleRunner = new ITGradleRunnerExtension();

/**
* Verify that the {@code crd2java} Gradle task is available
Expand Down
97 changes: 11 additions & 86 deletions java-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@
</modules>

<properties>
<gradle-binaries.version>8.1</gradle-binaries.version>
<gradle-api.version>6.1.1</gradle-api.version>
<groovy-api.version>2.4.21</groovy-api.version>
<javax.inject.version>1</javax.inject.version>
<commons-io.version>2.13.0</commons-io.version>
</properties>

<repositories>
Expand Down Expand Up @@ -82,98 +78,27 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy-api.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-base-services</artifactId>
<artifactId>gradle-all</artifactId>
<version>${gradle-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-core</artifactId>
<version>${gradle-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-core-api</artifactId>
<version>${gradle-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-logging</artifactId>
<version>${gradle-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-plugins</artifactId>
<version>${gradle-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-model-core</artifactId>
<version>${gradle-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- Gradle plugin test-->
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-base-services-groovy</artifactId>
<version>${gradle-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-messaging</artifactId>
<version>${gradle-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-native</artifactId>
<version>${gradle-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-platform-jvm</artifactId>
<version>${gradle-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-process-services</artifactId>
<version>${gradle-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-test-kit</artifactId>
<version>${gradle-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-tooling-api</artifactId>
<version>${gradle-api.version}</version>
<scope>test</scope>
</dependency>
<!-- Gradle test execution will need these on the classpath -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>com.marcnuri.plugins</groupId>
<artifactId>gradle-api-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion kubernetes-model-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
<javadoc.doclint>none</javadoc.doclint>
</properties>
</profile>
</profiles>
Expand Down
Loading

0 comments on commit 2ebfc66

Please sign in to comment.