You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/04/20 09:04:14 UTC
[camel-quarkus] 01/05: Sync group-tests.groovy with main branch commit e5ec731 Upgrade to Quarkiverse CXF 2.0.0.Alpha4
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 36c26aada4839349e05578d1d5944b8fde5be4d0
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Apr 20 00:28:44 2023 +0200
Sync group-tests.groovy with main branch commit e5ec731 Upgrade to
Quarkiverse CXF 2.0.0.Alpha4
---
integration-tests/aws2-grouped/.gitignore | 3 +
integration-tests/aws2-grouped/pom.xml | 30 ---------
.../aws2-quarkus-client-grouped/.gitignore | 3 +
integration-tests/azure-grouped/.gitignore | 3 +
integration-tests/azure-grouped/pom.xml | 30 ---------
integration-tests/compression-grouped/.gitignore | 3 +
integration-tests/compression-grouped/pom.xml | 30 ---------
integration-tests/cxf-soap-grouped/.gitignore | 3 +
integration-tests/cxf-soap-grouped/pom.xml | 71 +++-------------------
integration-tests/foundation-grouped/.gitignore | 3 +
integration-tests/foundation-grouped/pom.xml | 30 ---------
integration-tests/mongodb-grouped/.gitignore | 3 +
integration-tests/mongodb-grouped/pom.xml | 30 ---------
tooling/scripts/group-tests.groovy | 27 +++++---
14 files changed, 49 insertions(+), 220 deletions(-)
diff --git a/integration-tests/aws2-grouped/.gitignore b/integration-tests/aws2-grouped/.gitignore
new file mode 100644
index 0000000000..6119608b19
--- /dev/null
+++ b/integration-tests/aws2-grouped/.gitignore
@@ -0,0 +1,3 @@
+
+# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
+/src/
diff --git a/integration-tests/aws2-grouped/pom.xml b/integration-tests/aws2-grouped/pom.xml
index bf8f7bdee9..b0453e42e8 100644
--- a/integration-tests/aws2-grouped/pom.xml
+++ b/integration-tests/aws2-grouped/pom.xml
@@ -128,36 +128,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
diff --git a/integration-tests/aws2-quarkus-client-grouped/.gitignore b/integration-tests/aws2-quarkus-client-grouped/.gitignore
new file mode 100644
index 0000000000..6119608b19
--- /dev/null
+++ b/integration-tests/aws2-quarkus-client-grouped/.gitignore
@@ -0,0 +1,3 @@
+
+# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
+/src/
diff --git a/integration-tests/azure-grouped/.gitignore b/integration-tests/azure-grouped/.gitignore
new file mode 100644
index 0000000000..6119608b19
--- /dev/null
+++ b/integration-tests/azure-grouped/.gitignore
@@ -0,0 +1,3 @@
+
+# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
+/src/
diff --git a/integration-tests/azure-grouped/pom.xml b/integration-tests/azure-grouped/pom.xml
index e2ec3e5085..7ed630ccec 100644
--- a/integration-tests/azure-grouped/pom.xml
+++ b/integration-tests/azure-grouped/pom.xml
@@ -105,36 +105,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
diff --git a/integration-tests/compression-grouped/.gitignore b/integration-tests/compression-grouped/.gitignore
new file mode 100644
index 0000000000..6119608b19
--- /dev/null
+++ b/integration-tests/compression-grouped/.gitignore
@@ -0,0 +1,3 @@
+
+# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
+/src/
diff --git a/integration-tests/compression-grouped/pom.xml b/integration-tests/compression-grouped/pom.xml
index a29a7c5f30..27f79415b9 100644
--- a/integration-tests/compression-grouped/pom.xml
+++ b/integration-tests/compression-grouped/pom.xml
@@ -83,36 +83,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
diff --git a/integration-tests/cxf-soap-grouped/.gitignore b/integration-tests/cxf-soap-grouped/.gitignore
new file mode 100644
index 0000000000..6119608b19
--- /dev/null
+++ b/integration-tests/cxf-soap-grouped/.gitignore
@@ -0,0 +1,3 @@
+
+# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
+/src/
diff --git a/integration-tests/cxf-soap-grouped/pom.xml b/integration-tests/cxf-soap-grouped/pom.xml
index 05fa3d5a26..47e969f3b8 100644
--- a/integration-tests/cxf-soap-grouped/pom.xml
+++ b/integration-tests/cxf-soap-grouped/pom.xml
@@ -57,8 +57,8 @@
<artifactId>quarkus-cxf-services-sts</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.cxf.xjc-utils</groupId>
- <artifactId>cxf-xjc-runtime</artifactId>
+ <groupId>io.quarkiverse.cxf</groupId>
+ <artifactId>quarkus-cxf-xjc-plugins</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -338,36 +338,6 @@
<!-- </execution>-->
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
@@ -389,43 +359,20 @@
</execution>
</executions>
</plugin>
+
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
+ <groupId>${quarkus.platform.group-id}</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <version>${quarkus.platform.version}</version>
+ <extensions>true</extensions><!-- Workaround for https://github.com/quarkusio/quarkus/issues/21718 -->
<executions>
<execution>
+ <id>generate-code</id>
<goals>
- <goal>wsdl2java</goal>
+ <goal>generate-code</goal>
</goals>
- <configuration>
- <wsdlOptions>
- <wsdlOption>
- <wsdl>${basedir}/target/classes/wsdl/CalculatorService.wsdl</wsdl>
- <wsdlLocation>classpath:wsdl/CalculatorService.wsdl</wsdlLocation>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/target/classes/wsdl/BasicAuthCalculatorService.wsdl</wsdl>
- <wsdlLocation>classpath:wsdl/BasicAuthCalculatorService.wsdl</wsdlLocation>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/target/classes/wsdl/HelloService.wsdl</wsdl>
- <wsdlLocation>classpath:wsdl/HelloService.wsdl</wsdlLocation>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/target/classes/wsdl/WssCalculatorService.wsdl</wsdl>
- <wsdlLocation>classpath:wsdl/WssCalculatorService.wsdl</wsdlLocation>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>${cxf.xjc-utils.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/integration-tests/foundation-grouped/.gitignore b/integration-tests/foundation-grouped/.gitignore
new file mode 100644
index 0000000000..6119608b19
--- /dev/null
+++ b/integration-tests/foundation-grouped/.gitignore
@@ -0,0 +1,3 @@
+
+# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
+/src/
diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml
index 902b583bf4..a6754dbb5f 100644
--- a/integration-tests/foundation-grouped/pom.xml
+++ b/integration-tests/foundation-grouped/pom.xml
@@ -165,36 +165,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
diff --git a/integration-tests/mongodb-grouped/.gitignore b/integration-tests/mongodb-grouped/.gitignore
new file mode 100644
index 0000000000..6119608b19
--- /dev/null
+++ b/integration-tests/mongodb-grouped/.gitignore
@@ -0,0 +1,3 @@
+
+# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
+/src/
diff --git a/integration-tests/mongodb-grouped/pom.xml b/integration-tests/mongodb-grouped/pom.xml
index 99fe18ce00..5036ba59de 100644
--- a/integration-tests/mongodb-grouped/pom.xml
+++ b/integration-tests/mongodb-grouped/pom.xml
@@ -76,36 +76,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
diff --git a/tooling/scripts/group-tests.groovy b/tooling/scripts/group-tests.groovy
index 87c2d4ba47..509dc07744 100644
--- a/tooling/scripts/group-tests.groovy
+++ b/tooling/scripts/group-tests.groovy
@@ -34,35 +34,46 @@ import groovy.ant.AntBuilder
final Path sourceDir = Paths.get(properties['group-tests.source.dir'])
final String[] concatRelPaths = properties['group-tests.concat.rel.paths'].split('[\\s,]+')
final Path destinationModuleDir = Paths.get(properties['group-tests.dest.module.dir'])
+final String excludes = properties['group-tests.files.excludes'] ?: ""
final String classNamePrefix = properties['group-tests.class.name.prefix'] ?: ""
+final List<String> fileExcludes = excludes.split('[\\s,]+') as List
/* Property names whose values originating from distinct application.properties files can be concatenated using comma as a separator */
-final Set<String> commaConcatenatePropertyNames = ["quarkus.native.resources.includes", "quarkus.native.resources.excludes"] as Set;
+final Set<String> commaConcatenatePropertyNames = ["quarkus.native.resources.includes", "quarkus.native.resources.excludes"] as Set
final Map<String, ResourceConcatenator> mergedFiles = new HashMap<>()
concatRelPaths.each {relPath -> mergedFiles.put(relPath, new ResourceConcatenator(commaConcatenatePropertyNames)) }
Files.list(sourceDir)
+ .filter(p -> !fileExcludes.contains(p.getFileName().toString()))
.filter { p -> Files.exists(p.resolve('pom.xml')) }
.sorted()
.forEach { p ->
mergedFiles.each { relPath, cat ->
cat.append(p.resolve(relPath))
}
- copyResources(p.resolve('src/main/java'), destinationModuleDir.resolve('target/src/main/java'))
- copyResources(p.resolve('src/test/java'), destinationModuleDir.resolve('target/src/test/java'))
- copyResources(p.resolve('src/main/resources'), destinationModuleDir.resolve('target/classes'))
- copyResources(p.resolve('src/test/resources'), destinationModuleDir.resolve('target/test-classes'))
+ copyResources(p.resolve('src/main/java'), destinationModuleDir.resolve('src/main/java'))
+ copyResources(p.resolve('src/test/java'), destinationModuleDir.resolve('src/test/java'))
+ copyResources(p.resolve('src/main/resources'), destinationModuleDir.resolve('src/main/resources'))
+ copyResources(p.resolve('src/test/resources'), destinationModuleDir.resolve('src/test/resources'))
}
String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
File sourceFile = new File("${scriptDir}/group-test-utils.groovy")
Class groovyClass = new GroovyClassLoader(getClass().getClassLoader()).parseClass(sourceFile)
GroovyObject utils = (GroovyObject) groovyClass.getDeclaredConstructor().newInstance()
-utils.makeTestClassNamesUnique(destinationModuleDir.resolve('target/src/test/java').toFile(), classNamePrefix)
+utils.makeTestClassNamesUnique(destinationModuleDir.resolve('src/test/java').toFile(), classNamePrefix)
+
+Path gitignorePath = destinationModuleDir.resolve('.gitignore')
+String gitignoreContent = ''
+if (Files.isRegularFile(gitignorePath)) {
+ gitignoreContent = gitignorePath.getText('UTF-8')
+}
+if (!gitignoreContent.startsWith('/src/\n') && !gitignoreContent.contains('\n/src/\n')) {
+ Files.write(gitignorePath, (gitignoreContent + '\n# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy\n/src/\n').getBytes('UTF-8'))
+}
mergedFiles.each { relPath, cat ->
- String destRelPath = relPath.replace('src/main/resources/', 'target/classes/').replace('src/test/resources/', 'target/test-classes/')
- Path destPath = destinationModuleDir.resolve(destRelPath)
+ Path destPath = destinationModuleDir.resolve(relPath)
cat.store(destPath)
}