Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
stataru8 committed Jan 9, 2025
2 parents d3bc0e7 + 9c3952f commit 139aa33
Show file tree
Hide file tree
Showing 412 changed files with 3,852 additions and 4,379 deletions.
6 changes: 3 additions & 3 deletions avro-1.11.3/pom.xml → avro-1.11.4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.avro</artifactId>
<version>1.11.3_2-SNAPSHOT</version>
<version>1.11.4_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
Expand All @@ -45,8 +45,8 @@
<properties>
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
<pkgVersion>1.11.3</pkgVersion>
<servicemix.osgi.source.version>1.11.3.1</servicemix.osgi.source.version>
<pkgVersion>1.11.4</pkgVersion>
<servicemix.osgi.source.version>1.11.4.1</servicemix.osgi.source.version>
<servicemix.osgi.export>
!org.apache.avro.ipc;version="${project.version}",
org.apache.avro*;version="${project.version}";-noimport:=true;-split-package:=merge-first
Expand Down
120 changes: 120 additions & 0 deletions avro-1.12.0/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?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>16</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.avro</artifactId>
<version>1.12.0_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} 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>
<tag>HEAD</tag>
</scm>

<properties>
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
<pkgVersion>1.12.0</pkgVersion>
<servicemix.osgi.source.version>1.12.0.1</servicemix.osgi.source.version>
<servicemix.osgi.export>
!org.apache.avro.ipc;version="${project.version}",
org.apache.avro*;version="${project.version}";-noimport:=true;-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
javax.annotation,
com.thoughtworks.paranamer;version="[2.3,3)",
org.apache.commons.compress*,
org.codehaus.jackson*;version="[2,3)",
org.slf4j;resolution:=optional,
org.joda.time;resolution:=optional,
org.xerial.snappy;version="[1.0,2)";resolution:=optional,
sun.misc;resolution:=optional
</servicemix.osgi.import.pkg>
<servicemix.osgi.private.pkg>
avro.shaded*
</servicemix.osgi.private.pkg>
</properties>

<dependencies>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<optional>false</optional>
</dependency>

