!1 package init

Merge pull request !1 from 快乐的一只小青蛙/br_pi

0001-Generate-different-Bundle-SymbolicName-for-different.patch

@@ -0,0 +1,99 @@
+From d71aa7acc93b944b159ac63f85d9ba1a566f5a8d Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 29 Jul 2014 09:00:03 +0200
+Subject: [PATCH 1/2] Generate different Bundle-SymbolicName for different JARs
+
+---
+ pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index cdad31c..5707595 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -179,6 +179,52 @@ under the License.
+   <build>
+     <plugins>
+ 
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>tests-bundle-manifest</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>manifest</goal>
++            </goals>
++            <configuration>
++              <manifestLocation>${project.build.directory}/osgi-tests</manifestLocation>
++              <instructions>
++                <Bundle-SymbolicName>${commons.osgi.symbolicName}.tests</Bundle-SymbolicName>
++              </instructions>
++            </configuration>
++          </execution>
++          <execution>
++            <id>api-bundle-manifest</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>manifest</goal>
++            </goals>
++            <configuration>
++              <manifestLocation>${project.build.directory}/osgi-api</manifestLocation>
++              <instructions>
++                <Bundle-SymbolicName>${commons.osgi.symbolicName}.api</Bundle-SymbolicName>
++              </instructions>
++            </configuration>
++          </execution>
++          <execution>
++            <id>adapters-bundle-manifest</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>manifest</goal>
++            </goals>
++            <configuration>
++              <manifestLocation>${project.build.directory}/osgi-adapters</manifestLocation>
++              <instructions>
++                <Bundle-SymbolicName>${commons.osgi.symbolicName}.adapters</Bundle-SymbolicName>
++              </instructions>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++
+       <!--
+         - We want to create four jarfiles from this project: normal, tests, api
+         - and adapters. The first two are handled by the normal jar:jar and
+@@ -202,6 +248,9 @@ under the License.
+             </goals>
+             <configuration>
+               <jarName>commons-logging</jarName>
++              <archive>
++                <manifestFile>${project.build.directory}/osgi-tests/MANIFEST.MF</manifestFile>
++              </archive>
+             </configuration>
+           </execution>
+ 
+@@ -213,6 +262,9 @@ under the License.
+             </goals>
+             <configuration>
+               <jarName>${project.artifactId}-api-${project.version}</jarName>
++              <archive>
++                <manifestFile>${project.build.directory}/osgi-api/MANIFEST.MF</manifestFile>
++              </archive>
+               <includes>
+                 <include>org/apache/commons/logging/*.class</include>
+                 <include>org/apache/commons/logging/impl/LogFactoryImpl*.class</include>
+@@ -237,6 +289,9 @@ under the License.
+             </goals>
+             <configuration>
+               <jarName>${project.artifactId}-adapters-${project.version}</jarName>
++              <archive>
++                <manifestFile>${project.build.directory}/osgi-adapters/MANIFEST.MF</manifestFile>
++              </archive>
+               <includes>
+                 <include>org/apache/commons/logging/impl/**.class</include>
+                 <include>META-INF/LICENSE.txt</include>
+-- 
+2.5.5
+

0002-Port-to-maven-jar-plugin-3.0.0.patch

@@ -0,0 +1,160 @@
+From d8356a58efde0808cabede14b4f1b2473fa73170 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 31 May 2016 10:52:12 +0200
+Subject: [PATCH 2/2] Port to maven-jar-plugin 3.0.0
+
+---
+ pom.xml                                            | 47 +++++-----------------
+ .../logging/pathable/ChildFirstTestCase.java       |  8 ++--
+ .../logging/pathable/ParentFirstTestCase.java      |  8 ++--
+ 3 files changed, 17 insertions(+), 46 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 5707595..c5d8d37 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -237,6 +237,10 @@ under the License.
+         <artifactId>maven-jar-plugin</artifactId>
+         <executions>
+           <execution>
++	    <id>default-jar</id>
++	    <phase>skip</phase>
++	  </execution>
++	  <execution>
+             <!--
+               - The custom test framework requires the unit test code to be
+               - in a jarfile so it can control its place in the classpath.
+@@ -261,7 +265,7 @@ under the License.
+               <goal>jar</goal>
+             </goals>
+             <configuration>
+-              <jarName>${project.artifactId}-api-${project.version}</jarName>
++              <classifier>api</classifier>
+               <archive>
+                 <manifestFile>${project.build.directory}/osgi-api/MANIFEST.MF</manifestFile>
+               </archive>
+@@ -288,7 +292,7 @@ under the License.
+               <goal>jar</goal>
+             </goals>
+             <configuration>
+-              <jarName>${project.artifactId}-adapters-${project.version}</jarName>
++              <classifier>adapters</classifier>
+               <archive>
+                 <manifestFile>${project.build.directory}/osgi-adapters/MANIFEST.MF</manifestFile>
+               </archive>
+@@ -346,39 +350,6 @@ under the License.
+ 
+       <plugin>
+         <!--
+-          - Attach the adapters and api jars to the normal artifact. This way
+-          - they will be deployed when the normal artifact is deployed.
+-          -->
+-        <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>build-helper-maven-plugin</artifactId>
+-        <version>1.0</version>
+-        <executions>
+-          <execution>
+-            <id>attach-artifacts</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>attach-artifact</goal>
+-            </goals>
+-            <configuration>
+-              <artifacts>
+-                <artifact>
+-                  <file>${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar</file>
+-                  <type>jar</type>
+-                  <classifier>adapters</classifier>
+-                </artifact>
+-                <artifact>
+-                  <file>${project.build.directory}/${project.artifactId}-api-${project.version}.jar</file>
+-                  <type>jar</type>
+-                  <classifier>api</classifier>
+-                </artifact>
+-              </artifacts>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-
+-      <plugin>
+-        <!--
+           - Many of JCL's tests use tricky techniques to place the generated
+           - JCL jarfiles on the classpath in various configurations. This means
+           - that those tests must be run *after* the "package" build phase.
+@@ -442,9 +413,9 @@ under the License.
+                   <logkit>${logkit:logkit:jar}</logkit>
+                   <servlet-api>${javax.servlet:servlet-api:jar}</servlet-api>
+                   <commons-logging>target/${project.build.finalName}.jar</commons-logging>
+-                  <commons-logging-api>target/${project.artifactId}-api-${project.version}.jar</commons-logging-api>
+-                  <commons-logging-adapters>target/${project.artifactId}-adapters-${project.version}.jar</commons-logging-adapters>
+-                  <testclasses>target/commons-logging-tests.jar</testclasses>
++                  <commons-logging-api>target/${project.artifactId}-${project.version}-api.jar</commons-logging-api>
++                  <commons-logging-adapters>target/${project.artifactId}-${project.version}-adapters.jar</commons-logging-adapters>
++                  <testclasses>target/commons-logging-${project.version}-tests.jar</testclasses>
+               </systemPropertyVariables>
+             </configuration>
+           </execution>
+diff --git a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
+index 1aeb12d..eb67ec1 100644
+--- a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
++++ b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
+@@ -213,11 +213,11 @@ public class ChildFirstTestCase extends TestCase {
+         // getResource where it is accessable to both classloaders. The one visible
+         // to the child should be returned. The URL returned will be of form
+         //  jar:file:/x/y.jar!path/to/resource. The filename part should include the jarname
+-        // of form commons-logging-adapters-nnnn.jar, not commons-logging-nnnn.jar
++        // of form commons-logging-nnnn-adapters.jar, not commons-logging-nnnn.jar
+         resource = childLoader.getResource("org/apache/commons/logging/impl/Log4JLogger.class");
+         assertNotNull("Unable to locate Log4JLogger.class resource", resource);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                resource.toString().indexOf("/commons-logging-adapters-1.") > 0);
++                resource.toString().indexOf("/commons-logging-1.2-adapters.jar!") > 0);
+     }
+ 
+     /**
+@@ -269,9 +269,9 @@ public class ChildFirstTestCase extends TestCase {
+         urlsToStrings[1] = urls[1].toString();
+         Arrays.sort(urlsToStrings);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[0].indexOf("/commons-logging-1.") > 0);
++                urlsToStrings[0].indexOf("/commons-logging-1.2-adapters.jar!") > 0);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[1].indexOf("/commons-logging-adapters-1.") > 0);
++                urlsToStrings[1].indexOf("/commons-logging-1.2.jar!") > 0);
+     }
+ 
+     /**
+diff --git a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
+index f9bf452..fc10c8e 100644
+--- a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
++++ b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
+@@ -210,11 +210,11 @@ public class ParentFirstTestCase extends TestCase {
+         // getResource where it is accessable to both classloaders. The one visible
+         // to the parent should be returned. The URL returned will be of form
+         //  jar:file:/x/y.jar!path/to/resource. The filename part should include the jarname
+-        // of form commons-logging-nnnn.jar, not commons-logging-adapters-nnnn.jar
++        // of form commons-logging-nnnn.jar, not commons-logging-nnnn-adapters.jar
+         resource = childLoader.getResource("org/apache/commons/logging/impl/Log4JLogger.class");
+         assertNotNull("Unable to locate Log4JLogger.class resource", resource);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                resource.toString().indexOf("/commons-logging-1.") > 0);
++                resource.toString().indexOf("/commons-logging-1.2.jar!") > 0);
+     }
+     
+     /**
+@@ -259,9 +259,9 @@ public class ParentFirstTestCase extends TestCase {
+         urlsToStrings[1] = urls[1].toString();
+         Arrays.sort(urlsToStrings);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[0].indexOf("/commons-logging-1.") > 0);
++                urlsToStrings[0].indexOf("/commons-logging-1.2-adapters.jar!") > 0);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[1].indexOf("/commons-logging-adapters-1.") > 0);
++                urlsToStrings[1].indexOf("/commons-logging-1.2.jar!") > 0);
+         
+     }
+ 
+-- 
+2.5.5
+

apache-commons-logging.spec

@@ -0,0 +1,78 @@
+%bcond_without  avalon
+Name:           apache-commons-logging
+Version:        1.2
+Release:        17
+Summary:        Apache Commons Logging
+License:        ASL 2.0
+URL:            http://commons.apache.org/logging
+BuildArch:      noarch
+
+Source0:        http://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz
+Source1:        https://repo1.maven.org/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom
+
+Patch0000:      0001-Generate-different-Bundle-SymbolicName-for-different.patch
+Patch0001:      0002-Port-to-maven-jar-plugin-3.0.0.patch
+
+%if %{with avalon}
+BuildRequires:  mvn(avalon-framework:avalon-framework-api)
+BuildRequires:  mvn(avalon-framework:avalon-framework-impl)
+BuildRequires:  mvn(logkit:logkit)
+%endif
+BuildRequires:  mvn(javax.servlet:servlet-api) mvn(junit:junit) mvn(log4j:log4j:12) maven-local
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:) mvn(org.apache.maven.plugins:maven-failsafe-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin) mvn(org.codehaus.mojo:build-helper-maven-plugin)
+
+%description
+The commons-logging package provides a simple, component-oriented interface
+ (org.apache.commons.logging.Log) and a wrapper for the logging system. The
+user can choose which system to use. A few basic implementations are also
+provided to allow users to use the package independently.
+commons-logging was heavily influenced by Avalon's Logkit and Log4J. The
+commons-logging abstraction is meant to minimize the differences between
+the two, and to allow a developer to not tie himself to a particular
+logging implementation.
+
+%{?javadoc_package}
+
+%prep
+%autosetup  -n commons-logging-%{version}-src -p1
+
+%if %{with avalon}
+%pom_remove_dep :avalon-framework
+%pom_add_dep avalon-framework:avalon-framework-api:4.3:provided
+%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
+%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
+
+%else
+%pom_remove_dep -r :avalon-framework
+%pom_remove_dep -r :logkit
+rm -r src/test/java/org/apache/commons/logging/{avalon,logkit}
+rm src/main/java/org/apache/commons/logging/impl/{AvalonLogger.java,LogKitLogger.java}
+%endif
+
+%pom_remove_plugin :cobertura-maven-plugin
+%pom_remove_plugin :maven-scm-publish-plugin
+
+sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
+
+%mvn_file ":commons-logging{*}" "commons-logging@1" "%{name}@1"
+%mvn_alias ":commons-logging{*}" "org.apache.commons:commons-logging@1" "apache:commons-logging@1"
+
+rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
+
+%build
+%mvn_build
+
+%mvn_artifact %{SOURCE1} target/commons-logging-%{version}-api.jar
+%mvn_artifact commons-logging:commons-logging-adapters:%{version} target/commons-logging-%{version}-adapters.jar
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc PROPOSAL.html RELEASE-NOTES.txt
+
+%changelog
+* Tue Jan 21 2020 Jiangping Hu <hujp1985@foxmail.com> - 1.2-17
+- Package init

commons-logging-api-1.1.pom

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-logging</groupId>
+  <artifactId>commons-logging-api</artifactId>
+  <name>Logging</name>
+  <version>1.1</version>
+  <description>Commons Logging is a thin adapter allowing configurable bridging to other,
+    well known logging systems.</description>
+  <url>http://jakarta.apache.org/commons/logging/</url>
+  <issueManagement>
+    <url>http://issues.apache.org/jira/browse/LOGGING</url>
+  </issueManagement>
+  <ciManagement>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>commons-dev@jakarta.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <inceptionYear>2001</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>Commons Dev List</name>
+      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Commons User List</name>
+      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>morgand</id>
+      <name>Morgan Delagrange</name>
+      <email>morgand at apache dot org</email>
+      <organization>Apache</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rwaldhoff</id>
+      <name>Rodney Waldhoff</name>
+      <email>rwaldhoff at apache org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>craigmcc</id>
+      <name>Craig McClanahan</name>
+      <email>craigmcc at apache org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>sanders</id>
+      <name>Scott Sanders</name>
+      <email>sanders at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>rdonkin</id>
+      <name>Robert Burrell Donkin</name>
+      <email>rdonkin at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>donaldp</id>
+      <name>Peter Donald</name>
+      <email>donaldp at apache dot org</email>
+      <organization></organization>
+    </developer>
+    <developer>
+      <id>costin</id>
+      <name>Costin Manolache</name>
+      <email>costin at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>rsitze</id>
+      <name>Richard Sitze</name>
+      <email>rsitze at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>baliuka</id>
+      <name>Juozas Baliuka</name>
+      <email>baliuka@apache.org</email>
+      <organization></organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>skitching</id>
+      <name>Simon Kitching</name>
+      <email>skitching@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>dennisl</id>
+      <name>Dennis Lundberg</name>
+      <email>dennisl@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>bstansberry</id>
+      <name>Brian Stansberry</name>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>/LICENSE.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</connection>
+    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</url>
+  </scm>
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://jakarta.apache.org</url>
+  </organization>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-xdoc-plugin</artifactId>
+        <version>1.9.2</version>
+        <configuration>
+          <optional>true</optional>
+          <comment>&lt;strong>Site Only&lt;/strong> - v1.9.2 (minimum)</comment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>default</id>
+      <name>Default Repository</name>
+      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url>
+    </repository>
+    <site>
+      <id>default</id>
+      <name>Default Site</name>
+      <url>scp://people.apache.org//www/jakarta.apache.org/commons/logging/</url>
+    </site>
+    <status>converted</status>
+  </distributionManagement>
+</project>