Skip to content

Commit 45f93fd

Browse files
ypiel-talendypiel-talend
committed
feat(QTDI-1914): Fix after refactoring.
1 parent e78dbd0 commit 45f93fd

16 files changed

Lines changed: 55 additions & 79 deletions

File tree

‎sample-parent/sample-features/loading-analysis/loading-dependencies-common/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1818
<modelVersion>4.0.0</modelVersion>
1919
<parent>
20-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
20+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
2121
<artifactId>loading-analysis</artifactId>
2222
<version>1.89.0-SNAPSHOT</version>
2323
</parent>
@@ -106,19 +106,6 @@
106106
</execution>
107107
</executions>
108108
</plugin>
109-
<plugin>
110-
<groupId>org.apache.maven.plugins</groupId>
111-
<artifactId>maven-jar-plugin</artifactId>
112-
<version>${maven-jar-plugin.version}</version>
113-
<executions>
114-
<execution>
115-
<goals>
116-
<!-- Generate a test-jar to share some test classes with child modules tests. -->
117-
<goal>test-jar</goal>
118-
</goals>
119-
</execution>
120-
</executions>
121-
</plugin>
122109
</plugins>
123110
</build>
124111

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dataprepRunAnnotation/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>
20-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
20+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
2121
<artifactId>loading-analysis</artifactId>
2222
<version>1.89.0-SNAPSHOT</version>
2323
</parent>
2424

25-
<artifactId>dynamic-dependencies-with-dataprepRunAnnotation</artifactId>
25+
<artifactId>loading-dependencies-with-dataprepRunAnnotation</artifactId>
2626
<packaging>jar</packaging>
2727
<name>Component Runtime :: Sample Feature @DynamicDependency with DataprepRun annotation</name>
2828

2929
<dependencies>
3030
<dependency>
31-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
31+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
3232
<artifactId>loading-dependencies-common</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
3535
<!-- Test -->
3636
<dependency>
37-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
37+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
3838
<artifactId>loading-dependencies-common</artifactId>
3939
<version>${project.version}</version>
4040
<type>test-jar</type>
@@ -57,7 +57,7 @@
5757
<configuration>
5858
<archive>
5959
<manifestEntries>
60-
<Automatic-Module-Name>dynamic.dependencies.withDataprepRunAnnotation</Automatic-Module-Name>
60+
<Automatic-Module-Name>loading.dependencies.with.datapreprunannotation</Automatic-Module-Name>
6161
</manifestEntries>
6262
</archive>
6363
</configuration>

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dataprepRunAnnotation/src/test/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDataprepRunAnnotation/service/DynamicDependenciesDataprepRunAnnotationServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import lombok.extern.slf4j.Slf4j;
3030

