Skip to content

Commit 51d08c3

Browse files
rohanKanojiamanusa
rohanKanojia
authored and
manusa
committed
Removing apt-maven-pluginr references from extension poms
1 parent 8e8cb5a commit 51d08c3

File tree

7 files changed

+14
-98
lines changed

7 files changed

+14
-98
lines changed

‎.github/workflows/gobuild.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
- name: Check No Schema file modified
3636
run: |
3737
git add .
38-
MODIFIED_KUBE_SCHEMA=`git status | grep -v 'validation-schema.json' | grep -E '*-schema.json|src/generated/java' | wc -l`
38+
MODIFIED_KUBE_SCHEMA=`git status | grep -v 'validation-schema.json' | grep 'kube-schema.json\|src/generated/java' | wc -l`
3939
if [ $MODIFIED_KUBE_SCHEMA -eq "0" ]; then
4040
echo "No Schema files modified. Build Success.";
4141
else
42-
git status
42+
git status | grep -v 'validation-schema.json' | grep 'kube-schema.json\|src/generated/java'
4343
echo "Schema files modified. Build Failure";
4444
exit 1;
4545
fi;

‎extensions/certmanager/model-v1alpha2/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,6 @@
7777

7878
<build>
7979
<plugins>
80-
<plugin>
81-
<groupId>com.mysema.maven</groupId>
82-
<artifactId>apt-maven-plugin</artifactId>
83-
<version>1.1.3</version>
84-
<executions>
85-
<execution>
86-
<goals>
87-
<goal>process</goal>
88-
</goals>
89-
<configuration>
90-
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
91-
<processor>io.sundr.builder.internal.processor.BuildableProcessor</processor>
92-
</configuration>
93-
</execution>
94-
</executions>
95-
</plugin>
9680
<plugin>
9781
<groupId>org.jsonschema2pojo</groupId>
9882
<artifactId>jsonschema2pojo-maven-plugin</artifactId>

‎extensions/certmanager/model-v1alpha3/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,6 @@
7777

7878
<build>
7979
<plugins>
80-
<plugin>
81-
<groupId>com.mysema.maven</groupId>
82-
<artifactId>apt-maven-plugin</artifactId>
83-
<version>1.1.3</version>
84-
<executions>
85-
<execution>
86-
<goals>
87-
<goal>process</goal>
88-
</goals>
89-
<configuration>
90-
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
91-
<processor>io.sundr.builder.internal.processor.BuildableProcessor</processor>
92-
</configuration>
93-
</execution>
94-
</executions>
95-
</plugin>
9680
<plugin>
9781
<groupId>org.jsonschema2pojo</groupId>
9882
<artifactId>jsonschema2pojo-maven-plugin</artifactId>

‎extensions/chaosmesh/model/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,6 @@
7777

7878
<build>
7979
<plugins>
80-
<plugin>
81-
<groupId>com.mysema.maven</groupId>
82-
<artifactId>apt-maven-plugin</artifactId>
83-
<version>1.1.3</version>
84-
<executions>
85-
<execution>
86-
<goals>
87-
<goal>process</goal>
88-
</goals>
89-
<configuration>
90-
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
91-
<processor>io.sundr.builder.internal.processor.BuildableProcessor</processor>
92-
</configuration>
93-
</execution>
94-
</executions>
95-
</plugin>
9680
<plugin>
9781
<groupId>org.jsonschema2pojo</groupId>
9882
<artifactId>jsonschema2pojo-maven-plugin</artifactId>

‎extensions/service-catalog/model/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,6 @@
7676

7777
<build>
7878
<plugins>
79-
<plugin>
80-
<groupId>com.mysema.maven</groupId>
81-
<artifactId>apt-maven-plugin</artifactId>
82-
<version>1.1.3</version>
83-
<executions>
84-
<execution>
85-
<goals>
86-
<goal>process</goal>
87-
</goals>
88-
<configuration>
89-
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
90-
<processor>io.sundr.builder.internal.processor.BuildableProcessor</processor>
91-
</configuration>
92-
</execution>
93-
</executions>
94-
</plugin>
9579
<plugin>
9680
<groupId>org.jsonschema2pojo</groupId>
9781
<artifactId>jsonschema2pojo-maven-plugin</artifactId>

‎extensions/volumesnapshot/model/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,6 @@
7777

7878
<build>
7979
<plugins>
80-
<plugin>
81-
<groupId>com.mysema.maven</groupId>
82-
<artifactId>apt-maven-plugin</artifactId>
83-
<version>1.1.3</version>
84-
<executions>
85-
<execution>
86-
<goals>
87-
<goal>process</goal>
88-
</goals>
89-
<configuration>
90-
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
91-
<processor>io.sundr.builder.internal.processor.BuildableProcessor</processor>
92-
</configuration>
93-
</execution>
94-
</executions>
95-
</plugin>
9680
<plugin>
9781
<groupId>org.jsonschema2pojo</groupId>
9882
<artifactId>jsonschema2pojo-maven-plugin</artifactId>

‎kubernetes-model-generator/generateModel.sh

+12-16
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ declare -a modules=(
4141
"kubernetes-model-policy"
4242
"kubernetes-model-scheduling"
4343
"kubernetes-model-storageclass"
44-
#"openshift-model"
45-
#"openshift-model-operator"
46-
#"openshift-model-operatorhub"
47-
#"openshift-model-console"
48-
#"openshift-model-clusterautoscaling"
49-
#"openshift-model-machineconfig"
50-
#"openshift-model-machine"
51-
#"openshift-model-miscellaneous"
52-
#"openshift-model-monitoring"
53-
#"openshift-model-tuned"
54-
#"openshift-model-whereabouts"
55-
#"openshift-model-storageversionmigrator"
44+
"openshift-model"
45+
"openshift-model-operator"
46+
"openshift-model-operatorhub"
47+
"openshift-model-console"
48+
"openshift-model-clusterautoscaling"
49+
"openshift-model-machineconfig"
50+
"openshift-model-machine"
51+
"openshift-model-miscellaneous"
52+
"openshift-model-monitoring"
53+
"openshift-model-tuned"
54+
"openshift-model-whereabouts"
55+
"openshift-model-storageversionmigrator"
5656
)
5757

5858
declare -a extensionModuleParents=(
@@ -111,15 +111,11 @@ generateSingleModule() {
111111

112112
extensionInstallCommonModules() {
113113
mvn clean install -f ../model-annotator/pom.xml
114-
#mvn clean install -DskipTests -f ../kubernetes-client/pom.xml
115-
#mvn clean install -DskipTests -f ../kubernetes-server-mock/pom.xml
116114
mvn clean install -N -f ../extensions/pom.xml
117115
for parent in ${extensionModuleParents[*]}
118116
do
119117
mvn clean install -N -f "$parent"
120118
done
121-
#mvn clean install -N -f ../extensions/knative/pom.xml
122-
#mvn clean install -N -f ../extensions/knative/model/pom.xml
123119
}
124120

125121
echo "Installing required common modules"

0 commit comments

Comments
 (0)