Skip to content

Commit

Permalink
Merge pull request #2254 from jorsol/refactor-provided-dependencies
Browse files Browse the repository at this point in the history
@fusesource-ci
fusesource-ci authored Jun 2, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
2 parents a18ce45 + 59eb150 commit 2ed5866
Showing 268 changed files with 390 additions and 964 deletions.
11 changes: 4 additions & 7 deletions extensions/knative/model/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,9 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.fabric8</groupId>
@@ -60,10 +62,6 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<!--dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency-->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
@@ -82,7 +80,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

@@ -129,7 +126,7 @@
<!-- removing the generated Schema class -->
<delete
file="${project.build.directory}/generated-sources/io/fabric8/knative/api/model/KnativeSchema.java"
verbose="true"/>
verbose="true" />
</target>
</configuration>
<goals>
18 changes: 0 additions & 18 deletions extensions/service-catalog/client/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -69,31 +69,14 @@
<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>transform-annotations</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -194,7 +177,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resources.plugin.version}</version>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>zip</nonFilteredFileExtension>
7 changes: 0 additions & 7 deletions extensions/service-catalog/model/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -49,12 +49,6 @@
<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
@@ -86,7 +80,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

248 changes: 125 additions & 123 deletions extensions/tekton/model-v1beta1/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -16,133 +16,135 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.fabric8</groupId>
<artifactId>tekton-extension-pom</artifactId>
<version>4.10-SNAPSHOT</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.fabric8</groupId>
<artifactId>tekton-extension-pom</artifactId>
<version>4.10-SNAPSHOT</version>
</parent>

<artifactId>tekton-model-v1beta1</artifactId>
<packaging>bundle</packaging>
<name>Fabric8 :: Tekton :: Model v1beta1</name>
<artifactId>tekton-model-v1beta1</artifactId>
<packaging>bundle</packaging>
<name>Fabric8 :: Tekton :: Model v1beta1</name>

<properties>
<osgi.import>
io.fabric8.kubernetes.api.builder,
!io.fabric8.tekton.*,
*
</osgi.import>
<osgi.export>
io.fabric8.tekton.*
</osgi.export>
<osgi.include.resources>
{maven-resources},
/tekton-v1beta1.properties=target/classes/model.properties
</osgi.include.resources>
</properties>
<properties>
<osgi.import>
io.fabric8.kubernetes.api.builder,
!io.fabric8.tekton.*,
*
</osgi.import>
<osgi.export>
io.fabric8.tekton.*
</osgi.export>
<osgi.include.resources>
{maven-resources},
/tekton-v1beta1.properties=target/classes/model.properties
</osgi.include.resources>
</properties>

<dependencies>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>transform-annotations</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-model-core</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>knative-model</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-migrationsupport</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>transform-annotations</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-model-core</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>knative-model</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-migrationsupport</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
<version>${jsonschema2pojo.version}</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main/resources/schema</sourceDirectory>
<targetPackage>io.fabric8.tekton.api.model</targetPackage>
<includeConstructors>true</includeConstructors>
<includeJsr303Annotations>false</includeJsr303Annotations>
<includeToString>false</includeToString>
<includeHashcodeAndEquals>false</includeHashcodeAndEquals>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<customAnnotator>io.fabric8.kubernetes.ModelAnnotator</customAnnotator>
</configuration>
<executions>
<execution>
<id>generate</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>model-annotator</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<build>
<plugins>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
<version>${jsonschema2pojo.version}</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main/resources/schema</sourceDirectory>
<targetPackage>io.fabric8.tekton.api.model</targetPackage>
<includeConstructors>true</includeConstructors>
<includeJsr303Annotations>false</includeJsr303Annotations>
<includeToString>false</includeToString>
<includeHashcodeAndEquals>false</includeHashcodeAndEquals>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<customAnnotator>io.fabric8.kubernetes.ModelAnnotator</customAnnotator>
</configuration>
<executions>
<execution>
<id>generate</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>model-annotator</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<target>
<!-- removing the generated Schema class -->
<delete
file="${project.build.directory}/generated-sources/io/fabric8/tekton/api/model/TektonSchemaV1beta1.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>
</plugin>
</plugins>
</build>
<delete
file="${project.build.directory}/generated-sources/io/fabric8/tekton/api/model/TektonSchemaV1beta1.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>
</plugin>
</plugins>
</build>

</project>
19 changes: 4 additions & 15 deletions kubernetes-client/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -193,20 +193,14 @@
<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
<scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>transform-annotations</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -215,11 +209,6 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- Testing Dependencies -->
<dependency>
0 kubernetes-model/README.md → kubernetes-model-generator/README.md
View file
File renamed without changes.
0 kubernetes-model/generateModel.sh → kubernetes-model-generator/generateModel.sh
View file
File renamed without changes.
0 kubernetes-model/go.mod → kubernetes-model-generator/go.mod
View file
File renamed without changes.
0 kubernetes-model/go.sum → kubernetes-model-generator/go.sum
View file
File renamed without changes.
0 ...etes-model-admissionregistration/Makefile → ...etes-model-admissionregistration/Makefile
View file
File renamed without changes.
0 ...sionregistration/cmd/generate/generate.go → ...sionregistration/cmd/generate/generate.go
View file
File renamed without changes.
Loading

0 comments on commit 2ed5866

Please sign in to comment.