3131
@Slf4j
32-
@WithComponents(value = "org.talend.sdk.component.sample.feature.dynamicdependencies.withDataprepRunAnnotation")
32+
@WithComponents(value = "org.talend.sdk.component.sample.feature.loadinganalysis.withDataprepRunAnnotation")
3333
public class DynamicDependenciesDataprepRunAnnotationServiceTest
3434
extends AbstractDynamicDependenciesServiceTest<Config, DynamicDependenciesDataprepRunAnnotationService> {
3535

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dataset/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818
<parent>
19-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
19+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
2020
<artifactId>loading-analysis</artifactId>
2121
<version>1.89.0-SNAPSHOT</version>
2222
</parent>
2323

24-
<artifactId>dynamic-dependencies-with-dataset</artifactId>
24+
<artifactId>loading-dependencies-with-dataset</artifactId>
2525
<packaging>jar</packaging>
2626
<name>Component Runtime :: Sample Feature @DynamicDependency with Dataset</name>
2727

2828
<dependencies>
2929
<dependency>
30-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
30+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
3131
<artifactId>loading-dependencies-common</artifactId>
3232
<version>${project.version}</version>
3333
</dependency>
3434
<!-- Test -->
3535
<dependency>
36-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
36+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
3737
<artifactId>loading-dependencies-common</artifactId>
3838
<version>${project.version}</version>
3939
<type>test-jar</type>
@@ -56,7 +56,7 @@
5656
<configuration>
5757
<archive>
5858
<manifestEntries>
59-
<Automatic-Module-Name>org.talend.sdk.component.dynamic.dependencies.withdataset</Automatic-Module-Name>
59+
<Automatic-Module-Name>loading.dependencies.with.dataset</Automatic-Module-Name>
6060
</manifestEntries>
6161
</archive>
6262
</configuration>

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dataset/src/test/java/org/talend/sdk/component/sample/feature/loadinganalysis/withdataset/service/DynamicDependenciesWithDatasetServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import lombok.extern.slf4j.Slf4j;
2929

3030
@Slf4j
31-
@WithComponents(value = "org.talend.sdk.component.sample.feature.dynamicdependencies.withdataset")
31+
@WithComponents(value = "org.talend.sdk.component.sample.feature.loadinganalysis.withdataset")
3232
public class DynamicDependenciesWithDatasetServiceTest
3333
extends AbstractDynamicDependenciesServiceTest<Config, DynamicDependenciesWithDatasetService> {
3434

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-datastore/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1818
<modelVersion>4.0.0</modelVersion>
1919
<parent>
20-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
20+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
2121
<artifactId>loading-analysis</artifactId>
2222
<version>1.89.0-SNAPSHOT</version>
2323
</parent>
2424

25-
<artifactId>dynamic-dependencies-with-datastore</artifactId>
25+
<artifactId>loading-dependencies-with-datastore</artifactId>
2626
<packaging>jar</packaging>
2727
<name>Component Runtime :: Sample Feature @DynamicDependency with Datastore</name>
2828

2929
<dependencies>
3030
<dependency>
31-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
31+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
3232
<artifactId>loading-dependencies-common</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
3535
<!-- Test -->
3636
<dependency>
37-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
37+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
3838
<artifactId>loading-dependencies-common</artifactId>
3939
<version>${project.version}</version>
4040
<type>test-jar</type>
@@ -57,8 +57,7 @@
5757
<configuration>
5858
<archive>
5959
<manifestEntries>
60-
<Automatic-Module-Name>org.talend.sdk.component.dynamic.dependencies.withdatastore
61-
</Automatic-Module-Name>
60+
<Automatic-Module-Name>loading.dependencies.with.datastore</Automatic-Module-Name>
6261
</manifestEntries>
6362
</archive>
6463
</configuration>

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-datastore/src/test/java/org/talend/sdk/component/sample/feature/loadinganalysis/withdatastore/service/DynamicDependenciesWithDatastoreServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import lombok.extern.slf4j.Slf4j;
2929

3030
@Slf4j
31-
@WithComponents(value = "org.talend.sdk.component.sample.feature.dynamicdependencies.withdatastore")
31+
@WithComponents(value = "org.talend.sdk.component.sample.feature.loadinganalysis.withdatastore")
3232
public class DynamicDependenciesWithDatastoreServiceTest
3333
extends AbstractDynamicDependenciesServiceTest<Config, DynamicDependenciesWithDatastoreService> {
3434

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dynamicDependenciesConfiguration/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818
<parent>
19-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
19+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
2020
<artifactId>loading-analysis</artifactId>
2121
<version>1.89.0-SNAPSHOT</version>
2222
</parent>
2323

24-
<artifactId>dynamic-dependencies-with-dynamicDependenciesConfiguration</artifactId>
24+
<artifactId>loading-dependencies-with-dynamicDependenciesConfiguration</artifactId>
2525
<packaging>jar</packaging>
2626
<name>Component Runtime :: Sample Feature @DynamicDependency with DynamicDependenciesConfiguration</name>
2727

@@ -32,13 +32,13 @@
3232

3333
<dependencies>
3434
<dependency>
35-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
35+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
3636
<artifactId>loading-dependencies-common</artifactId>
3737
<version>${project.version}</version>
3838
</dependency>
3939
<!-- Test -->
4040
<dependency>
41-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
41+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
4242
<artifactId>loading-dependencies-common</artifactId>
4343
<version>${project.version}</version>
4444
<type>test-jar</type>
@@ -61,7 +61,7 @@
6161
<configuration>
6262
<archive>
6363
<manifestEntries>
64-
<Automatic-Module-Name>org.talend.sdk.component.dynamic.dependencies.withDynamicDependenciesConfiguration</Automatic-Module-Name>
64+
<Automatic-Module-Name>loading.dependencies.with.dynamicdependenciesconfiguration</Automatic-Module-Name>
6565
</manifestEntries>
6666
</archive>
6767
</configuration>

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dynamicDependenciesConfiguration/src/test/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDynamicDependenciesConfiguration/service/DynamicDependenciesWithDynamicependenciesConfigurationServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
@Slf4j
3131
@WithComponents(
32-
value = "org.talend.sdk.component.sample.feature.dynamicdependencies.withDynamicDependenciesConfiguration")
32+
value = "org.talend.sdk.component.sample.feature.loadinganalysis.withDynamicDependenciesConfiguration")
3333
public class DynamicDependenciesWithDynamicependenciesConfigurationServiceTest
3434
extends
3535
AbstractDynamicDependenciesServiceTest<Config, DynamicDependenciesWithDynamicependenciesConfigurationService> {

‎sample-parent/sample-features/loading-analysis/loading-services-and-resources-lib/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
21-
<groupId>org.talend.sdk.samplefeature.loadinganalysis</groupId>
21+
<groupId>org.talend.sdk.component.loadinganalysis</groupId>
2222
<artifactId>loading-analysis</artifactId>
2323
<version>1.89.0-SNAPSHOT</version>
2424
</parent>
@@ -40,7 +40,7 @@
4040
<configuration>
4141
<archive>
4242
<manifestEntries>
43-
<Automatic-Module-Name>dynamic.dependencies.classloadertestlibrary</Automatic-Module-Name>
43+
<Automatic-Module-Name>service.provider.from.dependency.lib</Automatic-Module-Name>
4444
</manifestEntries>
4545
</archive>
4646
</configuration>

0 commit comments

Comments
 (0)