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
coheigea authored Apr 8, 2024
2 parents 44d9a8f + 0211c7d commit d3bc0e7
Show file tree
Hide file tree
Showing 820 changed files with 32,072 additions and 7,657 deletions.
7 changes: 4 additions & 3 deletions ant-1.10.5/pom.xml → ant-1.10.13/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
<version>13</version>
<version>15</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ant</artifactId>
<packaging>bundle</packaging>
<version>1.10.5_2-SNAPSHOT</version>
<version>1.10.13_2-SNAPSHOT</version>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ant and ant-launcher ${pkgVersion} jar files.</description>

Expand All @@ -45,7 +45,8 @@
<properties>
<pkgGroupId>org.apache.ant</pkgGroupId>
<pkgArtifactId>ant</pkgArtifactId>
<pkgVersion>1.10.5</pkgVersion>
<pkgVersion>1.10.13</pkgVersion>
<servicemix.osgi.source.version>1.10.13.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
org.apache.tools
</servicemix.osgi.export.pkg>
Expand Down
8 changes: 5 additions & 3 deletions antisamy-1.5.8/pom.xml → antisamy-1.7.5/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.antisamy</artifactId>
<version>1.5.8_1-SNAPSHOT</version>
<version>1.7.5_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
Expand All @@ -39,12 +39,14 @@
<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.owasp.antisamy</pkgGroupId>
<pkgArtifactId>antisamy</pkgArtifactId>
<pkgVersion>1.5.8</pkgVersion>
<pkgVersion>1.7.5</pkgVersion>
<servicemix.osgi.source.version>1.7.5.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
org.owasp.validator
</servicemix.osgi.export.pkg>
Expand Down
13 changes: 10 additions & 3 deletions antlr-3.5.2/pom.xml → antlr-3.5.3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,28 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
<version>11</version>
<version>14</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.antlr</artifactId>
<version>3.5.2_2-SNAPSHOT</version>
<version>3.5.3_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.antlr</pkgGroupId>
<pkgArtifactId>antlr</pkgArtifactId>
<pkgVersion>3.5.2</pkgVersion>
<pkgVersion>3.5.3</pkgVersion>
<servicemix.osgi.export>
!org.antlr.stringtemplate*,
org.antlr*;version=${pkgVersion};-split-package:=merge-first,
Expand Down
99 changes: 0 additions & 99 deletions antlr-runtime-3.5.2/pom.xml

This file was deleted.

106 changes: 106 additions & 0 deletions antlr-runtime-3.5.3/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?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>14</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.antlr-runtime</artifactId>
<version>3.5.3_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.antlr</pkgGroupId>
<pkgArtifactId>antlr-runtime</pkgArtifactId>
<pkgVersion>3.5.3</pkgVersion>
<servicemix.osgi.export.pkg>
org.antlr.runtime
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
org.antlr.stringtemplate*;resolution:=optional
</servicemix.osgi.import.pkg>
</properties>

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

<!-- sources -->
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<classifier>sources</classifier>
</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>
20 changes: 10 additions & 10 deletions commons-collections-3.2.1/pom.xml → any23-2.7/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>13</version>
<version>14</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>

<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
<version>3.2.1_4-SNAPSHOT</version>
<artifactId>org.apache.servicemix.bundles.any23</artifactId>
<version>2.7_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
Expand All @@ -39,17 +39,18 @@
<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>
<tag>HEAD</tag>
</scm>

<properties>
<pkgGroupId>commons-collections</pkgGroupId>
<pkgArtifactId>commons-collections</pkgArtifactId>
<pkgVersion>3.2.1</pkgVersion>
<pkgGroupId>org.apache.any23</pkgGroupId>
<pkgArtifactId>apache-any23-core</pkgArtifactId>
<pkgVersion>2.7</pkgVersion>
<servicemix.osgi.export.pkg>
org.apache.commons.collections
org.apache.any23
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>

*
</servicemix.osgi.import.pkg>
</properties>

Expand Down Expand Up @@ -104,5 +105,4 @@
</plugin>
</plugins>
</build>

</project>
11 changes: 11 additions & 0 deletions any23-2.7/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}/${pkgVersion}\u001B[0m

\u001B[1mDESCRIPTION\u001B[0m
Anything To Triples (any23) is a library, a web service and a command line tool that extracts structured data in RDF format from a variety of Web documents

\u001B[1mSEE ALSO\u001B[0m
\u001B[36mhttps://any23.apache.org/\u001B[0m
12 changes: 7 additions & 5 deletions aspectj-1.9.3/pom.xml → aspectj-1.9.21.1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,32 @@
<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.aspectj</artifactId>
<packaging>bundle</packaging>
<version>1.9.3_1-SNAPSHOT</version>
<version>1.9.21.1_2-SNAPSHOT</version>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps aspectjrt and aspectjweaver ${pkgVersion} 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>
<tag>HEAD</tag>
</scm>

<properties>
<pkgGroupId>org.aspectj</pkgGroupId>
<pkgArtifactId>aspectj</pkgArtifactId>
<pkgVersion>1.9.3</pkgVersion>
<pkgVersion>1.9.21.1</pkgVersion>
<servicemix.osgi.source.version>1.9.21.1.1</servicemix.osgi.source.version>
<servicemix.osgi.export>
org.aspectj*;version=1.9.3;-split-package:=merge-first,
aj*;version=1.9.3
org.aspectj*;version=1.9.21.1;-split-package:=merge-first,
aj*;version=1.9.21.1
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
javax.xml*,
Expand Down
Loading

0 comments on commit d3bc0e7

Please sign in to comment.