You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2020/02/13 23:16:03 UTC
[camel-quarkus] branch master updated: camel-jira extension:more
polish up
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new a06e266 camel-jira extension:more polish up
new 45d8654 Merge pull request #714 from ffang/issues710
a06e266 is described below
commit a06e266214f435fe29f0d8b013fdb8dff1f652dd
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Feb 13 18:09:07 2020 -0500
camel-jira extension:more polish up
---
.github/workflows/pr-build.yaml | 3 +-
.../component/jira/deployment/JiraProcessor.java | 6 ++
extensions/jira/runtime/pom.xml | 13 ----
extensions/pom.xml | 2 +-
integration-tests/jira/pom.xml | 69 ++++------------------
.../quarkus/component/jira/it/JiraResource.java | 2 -
integration-tests/pom.xml | 2 +-
pom.xml | 14 ++++-
poms/bom/pom.xml | 42 ++++++-------
9 files changed, 54 insertions(+), 99 deletions(-)
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 4a29823..c9fd9ed 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -379,7 +379,8 @@ jobs:
-pl :camel-quarkus-integration-test-stream \
-pl :camel-quarkus-integration-test-tarfile \
-pl :camel-quarkus-integration-test-validator \
- -pl :camel-quarkus-integration-test-zipfile
+ -pl :camel-quarkus-integration-test-zipfile \
+ -pl :camel-quarkus-integration-test-jira
saas:
runs-on: ubuntu-latest
needs: build
diff --git a/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java b/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
index befac44..89be59f 100644
--- a/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
+++ b/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
@@ -17,6 +17,7 @@
package org.apache.camel.quarkus.component.jira.deployment;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
class JiraProcessor {
@@ -24,6 +25,11 @@ class JiraProcessor {
private static final String FEATURE = "camel-jira";
@BuildStep
+ ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
+ return new ExtensionSslNativeSupportBuildItem(FEATURE);
+ }
+
+ @BuildStep
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
diff --git a/extensions/jira/runtime/pom.xml b/extensions/jira/runtime/pom.xml
index 6faa1d9..2be8ea1 100644
--- a/extensions/jira/runtime/pom.xml
+++ b/extensions/jira/runtime/pom.xml
@@ -46,19 +46,6 @@
</dependency>
</dependencies>
</dependencyManagement>
- <repositories>
- <repository>
- <id>atlassian</id>
- <url>https://packages.atlassian.com/maven-external/</url>
- <name>atlassian exteranl repo</name>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
<dependencies>
<dependency>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index d562bf7..2ece525 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -77,6 +77,7 @@
<module>infinispan</module>
<module>jackson</module>
<module>jdbc</module>
+ <module>jira</module>
<module>jsonpath</module>
<module>kafka</module>
<module>kotlin</module>
@@ -89,7 +90,6 @@
<module>netty-http</module>
<module>olingo4</module>
<module>opentracing</module>
- <module>jira</module>
<module>paho</module>
<module>pdf</module>
<module>platform-http</module>
diff --git a/integration-tests/jira/pom.xml b/integration-tests/jira/pom.xml
index 195d96f..c0bcaf5 100644
--- a/integration-tests/jira/pom.xml
+++ b/integration-tests/jira/pom.xml
@@ -31,6 +31,16 @@
<name>Camel Quarkus :: Integration Tests :: Jira</name>
<description>Integration tests for Camel Quarkus Jira extension</description>
+ <properties>
+ <!-- mvnd, a.k.a. Maven Daemon: https://github.com/gnodet/mvnd -->
+ <!-- The following rule tells mvnd to build the listed deployment modules before this module. -->
+ <!-- This is important because mvnd builds modules in parallel by default. The deployment modules are not -->
+ <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. -->
+ <!-- Please update rule whenever you change the dependencies of this module by running -->
+ <!-- mvn process-resources -Pformat from the root directory -->
+ <mvnd.builder.rule>camel-quarkus-direct-deployment,camel-quarkus-jira-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -84,60 +94,6 @@
</plugins>
</build>
- <!--profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <systemProperties>
- <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>native-image</id>
- <goals>
- <goal>native-image</goal>
- </goals>
- <configuration>
- <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
- <cleanupServer>true</cleanupServer>
- <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
- <enableServer>false</enableServer>
- <dumpProxies>false</dumpProxies>
- <graalvmHome>${graalvmHome}</graalvmHome>
- <enableJni>true</enableJni>
- <enableAllSecurityServices>true</enableAllSecurityServices>
- <disableReports>true</disableReports>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles-->
<profiles>
<profile>
<id>native</id>
@@ -181,15 +137,10 @@
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<graalvmHome>${graalvmHome}</graalvmHome>
- <enableJni>true</enableJni>
- <enableAllSecurityServices>true</enableAllSecurityServices>
<disableReports>true</disableReports>
<additionalBuildArgs>
--initialize-at-run-time=com.google.api.client.auth.oauth.OAuthParameters,--allow-incomplete-classpath
</additionalBuildArgs>
- <!--additionalBuildArg>
- -H:ReflectionConfigurationFiles=${project.basedir}/reflection-config.json
- </additionalBuildArg-->
</configuration>
</execution>
</executions>
diff --git a/integration-tests/jira/src/main/java/org/apache/camel/quarkus/component/jira/it/JiraResource.java b/integration-tests/jira/src/main/java/org/apache/camel/quarkus/component/jira/it/JiraResource.java
index 9433680..d0a8fd7 100644
--- a/integration-tests/jira/src/main/java/org/apache/camel/quarkus/component/jira/it/JiraResource.java
+++ b/integration-tests/jira/src/main/java/org/apache/camel/quarkus/component/jira/it/JiraResource.java
@@ -18,7 +18,6 @@ package org.apache.camel.quarkus.component.jira.it;
import java.net.URI;
-import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
@@ -34,7 +33,6 @@ import org.apache.camel.ProducerTemplate;
import org.jboss.logging.Logger;
@Path("/jira")
-@ApplicationScoped
public class JiraResource {
private static final Logger log = Logger.getLogger(JiraResource.class);
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index d7ac29e..0fba9c4 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -188,6 +188,7 @@
<module>infinispan</module>
<module>jackson</module>
<module>jdbc</module>
+ <module>jira</module>
<module>jsonpath</module>
<module>kafka</module>
<module>mail</module>
@@ -197,7 +198,6 @@
<module>olingo4</module>
<module>opentracing</module>
<module>paho</module>
- <module>jira</module>
<module>pdf</module>
<module>platform-http</module>
<module>platform-http-engine</module>
diff --git a/pom.xml b/pom.xml
index 5951b84..7659111 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<ahc.version>2.10.4</ahc.version>
<camel.version>3.0.1</camel.version>
- <jira.guava.version>20.0</jira.guava.version>
+ <guava.version>26.0-jre</guava.version>
<hapi.version>4.1.0</hapi.version>
<quarkus.version>1.3.0.Alpha1</quarkus.version>
<httpmime.version>4.1.3</httpmime.version>
@@ -175,6 +175,18 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <!--for com.atlassian.jira-->
+ <id>atlassian</id>
+ <url>https://packages.atlassian.com/maven-external/</url>
+ <name>atlassian exteranl repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index f994141..01ae072 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -143,16 +143,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jira</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${jira.guava.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-base</artifactId>
<version>${camel.version}</version>
</dependency>
@@ -315,6 +305,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-jira</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jsonpath</artifactId>
<version>${camel.version}</version>
</dependency>
@@ -737,6 +732,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-jira</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-jsonpath</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
@@ -980,12 +980,7 @@
<artifactId>camel-quarkus-zipfile</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jira</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+
<!--$ Other third party dependencies $-->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
@@ -993,6 +988,11 @@
<version>${hapi.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.orbitz.consul</groupId>
<artifactId>consul-client</artifactId>
<version>${consul-client.version}</version>
@@ -1013,6 +1013,11 @@
<version>${xstream.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ <version>${httpclient.cache.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.asynchttpclient</groupId>
<artifactId>async-http-client</artifactId>
<version>${ahc.version}</version>
@@ -1073,11 +1078,6 @@
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- <version>${httpclient.cache.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>