jakarta-commons: switch to INC_PR and fix license

18 files changed, 37 insertions, 1 deletions

diff --git a/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb
index 500937d..06287f6 100644
--- a/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb
+++ b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Static utility methods useful in manipulating Java classes that conform to the JavaBeans Specification"
 
 SRC_URI = "http://www.apache.org/dist/commons/beanutils/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-cli_1.1.bb b/recipes-core/jakarta-commons/commons-cli_1.1.bb
index 78cce46..cb51765 100644
--- a/recipes-core/jakarta-commons/commons-cli_1.1.bb
+++ b/recipes-core/jakarta-commons/commons-cli_1.1.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Java argument parsing helper classes"
 
 SRC_URI = "http://archive.apache.org/dist/commons/cli/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-codec_1.3.bb b/recipes-core/jakarta-commons/commons-codec_1.3.bb
index ff7627f..3a7ddd4 100644
--- a/recipes-core/jakarta-commons/commons-codec_1.3.bb
+++ b/recipes-core/jakarta-commons/commons-codec_1.3.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Java library with simple encoder and decoders for various formats such as Base64 and Hexadecimal"
 
 SRC_URI = "http://archive.apache.org/dist/commons/codec/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-collections3_3.2.1.bb b/recipes-core/jakarta-commons/commons-collections3_3.2.1.bb
index 7e3478b..852cac7 100644
--- a/recipes-core/jakarta-commons/commons-collections3_3.2.1.bb
+++ b/recipes-core/jakarta-commons/commons-collections3_3.2.1.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "A set of abstract data type interfaces and implementations that offer a wealth of useful functionality and a solid foundation for extending that functionality"
 
 SRC_URI = "http://www.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-collections_2.1.1.bb b/recipes-core/jakarta-commons/commons-collections_2.1.1.bb
index aaa3e33..4d100a7 100644
--- a/recipes-core/jakarta-commons/commons-collections_2.1.1.bb
+++ b/recipes-core/jakarta-commons/commons-collections_2.1.1.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "A set of abstract data type interfaces and implementations that offer a wealth of useful functionality and a solid foundation for extending that functionality"
 
 SRC_URI = "http://archive.apache.org/dist/commons/collections/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-configuration_1.5.bb b/recipes-core/jakarta-commons/commons-configuration_1.5.bb
index bbfacfd..54409e5 100644
--- a/recipes-core/jakarta-commons/commons-configuration_1.5.bb
+++ b/recipes-core/jakarta-commons/commons-configuration_1.5.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Generic configuration interface for Java applications"
 
 SRC_URI = " \
diff --git a/recipes-core/jakarta-commons/commons-digester_1.8.bb b/recipes-core/jakarta-commons/commons-digester_1.8.bb
index 9d9164a..5bb411a 100644
--- a/recipes-core/jakarta-commons/commons-digester_1.8.bb
+++ b/recipes-core/jakarta-commons/commons-digester_1.8.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Converts XML to a Java object by a set of mapping rules."
 
 SRC_URI = "http://archive.apache.org/dist/commons/digester/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-discovery_0.4.bb b/recipes-core/jakarta-commons/commons-discovery_0.4.bb
index 8600cbd..75db064 100644
--- a/recipes-core/jakarta-commons/commons-discovery_0.4.bb
+++ b/recipes-core/jakarta-commons/commons-discovery_0.4.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "discovering, or finding, implementations for pluggable interfaces"
 
 SRC_URI = "http://archive.apache.org/dist/commons/discovery/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-el_1.0.bb b/recipes-core/jakarta-commons/commons-el_1.0.bb
index b32a2e1..5821473 100644
--- a/recipes-core/jakarta-commons/commons-el_1.0.bb
+++ b/recipes-core/jakarta-commons/commons-el_1.0.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Implementation of the JSP2.0 Expression Language API"
 
 SRC_URI = "http://archive.apache.org/dist/commons/el/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb
index 2af9994..3954363 100644
--- a/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb
+++ b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Robust, high-performance, file upload capability for Java servlets and web applications"
 
 SRC_URI = "http://archive.apache.org/dist/commons/fileupload/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-httpclient_3.1.bb b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb
index 66e9616..4f6b1af 100644
--- a/recipes-core/jakarta-commons/commons-httpclient_3.1.bb
+++ b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Efficient, up-to-date, and feature-rich package implementing the client side of the most recent HTTP standards and recommendations"
 
 SRC_URI = "http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-io_1.4.bb b/recipes-core/jakarta-commons/commons-io_1.4.bb
index eb3bbfa..f4308d2 100644
--- a/recipes-core/jakarta-commons/commons-io_1.4.bb
+++ b/recipes-core/jakarta-commons/commons-io_1.4.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Java library with utility classes, stream implementations, file filters and endian classes"
 
 SRC_URI = "http://archive.apache.org/dist/commons/io/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-jxpath_1.3.bb b/recipes-core/jakarta-commons/commons-jxpath_1.3.bb
index 8cd54ba..d380ed9 100644
--- a/recipes-core/jakarta-commons/commons-jxpath_1.3.bb
+++ b/recipes-core/jakarta-commons/commons-jxpath_1.3.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "JXPath interpreter for Java"
 
 SRC_URI = "http://archive.apache.org/dist/commons/jxpath/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-lang_2.4.bb b/recipes-core/jakarta-commons/commons-lang_2.4.bb
index 1576b7e..60c6346 100644
--- a/recipes-core/jakarta-commons/commons-lang_2.4.bb
+++ b/recipes-core/jakarta-commons/commons-lang_2.4.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Set of Java classes that provide helper methods for the standard java.lang classes"
 
 SRC_URI = "http://archive.apache.org/dist/commons/lang/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/commons-logging_1.1.1.bb b/recipes-core/jakarta-commons/commons-logging_1.1.1.bb
index 06cc376..b04c812 100644
--- a/recipes-core/jakarta-commons/commons-logging_1.1.1.bb
+++ b/recipes-core/jakarta-commons/commons-logging_1.1.1.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Java Internet protocol suite library"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87"
 
diff --git a/recipes-core/jakarta-commons/commons-net_1.4.1.bb b/recipes-core/jakarta-commons/commons-net_1.4.1.bb
index ee321eb..275ebb9 100644
--- a/recipes-core/jakarta-commons/commons-net_1.4.1.bb
+++ b/recipes-core/jakarta-commons/commons-net_1.4.1.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Java Internet protocol suite library"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
diff --git a/recipes-core/jakarta-commons/commons-pool_1.4.bb b/recipes-core/jakarta-commons/commons-pool_1.4.bb
index 82065a4..d5b6def 100644
--- a/recipes-core/jakarta-commons/commons-pool_1.4.bb
+++ b/recipes-core/jakarta-commons/commons-pool_1.4.bb
@@ -1,5 +1,7 @@
 require jakarta-commons.inc
 
+PR = "${INC_PR}.1"
+
 DESCRIPTION = "Java Object-pooling API"
 
 SRC_URI = "http://archive.apache.org/dist/commons/pool/source/${BP}-src.tar.gz"
diff --git a/recipes-core/jakarta-commons/jakarta-commons.inc b/recipes-core/jakarta-commons/jakarta-commons.inc
index 3ee081e..1630df6 100644
--- a/recipes-core/jakarta-commons/jakarta-commons.inc
+++ b/recipes-core/jakarta-commons/jakarta-commons.inc
@@ -1,5 +1,7 @@
-LICENSE = "AL2.0"
 AUTHOR = "Apache Software Foundation"
+LICENSE = "Apache-2.0"
+
+INC_PR = "r0"
 
 inherit java-library