You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/20 11:20:30 UTC
[camel] branch main updated (a708a32528a -> 30572eef451)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from a708a32528a CAMEL-19629: Remove camel-weka CAMEL-19630: Remove camel-hyperledge
new 6cd0b7467f6 CAMEL-19628: Move atlassian maven repository to camel-jira where its only in use
new 30572eef451 CAMEL-19628: Move atlassian maven repository to camel-jira where its only in use
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resources/org/apache/camel/catalog/others.properties | 2 ++
.../org/apache/camel/catalog/others}/componentdsl.json | 0
.../org/apache/camel/catalog/others}/endpointdsl.json | 0
components/camel-jira/pom.xml | 14 ++++++++++++++
components/camel-jira/src/main/docs/jira-component.adoc | 10 ++++++++++
docs/pom.xml | 14 ++++++++++++++
dsl/camel-endpointdsl/pom.xml | 14 ++++++++++++++
parent/pom.xml | 2 +-
pom.xml | 12 ------------
9 files changed, 55 insertions(+), 13 deletions(-)
copy {dsl/camel-componentdsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/componentdsl.json (100%)
copy {dsl/camel-endpointdsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/endpointdsl.json (100%)
[camel] 02/02: CAMEL-19628: Move atlassian maven repository to camel-jira where its only in use
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 30572eef4510d0cc9bb7d32dc4bd102eca008555
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 20 12:46:26 2023 +0200
CAMEL-19628: Move atlassian maven repository to camel-jira where its only in use
---
.../resources/org/apache/camel/catalog/others.properties | 2 ++
.../org/apache/camel/catalog/others/componentdsl.json | 15 +++++++++++++++
.../org/apache/camel/catalog/others/endpointdsl.json | 15 +++++++++++++++
components/camel-jira/src/main/docs/jira-component.adoc | 10 ++++++++++
docs/pom.xml | 14 ++++++++++++++
parent/pom.xml | 2 +-
6 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 44a4cb357db..19f74621977 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -4,11 +4,13 @@ cli-connector
cloud
cloudevents
cluster
+componentdsl
console
csimple-joor
debug
dsl-modeline
elytron
+endpointdsl
groovy-dsl
headersmap
health
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
new file mode 100644
index 00000000000..3799e772735
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "componentdsl",
+ "title": "Java Component DSL",
+ "description": "The Camel Component DSL",
+ "deprecated": false,
+ "firstVersion": "3.1.0",
+ "label": "dsl",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-componentdsl",
+ "version": "4.0.0-SNAPSHOT"
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
new file mode 100644
index 00000000000..cea1951ad69
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "endpointdsl",
+ "title": "Java Endpoint DSL",
+ "description": "The Camel Endpoint DSL",
+ "deprecated": false,
+ "firstVersion": "3.0.0",
+ "label": "dsl",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-endpointdsl",
+ "version": "4.0.0-SNAPSHOT"
+ }
+}
diff --git a/components/camel-jira/src/main/docs/jira-component.adoc b/components/camel-jira/src/main/docs/jira-component.adoc
index c8a03f8a134..3fdb7b15cad 100644
--- a/components/camel-jira/src/main/docs/jira-component.adoc
+++ b/components/camel-jira/src/main/docs/jira-component.adoc
@@ -42,6 +42,16 @@ for this component:
</dependency>
---------------------------------------
+[NOTE]
+====
+Atlassian does not release their JIRA Java client's to Maven Central.
+Therefore, when using `camel-jira` then the `pom.xml` has included Maven repository
+to the following URL: `https://packages.atlassian.com/maven-external`.
+
+Just keep this in mind as Maven will then use this repository to download the JIRA client (and potentially other JARs).
+Which allows Atlassian to track these downloads by their servers.
+====
+
== URI format
-------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 3794f53ce83..1db08577a5f 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -35,6 +35,20 @@
<skipOnUnsupported>true</skipOnUnsupported>
</properties>
+ <repositories>
+ <repository>
+ <id>atlassian-public</id>
+ <url>https://packages.atlassian.com/maven-external</url>
+ <name>Atlassian Public Repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9d8dd3d1d4c..b33d0300326 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,7 +346,7 @@
<minidns-version>0.3.4</minidns-version>
<minimal-json-version>0.9.5</minimal-json-version>
<minio-version>8.5.4</minio-version>
- <mock-javamail-version>2.0</mock-javamail-version>
+ <mock-javamail-version>1.9</mock-javamail-version>
<mockwebserver-version>0.2.2</mockwebserver-version>
<mockito-version>3.12.4</mockito-version>
<mongo-java-driver-version>4.10.2</mongo-java-driver-version>
[camel] 01/02: CAMEL-19628: Move atlassian maven repository to camel-jira where its only in use
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6cd0b7467f6e958893d3d6ab87145d3e24d9f2fc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 20 12:32:07 2023 +0200
CAMEL-19628: Move atlassian maven repository to camel-jira where its only in use
---
components/camel-jira/pom.xml | 14 ++++++++++++++
dsl/camel-endpointdsl/pom.xml | 14 ++++++++++++++
pom.xml | 12 ------------
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index cf274253c45..570a8f106cb 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -31,6 +31,20 @@
<packaging>jar</packaging>
<name>Camel :: JIRA</name>
+ <repositories>
+ <repository>
+ <id>atlassian-public</id>
+ <url>https://packages.atlassian.com/maven-external</url>
+ <name>Atlassian Public Repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index a424875e5d6..24d9198769a 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -38,6 +38,20 @@
<label>dsl</label>
</properties>
+ <repositories>
+ <repository>
+ <id>atlassian-public</id>
+ <url>https://packages.atlassian.com/maven-external</url>
+ <name>Atlassian Public Repo</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 88e499a72fe..1d15dd8fa01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,18 +158,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- camel-jira -->
- <repository>
- <id>atlassian-public</id>
- <url>https://packages.atlassian.com/maven-external</url>
- <name>Atlassian Public Repo</name>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
<build>