<!-- sources -->
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<classifier>sources</classifier>
<optional>false</optional>
</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>
6 changes: 3 additions & 3 deletions avro-ipc-1.11.3/pom.xml → avro-ipc-1.11.4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.avro-ipc</artifactId>
<version>1.11.3_2-SNAPSHOT</version>
<version>1.11.4_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
Expand All @@ -45,8 +45,8 @@
<properties>
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro-ipc</pkgArtifactId>
<pkgVersion>1.11.3</pkgVersion>
<servicemix.osgi.source.version>1.11.3.1</servicemix.osgi.source.version>
<pkgVersion>1.11.4</pkgVersion>
<servicemix.osgi.source.version>1.11.4.1</servicemix.osgi.source.version>
<servicemix.osgi.export>
org.apache.avro.ipc*;version="${project.version}";-noimport:=true;-split-package:=merge-first
</servicemix.osgi.export>
Expand Down
11 changes: 11 additions & 0 deletions avro-ipc-1.11.4/src/main/resources/OSGI-INF/bundle.info
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
\u001B[1mSYNOPSIS\u001B[0m
${project.description}

Original Maven URL:
\u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}-core/${pkgVersion}\u001B[0m

\u001B[1mDESCRIPTION\u001B[0m
Apache Avro™ is a data serialization system.

\u001B[1mSEE ALSO\u001B[0m
\u001B[36mhttp://avro.apache.org\u001B[0m
115 changes: 115 additions & 0 deletions avro-ipc-1.12.0/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?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>16</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.avro-ipc</artifactId>
<version>1.12.0_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} 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>
<tag>HEAD</tag>
</scm>

<properties>
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro-ipc</pkgArtifactId>
<pkgVersion>1.12.0</pkgVersion>
<servicemix.osgi.source.version>1.12.0.1</servicemix.osgi.source.version>
<servicemix.osgi.export>
org.apache.avro.ipc*;version="${project.version}";-noimport:=true;-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
javax.security*,
org.apache.avro*;version="[1.7,2)",
javax.servlet*;resolution:=optional,
org.apache.velocity*;resolution:=optional,
org.jboss.netty*;resolution:=optional,
org.mortbay*;resolution:=optional,
org.slf4j;resolution:=optional
</servicemix.osgi.import.pkg>
</properties>

<dependencies>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<optional>false</optional>
</dependency>

<!-- sources -->
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<classifier>sources</classifier>
<optional>false</optional>
</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>
11 changes: 11 additions & 0 deletions avro-ipc-1.12.0/src/main/resources/OSGI-INF/bundle.info
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
\u001B[1mSYNOPSIS\u001B[0m
${project.description}

Original Maven URL:
\u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}-core/${pkgVersion}\u001B[0m

\u001B[1mDESCRIPTION\u001B[0m
Apache Avro™ is a data serialization system.

\u001B[1mSEE ALSO\u001B[0m
\u001B[36mhttp://avro.apache.org\u001B[0m
6 changes: 3 additions & 3 deletions aws-java-sdk-2.24.4/pom.xml → aws-java-sdk-2.29.6/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.aws-java-sdk2</artifactId>
<packaging>bundle</packaging>
<version>2.24.4_2-SNAPSHOT</version>
<version>2.29.6_2-SNAPSHOT</version>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>

Expand All @@ -45,8 +45,8 @@
<properties>
<pkgGroupId>software.amazon.awssdk</pkgGroupId>
<pkgArtifactId>aws-sdk-java</pkgArtifactId>
<pkgVersion>2.24.4</pkgVersion>
<servicemix.osgi.source.version>2.24.4.1</servicemix.osgi.source.version>
<pkgVersion>2.29.6</pkgVersion>
<servicemix.osgi.source.version>2.29.6.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
software.amazon.awssdk*
</servicemix.osgi.export.pkg>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.braintree-java</artifactId>
<version>3.32.0_2-SNAPSHOT</version>
<version>3.36.0_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
Expand All @@ -45,8 +45,8 @@
<properties>
<pkgGroupId>com.braintreepayments.gateway</pkgGroupId>
<pkgArtifactId>braintree-java</pkgArtifactId>
<pkgVersion>3.32.0</pkgVersion>
<servicemix.osgi.source.version>3.32.0.1</servicemix.osgi.source.version>
<pkgVersion>3.36.0</pkgVersion>
<servicemix.osgi.source.version>3.36.0.1</servicemix.osgi.source.version>
<servicemix.osgi.export>
com.braintreegateway;version=${pkgVersion};-split-package:=merge-first,
com.braintreegateway.exceptions;version=${pkgVersion};-split-package:=merge-first,
Expand Down
7 changes: 4 additions & 3 deletions c3p0-0.9.5.5/pom.xml → c3p0-0.10.1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
<version>14</version>
<version>16</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.c3p0</artifactId>
<version>0.9.5.5_2-SNAPSHOT</version>
<version>0.10.1_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
Expand All @@ -45,7 +45,8 @@
<properties>
<pkgGroupId>com.mchange</pkgGroupId>
<pkgArtifactId>c3p0</pkgArtifactId>
<pkgVersion>0.9.5.5</pkgVersion>
<pkgVersion>0.10.1</pkgVersion>
<servicemix.osgi.source.version>0.10.1.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
com.mchange
</servicemix.osgi.export.pkg>
Expand Down
8 changes: 4 additions & 4 deletions derby-10.16.1.1/pom.xml → derby-10.17.1.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
<version>15</version>
<version>16</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.derby</artifactId>
<version>10.16.1.1_2-SNAPSHOT</version>
<version>10.17.1.0_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: derby</name>
<description>This OSGi bundle wraps derby, derbyclient, and derbynet ${pkgVersion} jar files.</description>
Expand All @@ -44,8 +44,8 @@

<properties>
<pkgGroupId>org.apache.derby</pkgGroupId>
<pkgVersion>10.16.1.1</pkgVersion>
<servicemix.osgi.source.version>10.16.1.1.1</servicemix.osgi.source.version>
<pkgVersion>10.17.1.0</pkgVersion>
<servicemix.osgi.source.version>10.17.1.0.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
org.apache.derby
</servicemix.osgi.export.pkg>
Expand Down
Loading

0 comments on commit 139aa33

Please sign in to comment.