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

Making raw/generic buildable #4615

Merged
merged 6 commits into from
Dec 5, 2022
Merged

Making raw/generic buildable #4615

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
9da551e
fix #4540: adding generic and raw as buildable
shawkins Nov 28, 2022
036bbc8
fix #4540: adding a test to ensure the raw value is not lost
shawkins Nov 28, 2022
80f6c90
fix #4540: regenerating the models for generic / raw buildable
shawkins Nov 28, 2022
c903156
fix #4540: moving extension model generation to a profile
shawkins Nov 28, 2022
09f7299
fix #4540: adding missing generation update
shawkins Nov 28, 2022
77aadbc
fix #4540: adding the generate profile to the extension makefiles
shawkins Dec 2, 2022
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* Fix #4535: The shell command string will now have single quotes sanitized
* Fix #4543: (Java Generator) additionalProperties JsonAny setter method generated as setAdditionalProperty
* Fix #4547: preventing timing issues with leader election cancel
* Fix #4540: treating GenericKubernetesResource and RawExtension as buildable
* Fix #4569: fixing jdk httpclient regression with 0 timeouts

#### Improvements
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/generator-v1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

build: gobuild
pushd ../model-v1 && \
mvn clean install -o && \
mvn -Pgenerate clean install -DskipTests -o && \
popd

gobuild:
Expand Down
2 changes: 1 addition & 1 deletion extensions/camel-k/generator-v1alpha1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

build: gobuild
pushd ../model-v1alpha1 && \
mvn clean install -o && \
mvn -Pgenerate clean install -DskipTests -o && \
popd

gobuild:
Expand Down
56 changes: 33 additions & 23 deletions extensions/camel-k/model-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,32 +78,42 @@
<scope>provided</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>generate</id>
<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<!-- removing the generated Schema class -->
<delete
file="${generate.targetDirectory}/io/fabric8/camelk/api/model/CamelKSchemaV1.java"
verbose="true" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<!-- removing the generated Schema class -->
<delete
file="${generate.targetDirectory}/io/fabric8/camelk/api/model/CamelKSchemaV1.java"
verbose="true" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down
56 changes: 33 additions & 23 deletions extensions/camel-k/model-v1alpha1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,32 +85,42 @@
<scope>provided</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>generate</id>
<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<!-- removing the generated Schema class -->
<delete
file="${generate.targetDirectory}/io/fabric8/camelk/api/model/CamelKSchemaV1alpha1.java"
verbose="true"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<!-- removing the generated Schema class -->
<delete
file="${generate.targetDirectory}/io/fabric8/camelk/api/model/CamelKSchemaV1alpha1.java"
verbose="true"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/generator-v1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

build: gobuild
pushd ../model-v1 && \
mvn clean install -o && \
mvn -Pgenerate clean install -DskipTests -DskipTests -o && \
popd

gobuild:
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/generator-v1alpha2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

build: gobuild
pushd ../model-v1alpha2 && \
mvn clean install -o && \
mvn -Pgenerate clean install -DskipTests -o && \
popd

gobuild:
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/generator-v1alpha3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

build: gobuild
pushd ../model-v1alpha3 && \
mvn clean install -o && \
mvn -Pgenerate clean install -DskipTests -o && \
popd

gobuild:
Expand Down
2 changes: 1 addition & 1 deletion extensions/certmanager/generator-v1beta1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

build: gobuild
pushd ../model-v1beta1 && \
mvn clean install -o && \
mvn -Pgenerate clean install -DskipTests -o && \
popd

gobuild:
Expand Down
56 changes: 33 additions & 23 deletions extensions/certmanager/model-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,32 +81,42 @@
<artifactId>lombok</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>generate</id>
<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<echo>removing the duplicate generated class</echo>
<delete
file="${generate.targetDirectory}/io/fabric8/certmanager/api/model/v1/CertificateRequestSpec.java"
verbose="true" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<echo>removing the duplicate generated class</echo>
<delete
file="${generate.targetDirectory}/io/fabric8/certmanager/api/model/v1/CertificateRequestSpec.java"
verbose="true" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
18 changes: 14 additions & 4 deletions extensions/certmanager/model-v1alpha2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,23 @@
<artifactId>lombok</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>generate</id>
<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
18 changes: 14 additions & 4 deletions extensions/certmanager/model-v1alpha3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,23 @@
<artifactId>lombok</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>generate</id>
<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
56 changes: 33 additions & 23 deletions extensions/certmanager/model-v1beta1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,32 +73,42 @@
<artifactId>lombok</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>generate</id>
<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<echo>removing the duplicate generated class</echo>
<delete
file="${generate.targetDirectory}/io/fabric8/certmanager/api/model/v1beta1/CertificateRequestSpec.java"
verbose="true" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<echo>removing the duplicate generated class</echo>
<delete
file="${generate.targetDirectory}/io/fabric8/certmanager/api/model/v1beta1/CertificateRequestSpec.java"
verbose="true" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/chaosmesh/generator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all: build

build: gobuild
pushd ../model && \
mvn clean install -o && \
mvn -Pgenerate clean install -DskipTests -o && \
popd

gobuild:
Expand Down