Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion component-runtime-testing/component-runtime-junit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
<!-- just here for the reactor order -->
<optional>true</optional>
</dependency>
<dependency><!-- cause of previous dependency -->
<dependency>
<!-- cause of previous dependency -->
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
Expand Down
38 changes: 38 additions & 0 deletions component-starter-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-package.json</id>
<goals>
<goal>run</goal>
</goals>
<phase>initialize</phase>
<configuration>
<target>
<copy file="${project.basedir}/src/main/frontend/package-template.json" overwrite="true" tofile="${project.basedir}/src/main/frontend/package.json"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Comment thread
ozhelezniak-talend marked this conversation as resolved.
<artifactId>maven-resources-plugin</artifactId>
Expand All @@ -367,6 +385,26 @@
</resources>
</configuration>
</execution>
<execution>
<id>filter-frontend</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>initialize</phase>
<configuration>
<outputDirectory>${project.basedir}/src/main/frontend</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/frontend</directory>
<includes>
<include>package.json</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<overwrite>true</overwrite>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion component-starter-server/src/main/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
"overrides": {
"webpack": "^5.92.0"
}
}
}
10 changes: 0 additions & 10 deletions component-studio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,6 @@

<build>
<plugins>
<plugin>
<groupId>com.github.rmannibucau</groupId>
<artifactId>common-maven-plugin</artifactId>
<executions>
<execution>
<id>set-rootlocation</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
Expand Down
44 changes: 44 additions & 0 deletions component-tools-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,50 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-package.json</id>
<goals>
<goal>run</goal>
</goals>
<phase>initialize</phase>
<configuration>
<target>
<copy file="${project.basedir}/src/main/frontend/package-template.json" overwrite="true" tofile="${project.basedir}/src/main/frontend/package.json"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Comment thread
ozhelezniak-talend marked this conversation as resolved.
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>filter-frontend</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>initialize</phase>
<configuration>
<outputDirectory>${project.basedir}/src/main/frontend</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/frontend</directory>
<includes>
<include>package.json</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<overwrite>true</overwrite>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 1 addition & 1 deletion component-tools-webapp/src/main/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
"cross-env": "^7.0.3",
"webpack": "5.92.1"
}
}
}
76 changes: 59 additions & 17 deletions documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -499,40 +499,82 @@
</executions>
</plugin>
<plugin>
<groupId>com.github.rmannibucau</groupId>
<artifactId>common-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>filter-antora</id>
<id>create-files-from-templates</id>
<goals>
<goal>filter</goal>
<goal>run</goal>
</goals>
<phase>process-classes</phase>
<phase>initialize</phase>
<configuration>
<from>${project.basedir}/src/main/antora/antora-template.yml</from>
<to>${project.basedir}/src/main/antora/antora.yml</to>
<target>
<copy todir="${project.basedir}/src/main/frontend" overwrite="true">
<fileset dir="${project.basedir}/src/main/frontend">
<include name="package-template.json"/>
</fileset>
<mapper type="glob" from="package-template.json" to="package.json"/>
</copy>
<copy todir="${project.basedir}/src/main/antora" overwrite="true">
<fileset dir="${project.basedir}/src/main/antora">
<include name="antora-template.yml"/>
<include name="site-template.yml"/>
<include name="site-${antora.dev.site.mode}-template.yml"/>
</fileset>
<mapper>
<globmapper from="*-template.yml" to="*.yml"/>
</mapper>
</copy>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>filter-site-dev</id>
<id>filter-frontend</id>
<goals>
<goal>filter</goal>
<goal>copy-resources</goal>
</goals>
<phase>process-classes</phase>
<phase>initialize</phase>
<configuration>
<from>${project.basedir}/src/main/antora/site-${antora.dev.site.mode}-template.yml</from>
<to>${project.basedir}/src/main/antora/site-${antora.dev.site.mode}.yml</to>
<outputDirectory>${project.basedir}/src/main/frontend</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/frontend</directory>
<includes>
<include>package.json</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<overwrite>true</overwrite>
</configuration>
</execution>
<execution>
<id>filter-site</id>
<id>filter-antora</id>
<goals>
<goal>filter</goal>
<goal>copy-resources</goal>
</goals>
<phase>process-classes</phase>
<phase>process-sources</phase>
<configuration>
<from>${project.basedir}/src/main/antora/site-template.yml</from>
<to>${project.basedir}/src/main/antora/site.yml</to>
<outputDirectory>${project.basedir}/src/main/antora/</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/antora/</directory>
<includes>
<include>antora.yml</include>
<include>site-${antora.dev.site.mode}.yml</include>
<include>site.yml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<overwrite>true</overwrite>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion documentation/src/main/antora/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ name: main
title: Talend Component Kit Developer Reference Guide
version: '1.84.0'
nav:
- modules/ROOT/nav.adoc
- modules/ROOT/nav.adoc
31 changes: 1 addition & 30 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,14 +248,13 @@
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<common-maven-plugin.version>1.0.7</common-maven-plugin.version>
<clirr-plugin.version>2.8</clirr-plugin.version>
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
<gpg-plugin.version>3.2.7</gpg-plugin.version>
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
<spotless-maven-plugin.version>2.44.4</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.46.1</spotless-maven-plugin.version>
Comment thread
ozhelezniak-talend marked this conversation as resolved.
<jib-maven-plugin.version>3.4.5</jib-maven-plugin.version>
<jib-core.version>0.24.0</jib-core.version>
<maven-checkstyle-plugin.version>3.2.1</maven-checkstyle-plugin.version>
Expand Down Expand Up @@ -1358,11 +1357,6 @@
<artifactId>ossindex-maven-plugin</artifactId>
<version>${ossindex-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.github.rmannibucau</groupId>
<artifactId>common-maven-plugin</artifactId>
<version>${common-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
Expand Down Expand Up @@ -1446,24 +1440,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.rmannibucau</groupId>
<artifactId>common-maven-plugin</artifactId>
<executions>
<execution>
<id>set-rootlocation</id>
<goals>
<goal>rootlocation</goal>
</goals>
</execution>
<execution>
<id>frontend-filter</id>
<goals>
<goal>frontend-filter</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
Expand Down Expand Up @@ -1494,11 +1470,6 @@
</importOrder>
<removeUnusedImports/>
</java>
<pom>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
</sortPom>
</pom>
</configuration>
<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion singer-parent/component-kitap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<shadedClassifierName>fatjar</shadedClassifierName>
<dependencyReducedPomLocation>${project.build.directory}/reduced-pom.xml</dependencyReducedPomLocation>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.talend.sdk.component.singer.kitap.Carpates</Main-Class>
Expand Down
15 changes: 0 additions & 15 deletions talend-component-maven-plugin/src/it/dependency/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,6 @@

<build>
<plugins>
<plugin>
<groupId>com.github.rmannibucau</groupId>
<artifactId>common-maven-plugin</artifactId>
<version>@{common-plugin.version@</version>
<executions>
<execution>
<id>set-rootlocation</id>
<phase>none</phase>
</execution>
<execution>
<id>frontend-filter</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.talend.sdk.component</groupId>
<artifactId>talend-component-maven-plugin</artifactId>
Expand Down
Loading