Updated org.apache.commons.csv to 1.8 (removed 1.4).
Signed-off-by: Sina Madani <sinadoom@googlemail.com>
Change-Id: I8592ddae16c65f6e3e7df704d35aea78d1fa5bb8
diff --git a/apache/org.apache.commons.csv_1.4.0/src/main/resources/about.html b/apache/org.apache.commons.csv_1.4.0/src/main/resources/about.html
deleted file mode 100644
index 46e98cc..0000000
--- a/apache/org.apache.commons.csv_1.4.0/src/main/resources/about.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 11, 2019</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third parties as set out below. If you
-did not receive this Content directly from the Eclipse Foundation, the following is provided
-for informational purposes only, and you should look to the Redistributor's license for
-terms and conditions of use.</p>
-
-<h4>Apache Commons CSV</h4>
-
-<p>The plug-in includes software developed by <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> as part of the Apache Commons CSV project.</p>
-
-<p>Apache Commons CSV is provided to you under the terms and conditions of the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">Apache License, Version 2.0</a> (<a href="about_files/APACHE_LICENSE__VERSION_2.0.txt" target="_blank">APACHE_LICENSE__VERSION_2.0.txt</a>) license.</p>
-
-<p>Apache Commons CSV including its source is available from <a href="http://commons.apache.org/proper/commons-csv/" target="_blank">commons.apache.org/proper/commons-csv/</a>. Bugs or feature requests can be made in the project issue tracking system at <a href="http://issues.apache.org/jira/browse/CSV" target="_blank">issues.apache.org/jira/browse/CSV</a>. The following mailing lists can be used to communicate with the project communities: Commons User List <user@commons.apache.org> (<a href="http://mail-archives.apache.org/mod_mbox/commons-user/" target="_blank">archive</a>), Commons Dev List <dev@commons.apache.org> (<a href="http://mail-archives.apache.org/mod_mbox/commons-dev/" target="_blank">archive</a>), Commons Issues List (<a href="http://mail-archives.apache.org/mod_mbox/commons-issues/" target="_blank">archive</a>), Commons Commits List (<a href="http://mail-archives.apache.org/mod_mbox/commons-commits/" target="_blank">archive</a>) or Apache Announce List (<a href="http://mail-archives.apache.org/mod_mbox/www-announce/" target="_blank">archive</a>).</p>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/apache/org.apache.commons.csv_1.4.0/.project b/apache/org.apache.commons.csv_1.8.0/.project
similarity index 80%
rename from apache/org.apache.commons.csv_1.4.0/.project
rename to apache/org.apache.commons.csv_1.8.0/.project
index c2b4ae6..c9d0f6a 100644
--- a/apache/org.apache.commons.csv_1.4.0/.project
+++ b/apache/org.apache.commons.csv_1.8.0/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.commons.csv_1.4.0</name>
+ <name>org.apache.commons.csv_1.8.0</name>
<comment></comment>
<projects>
</projects>
diff --git a/apache/org.apache.commons.csv_1.4.0/osgi.bnd b/apache/org.apache.commons.csv_1.8.0/osgi.bnd
similarity index 100%
rename from apache/org.apache.commons.csv_1.4.0/osgi.bnd
rename to apache/org.apache.commons.csv_1.8.0/osgi.bnd
diff --git a/apache/org.apache.commons.csv_1.4.0/pom.xml b/apache/org.apache.commons.csv_1.8.0/pom.xml
similarity index 91%
rename from apache/org.apache.commons.csv_1.4.0/pom.xml
rename to apache/org.apache.commons.csv_1.8.0/pom.xml
index 48f5deb..b1fae7e 100644
--- a/apache/org.apache.commons.csv_1.4.0/pom.xml
+++ b/apache/org.apache.commons.csv_1.8.0/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.commons.csv</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Apache Commons CSV</name>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.4</version>
+ <version>1.8</version>
</dependency>
</dependencies>
</project>
diff --git a/apache/org.apache.commons.csv_1.4.0/src/eclipse/ip_log.xml b/apache/org.apache.commons.csv_1.8.0/src/eclipse/ip_log.xml
similarity index 62%
rename from apache/org.apache.commons.csv_1.4.0/src/eclipse/ip_log.xml
rename to apache/org.apache.commons.csv_1.8.0/src/eclipse/ip_log.xml
index efaf140..6e1009e 100644
--- a/apache/org.apache.commons.csv_1.4.0/src/eclipse/ip_log.xml
+++ b/apache/org.apache.commons.csv_1.8.0/src/eclipse/ip_log.xml
@@ -1,23 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.apache.commons.csv" version="1.4.0" status="done">
+ <project id="org.apache.commons.csv" version="1.8.0" status="done">
<info>
<name>Apache Commons CSV</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
<location>apache-parent/org.apache.commons.csv</location>
</info>
<contact>
- <name>Philip Wenig</name>
- <email>philip.wenig@openchrom.net</email>
- <company>Lablicate GmbH</company>
+ <name>Sina Madani</name>
+ <email>sinadoom@googlemail.com</email>
</contact>
<legal>
- <ipzilla bug_id="20165"/>
+ <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/org.apache.commons/commons-csv/1.8"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>commons-csv-1.4.jar</package>
+ <package>commons-csv-1.8.jar</package>
</legal>
</project>
-</ip_log>
+</ip_log>
\ No newline at end of file
diff --git a/apache/org.apache.commons.csv_1.4.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/org.apache.commons.csv_1.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/org.apache.commons.csv_1.4.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/org.apache.commons.csv_1.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/org.apache.commons.csv_1.8.0/src/main/resources/about.html b/apache/org.apache.commons.csv_1.8.0/src/main/resources/about.html
new file mode 100644
index 0000000..ba3b30a
--- /dev/null
+++ b/apache/org.apache.commons.csv_1.8.0/src/main/resources/about.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>July 29, 2020</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+<p>The Content includes items that have been sourced from third parties as set out below. If you
+did not receive this Content directly from the Eclipse Foundation, the following is provided
+for informational purposes only, and you should look to the Redistributor's license for
+terms and conditions of use.</p>
+
+<h4>Apache Commons CSV</h4>
+
+<p>The plug-in includes software developed by <a href="https://www.apache.org/" target="_blank">The Apache Software Foundation</a> as part of the Apache Commons CSV project.</p>
+
+<p>Apache Commons CSV is provided to you under the terms and conditions of the <a href="https://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">Apache License, Version 2.0</a> (<a href="about_files/APACHE_LICENSE__VERSION_2.0.txt" target="_blank">APACHE_LICENSE__VERSION_2.0.txt</a>) license.</p>
+
+<p>Apache Commons CSV including its source is available from <a href="https://commons.apache.org/proper/commons-csv/" target="_blank">commons.apache.org/proper/commons-csv/</a>. Bugs or feature requests can be made in the project issue tracking system at <a href="https://issues.apache.org/jira/browse/CSV" target="_blank">issues.apache.org/jira/browse/CSV</a>. The following mailing lists can be used to communicate with the project communities: Commons User List <user@commons.apache.org> (<a href="https://mail-archives.apache.org/mod_mbox/commons-user/" target="_blank">archive</a>), Commons Dev List <dev@commons.apache.org> (<a href="https://mail-archives.apache.org/mod_mbox/commons-dev/" target="_blank">archive</a>), Commons Issues List (<a href="https://mail-archives.apache.org/mod_mbox/commons-issues/" target="_blank">archive</a>), Commons Commits List (<a href="https://mail-archives.apache.org/mod_mbox/commons-commits/" target="_blank">archive</a>) or Apache Announce List (<a href="https://mail-archives.apache.org/mod_mbox/www-announce/" target="_blank">archive</a>).</p>
+
+
+</body>
+</html>
diff --git a/apache/org.apache.commons.csv_1.4.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt b/apache/org.apache.commons.csv_1.8.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
similarity index 100%
rename from apache/org.apache.commons.csv_1.4.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
rename to apache/org.apache.commons.csv_1.8.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
diff --git a/apache/pom.xml b/apache/pom.xml
index b898777..033c441 100644
--- a/apache/pom.xml
+++ b/apache/pom.xml
@@ -19,7 +19,7 @@
<module>org.apache.commons.codec_1.13.0</module>
<module>org.apache.commons.collections4_4.4.0</module>
<module>org.apache.commons.compress_1.19.0</module>
- <module>org.apache.commons.csv_1.4.0</module>
+ <module>org.apache.commons.csv_1.8.0</module>
<module>org.apache.commons.fileupload_1.3.2</module>
<module>org.apache.commons.io_2.6.0</module>
<module>org.apache.commons.logging_1.2.0</module>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index 0e53d60..72c240e 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -169,7 +169,7 @@
<plugin id="org.apache.commons.codec" version="1.13.0.qualifier"/>
<plugin id="org.apache.commons.logging" version="1.2.0.qualifier"/>
- <plugin id="org.apache.commons.csv" version="1.4.0.qualifier"/>
+ <plugin id="org.apache.commons.csv" version="1.8.0.qualifier"/>
<plugin id="org.apache.commons.fileupload" version="1.3.2.qualifier"/>
<plugin id="org.apache.commons.io" version="2.6.0.qualifier"/>
<plugin id="org.apache.commons.math3" version="3.5.0.qualifier"/>
