[GitHub] matthiasblaesing closed pull request #210: [NETBEANS-54] Module Review o.apache.commons.codec

[GitBox <gi...@apache.org>]

matthiasblaesing closed pull request #210: [NETBEANS-54] Module Review o.apache.commons.codec
URL: https://github.com/apache/incubator-netbeans/pull/210
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/o.apache.commons.codec/build.xml b/o.apache.commons.codec/build.xml
index af4316748..20f87dffa 100644
--- a/o.apache.commons.codec/build.xml
+++ b/o.apache.commons.codec/build.xml
@@ -23,7 +23,7 @@
     <import file="../nbbuild/templates/projectized.xml"/>
     <target name="jar">
         <jar jarfile="${cluster}/${module.jar}">
-            <zipfileset src="external/apache-commons-codec-1.3.jar"/>
+            <zipfileset src="external/commons-codec-1.3.jar"/>
             <manifest>
                 <attribute name="Bundle-SymbolicName" value="org.apache.commons.codec"/>
                 <attribute name="Bundle-Version" value="1.3.0"/>
diff --git a/o.apache.commons.codec/external/binaries-list b/o.apache.commons.codec/external/binaries-list
index b34abc540..9caf2fac6 100644
--- a/o.apache.commons.codec/external/binaries-list
+++ b/o.apache.commons.codec/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-FD32786786E2ADB664D5ECC965DA47629DCA14BA apache-commons-codec-1.3.jar
+FD32786786E2ADB664D5ECC965DA47629DCA14BA commons-codec:commons-codec:1.3
diff --git a/o.apache.commons.codec/external/org.apache.commons.codec-1.3.0-license.txt b/o.apache.commons.codec/external/commons.codec-1.3-license.txt
similarity index 100%
rename from o.apache.commons.codec/external/org.apache.commons.codec-1.3.0-license.txt
rename to o.apache.commons.codec/external/commons.codec-1.3-license.txt
diff --git a/o.apache.commons.codec/external/commons.codec-1.3-notice.txt b/o.apache.commons.codec/external/commons.codec-1.3-notice.txt
new file mode 100644
index 000000000..7196130f7
--- /dev/null
+++ b/o.apache.commons.codec/external/commons.codec-1.3-notice.txt
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/o.apache.commons.codec/nbproject/project.xml b/o.apache.commons.codec/nbproject/project.xml
index 72f270a8e..19e85cb94 100644
--- a/o.apache.commons.codec/nbproject/project.xml
+++ b/o.apache.commons.codec/nbproject/project.xml
@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>org-apache-commons-codec.jar</runtime-relative-path>
-                <binary-origin>external/apache-commons-codec-1.3.jar</binary-origin>
+                <binary-origin>external/commons-codec-1.3.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services