You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2022/06/28 16:07:07 UTC
[servicemix-bundles] branch master updated (e0bb02b85 -> c0376bc80)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
from e0bb02b85 Remove released bundles
new 8c7a7d528 [SM-5186] Improve atlassian-jira-client 5.2.4 bundle wiring
new cb7de27b4 [SM-5188] Create OSGi bundle for google-http-client 1.41.8
new c0376bc80 [SM-5187] Create OSGi bundle for guava 30.1.1
The 3 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:
atlassian-jira-client-5.2.4/pom.xml | 33 ++++++++++--
.../pom.xml | 61 +++++++++++++---------
{htmlunit-2.61.0 => guava-30.1.1}/pom.xml | 33 ++++++------
pom.xml | 3 ++
4 files changed, 83 insertions(+), 47 deletions(-)
copy {zookeeper-3.8.0 => google-http-client-1.41.8}/pom.xml (67%)
copy {htmlunit-2.61.0 => guava-30.1.1}/pom.xml (78%)
[servicemix-bundles] 01/03: [SM-5186] Improve atlassian-jira-client 5.2.4 bundle wiring
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
commit 8c7a7d528f6208c7ebe7e5255f677367cc98f2a2
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Jun 28 18:04:00 2022 +0200
[SM-5186] Improve atlassian-jira-client 5.2.4 bundle wiring
---
atlassian-jira-client-5.2.4/pom.xml | 33 ++++++++++++++++++++++++++++-----
pom.xml | 1 +
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/atlassian-jira-client-5.2.4/pom.xml b/atlassian-jira-client-5.2.4/pom.xml
index 728ac3ee6..1f8130020 100644
--- a/atlassian-jira-client-5.2.4/pom.xml
+++ b/atlassian-jira-client-5.2.4/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -61,11 +61,12 @@
<properties>
<pkgGroupId>com.atlassian.jira</pkgGroupId>
<pkgVersion>5.2.4</pkgVersion>
+ <pkgSourceVersion>5.2.4.1</pkgSourceVersion>
<servicemix.osgi.export>
com.atlassian.jira.rest.client*;version=${pkgVersion},
com.atlassian.httpclient*;version=${pkgVersion},
com.atlassian.event*;version=${pkgVersion},
- com.atlassian.sal*;version=3.0.7,
+ com.atlassian.sal*;version=4.4.2,
io.atlassian.fugue*;version=3.0.0,
io.atlassian.util*,
com.atlassian.fugue*;version=3.0.0
@@ -81,14 +82,29 @@
!io.atlassian.fugue*,
!com.atlassian.fugue*,
!io.atlassian.util*,
- com.google.common*;version="[20,30)",
- org.springframework*;resolition:=optional,
+ !com.google.common*,
+ !com.google.appengine*,
+ !com.google.apphosting*,
+ !com.google.errorprone*,
+ !com.google.thirdparty*,
+ !javax.annotation*,
+ !org.checkerframework*,
+ javax.servlet*;resolution:=optional,
+ org.springframework*;resolution:=optional,
+ net.jcip*;resolution:=optional,
*
</servicemix.osgi.import.pkg>
<servicemix.osgi.private.pkg>
com.atlassian.analytics*,
com.atlassian.inject*,
- com.atlassian.plugin*
+ com.atlassian.plugin*,
+ com.google.common*,
+ com.google.appengine*,
+ com.google.apphosting*,
+ com.google.errorprone*,
+ com.google.thirdparty*,
+ javax.annotation*,
+ org.checkerframework*
</servicemix.osgi.private.pkg>
</properties>
@@ -105,6 +121,13 @@
<version>${pkgVersion}</version>
<optional>false</optional>
</dependency>
+ <dependency>
+ <groupId>com.atlassian.sal</groupId>
+ <artifactId>sal-api</artifactId>
+ <version>4.4.2</version>
+ <type>jar</type>
+ <optional>false</optional>
+ </dependency>
<dependency>
<groupId>io.atlassian.fugue</groupId>
<artifactId>fugue</artifactId>
diff --git a/pom.xml b/pom.xml
index 827baf22a..1010726d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<name>Apache ServiceMix :: Bundles</name>
<modules>
+ <module>atlassian-jira-client-5.2.4</module>
</modules>
</project>
[servicemix-bundles] 03/03: [SM-5187] Create OSGi bundle for guava 30.1.1
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
commit c0376bc809e743fb6016ff7e86ee4b6d43263ab5
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Jun 28 18:06:45 2022 +0200
[SM-5187] Create OSGi bundle for guava 30.1.1
---
guava-30.1.1/pom.xml | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 100 insertions(+)
diff --git a/guava-30.1.1/pom.xml b/guava-30.1.1/pom.xml
new file mode 100644
index 000000000..54a9e8221
--- /dev/null
+++ b/guava-30.1.1/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>15</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.guava</artifactId>
+ <packaging>bundle</packaging>
+ <version>30.1.1_1-SNAPSHOT</version>
+ <name>Apache ServiceMix :: Bundles :: Guava</name>
+ <description>
+ This OSGi bundle wraps guava jar file.
+ </description>
+
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
+ </scm>
+
+ <properties>
+ <pkgGroupId>com.google.guava</pkgGroupId>
+ <pkgArtifactId>guava</pkgArtifactId>
+ <pkgVersion>30.1.1-jre</pkgVersion>
+ <pkgSourceVersion>30.1.1.1</pkgSourceVersion>
+ <servicemix.osgi.export.pkg>
+ com.google
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 666f93c07..a4137f829 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
<modules>
<module>atlassian-jira-client-5.2.4</module>
<module>google-http-client-1.41.8</module>
+ <module>guava-30.1.1</module>
</modules>
</project>
[servicemix-bundles] 02/03: [SM-5188] Create OSGi bundle for google-http-client 1.41.8
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
commit cb7de27b48520672930a8b58bb51def7fe2e4fde
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Jun 28 18:05:59 2022 +0200
[SM-5188] Create OSGi bundle for google-http-client 1.41.8
---
google-http-client-1.41.8/pom.xml | 123 ++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 124 insertions(+)
diff --git a/google-http-client-1.41.8/pom.xml b/google-http-client-1.41.8/pom.xml
new file mode 100644
index 000000000..1c3e1fdcb
--- /dev/null
+++ b/google-http-client-1.41.8/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>15</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.google-http-client</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.41.8_1-SNAPSHOT</version>
+ <name>Apache ServiceMix :: Bundles :: Google HTTP Client</name>
+ <description>
+ This OSGi bundle wraps google-http-client, google-oauth-client, google-http-client-gson jar files.
+ </description>
+
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
+ </scm>
+
+ <properties>
+ <pkgSourceVersion>1.41.8.1</pkgSourceVersion>
+ <servicemix.osgi.export>
+ com.google.api.client.auth.oauth*;version="1.34.0",
+ com.google.api.client.http*;version="1.41.8",
+ com.google.api.client.json*;version="1.41.8",
+ com.google.api.client.util*;version="1.41.8"
+ </servicemix.osgi.export>
+ <servicemix.osgi.import.pkg>
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client</artifactId>
+ <version>1.41.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-gson</artifactId>
+ <version>1.41.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.oauth-client</groupId>
+ <artifactId>google-oauth-client</artifactId>
+ <version>1.34.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.google.http-client:google-http-client</include>
+ <include>com.google.http-client:google-http-client-gson</include>
+ <include>com.google.oauth-client:google-oauth-client</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>com.google.http-client:google-http-client</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>com.google.http-client:google-http-client-gson</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>com.google.oauth-client:google-oauth-client</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 1010726d7..666f93c07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
<modules>
<module>atlassian-jira-client-5.2.4</module>
+ <module>google-http-client-1.41.8</module>
</modules>
</project>