From ab34b79c986665ad8d08b9cd591ac22f16a29ca0 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 03:34:52 -0700 Subject: [PATCH 01/20] Initial commit --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 ++ 2 files changed, 205 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ad410e1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed 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. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..716e0ab --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +rome-parent +=========== + +Parent for all ROME projects From f4683798bbab182a2503fb2a1160eee88fd87dcc Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 13:35:53 +0200 Subject: [PATCH 02/20] Initial commit --- .gitignore | 3 + conf/checkstyle/checkstyle.xml | 115 +++++++++++++ conf/eclipse/cleanup.xml | 56 +++++++ conf/eclipse/formatter.xml | 291 +++++++++++++++++++++++++++++++++ pom.xml | 233 ++++++++++++++++++++++++++ 5 files changed, 698 insertions(+) create mode 100644 .gitignore create mode 100644 conf/checkstyle/checkstyle.xml create mode 100644 conf/eclipse/cleanup.xml create mode 100644 conf/eclipse/formatter.xml create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ef042a --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/.settings +/.project +/target \ No newline at end of file diff --git a/conf/checkstyle/checkstyle.xml b/conf/checkstyle/checkstyle.xml new file mode 100644 index 0000000..2a344a7 --- /dev/null +++ b/conf/checkstyle/checkstyle.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/eclipse/cleanup.xml b/conf/eclipse/cleanup.xml new file mode 100644 index 0000000..40f9b7a --- /dev/null +++ b/conf/eclipse/cleanup.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/eclipse/formatter.xml b/conf/eclipse/formatter.xml new file mode 100644 index 0000000..bbbe207 --- /dev/null +++ b/conf/eclipse/formatter.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..e9c2a3e --- /dev/null +++ b/pom.xml @@ -0,0 +1,233 @@ + + + 4.0.0 + + + org.sonatype.oss + oss-parent + 9 + + + com.rometools + rome-parent + 1.5.0-SNAPSHOT + pom + + rome-parent + + Parent for all ROME projects + + http://rometools.github.io/rome-parent/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:git@github.com:rometools/rome-parent.git + scm:git:git@github.com:rometools/rome-parent.git + https://github.com/rometools/rome-parent/ + + + + + Patrick Gotthard + patrick@patrick-gotthard.de + http://www.patrick-gotthard.de + +1 + + + + + UTF-8 + UTF-8 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.apache.maven.plugins + maven-scm-publish-plugin + 1.0 + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + + + + + + + com.rometools + rome + 1.5.0-SNAPSHOT + + + com.rometools + rome-fetcher + 1.5.0-SNAPSHOT + + + com.rometools + rome-certiorem + 1.5.0-SNAPSHOT + + + + org.jdom + jdom + 2.0.2 + + + + org.slf4j + slf4j-api + 1.7.5 + + + org.slf4j + slf4j-simple + 1.7.5 + + + + junit + junit + 4.11 + + + + javax.servlet + servlet-api + 2.5 + + + javax.servlet.jsp + jsp-api + 2.1 + + + javax.persistence + persistence-api + 1.0 + + + + com.google.inject + guice + 2.0 + + + com.google.inject.extensions + guice-servlet + 2.0 + + + javax.activation + activation + 1.1 + + + + xerces + xercesImpl + 2.11.0 + + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-logging + commons-logging-api + 1.1 + + + commons-logging + commons-logging + 1.1.3 + + + commons-codec + commons-codec + 1.3 + + + commons-lang + commons-lang + 2.4 + + + commons-beanutils + commons-beanutils + 1.6 + + + ws-commons-util + ws-commons-util + 1.0.1 + + + + jetty + jetty + 4.2.12 + + + + xmlrpc + xmlrpc-client + 3.0 + + + xmlrpc + xmlrpc-common + 3.0 + + + + net.oauth.core + oauth + 20100527 + + + net.oauth.core + oauth-provider + 20100527 + + + + + \ No newline at end of file From ee38a623194cc46adee5032a58bbcb57877ff17c Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 14:22:27 +0200 Subject: [PATCH 03/20] Removed unused dependencies and unnecessary dependency declarations --- pom.xml | 56 +++++++++++--------------------------------------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/pom.xml b/pom.xml index e9c2a3e..5fafae2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,17 @@ 1.5.0-SNAPSHOT pom + + + + + + + + + + + rome-parent Parent for all ROME projects @@ -142,48 +153,18 @@ 1.0 - - com.google.inject - guice - 2.0 - com.google.inject.extensions guice-servlet 2.0 - - javax.activation - activation - 1.1 - - - xerces - xercesImpl - 2.11.0 - commons-httpclient commons-httpclient 3.1 - - commons-logging - commons-logging-api - 1.1 - - - commons-logging - commons-logging - 1.1.3 - - - commons-codec - commons-codec - 1.3 - commons-lang commons-lang @@ -194,11 +175,6 @@ commons-beanutils 1.6 - - ws-commons-util - ws-commons-util - 1.0.1 - jetty @@ -211,22 +187,12 @@ xmlrpc-client 3.0 - - xmlrpc - xmlrpc-common - 3.0 - net.oauth.core oauth 20100527 - - net.oauth.core - oauth-provider - 20100527 - From 2c1d73a653121ae92668c0ffe2cb8dfd1e123884 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 14:32:49 +0200 Subject: [PATCH 04/20] Updated dependencies --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 5fafae2..775f7dc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,15 +15,15 @@ pom - - - - - - - - - + + ../rome + ../rome-certiorem + ../rome-certiorem-webapp + ../rome-fetcher + ../rome-modules + ../rome-opml + ../rome-propono + rome-parent @@ -123,12 +123,12 @@ org.slf4j slf4j-api - 1.7.5 + 1.7.7 org.slf4j slf4j-simple - 1.7.5 + 1.7.7 @@ -150,7 +150,7 @@ javax.persistence persistence-api - 1.0 + 1.0.2 @@ -168,12 +168,12 @@ commons-lang commons-lang - 2.4 + 2.6 commons-beanutils commons-beanutils - 1.6 + 1.9.1 From cd9ecb444e3956be4f922e3ccb9b3ce6da17e585 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 14:40:24 +0200 Subject: [PATCH 05/20] Updated commons-lang to version 3 --- pom.xml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 775f7dc..b41e003 100644 --- a/pom.xml +++ b/pom.xml @@ -15,15 +15,15 @@ pom - - ../rome - ../rome-certiorem - ../rome-certiorem-webapp - ../rome-fetcher - ../rome-modules - ../rome-opml - ../rome-propono - + + + + + + + + + rome-parent @@ -158,7 +158,6 @@ guice-servlet 2.0 - commons-httpclient @@ -166,9 +165,9 @@ 3.1 - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.3.1 commons-beanutils From 01ef33e71a458303589a2d253db9bd9a8be22b12 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 12 Apr 2014 17:00:38 +0200 Subject: [PATCH 06/20] Enhanced cleanup and formatter config --- conf/eclipse/cleanup.xml | 97 +++---- conf/eclipse/formatter.xml | 554 +++++++++++++++++++------------------ 2 files changed, 329 insertions(+), 322 deletions(-) diff --git a/conf/eclipse/cleanup.xml b/conf/eclipse/cleanup.xml index 40f9b7a..40a8fd9 100644 --- a/conf/eclipse/cleanup.xml +++ b/conf/eclipse/cleanup.xml @@ -1,56 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/eclipse/formatter.xml b/conf/eclipse/formatter.xml index bbbe207..32ba45c 100644 --- a/conf/eclipse/formatter.xml +++ b/conf/eclipse/formatter.xml @@ -1,291 +1,295 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2119d14c27aab8a4ae8929a6e755a7918424478f Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sun, 13 Apr 2014 13:30:44 +0200 Subject: [PATCH 07/20] Enhanced POM to hide irrelevant m2e warnings --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index b41e003..572a460 100644 --- a/pom.xml +++ b/pom.xml @@ -81,6 +81,32 @@ maven-scm-publish-plugin 1.0 + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + From 6b13451efc40fe5f46f23126831d333cdff502ea Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Mon, 14 Apr 2014 19:02:18 +0200 Subject: [PATCH 08/20] Migrated logging to SLF4J --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 572a460..c909abb 100644 --- a/pom.xml +++ b/pom.xml @@ -145,16 +145,16 @@ jdom 2.0.2 - + org.slf4j slf4j-api 1.7.7 - org.slf4j - slf4j-simple - 1.7.7 + ch.qos.logback + logback-classic + 1.1.2 From fe2c14c2362e63b799a0410225eee1cb94e9130b Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Thu, 17 Apr 2014 22:50:48 +0200 Subject: [PATCH 09/20] Added rome-utils and hamcrest-all dependencies --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index c909abb..7defeb4 100644 --- a/pom.xml +++ b/pom.xml @@ -124,6 +124,11 @@ + + com.rometools + rome-utils + 1.5.0-SNAPSHOT + com.rometools rome @@ -162,6 +167,12 @@ junit 4.11 + + + org.hamcrest + hamcrest-all + 1.3 + javax.servlet From 9ac2d4832d84bcdbeb6776a5ab9a39668e3b0e8c Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Tue, 13 May 2014 19:20:42 +0200 Subject: [PATCH 10/20] Decreased maximum line-length of comments to 100 chars --- conf/eclipse/formatter.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/eclipse/formatter.xml b/conf/eclipse/formatter.xml index 32ba45c..f3d99da 100644 --- a/conf/eclipse/formatter.xml +++ b/conf/eclipse/formatter.xml @@ -64,7 +64,7 @@ - + From 825336977f943485eaece8e46a1e48925f4e7089 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Tue, 13 May 2014 19:21:21 +0200 Subject: [PATCH 11/20] Cleanup now adds default serialVersionId instead of generated one --- conf/eclipse/cleanup.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/eclipse/cleanup.xml b/conf/eclipse/cleanup.xml index 40a8fd9..feca0d5 100644 --- a/conf/eclipse/cleanup.xml +++ b/conf/eclipse/cleanup.xml @@ -7,7 +7,7 @@ - + @@ -34,8 +34,8 @@ - - + + From 9ed404d12b4e1b8d32014d394ddf84499f2df384 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Fri, 30 May 2014 16:47:10 +0200 Subject: [PATCH 12/20] Removed "cyclic dependency" to parent POM --- pom.xml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pom.xml b/pom.xml index 7defeb4..e931c98 100644 --- a/pom.xml +++ b/pom.xml @@ -123,27 +123,6 @@ - - - com.rometools - rome-utils - 1.5.0-SNAPSHOT - - - com.rometools - rome - 1.5.0-SNAPSHOT - - - com.rometools - rome-fetcher - 1.5.0-SNAPSHOT - - - com.rometools - rome-certiorem - 1.5.0-SNAPSHOT - org.jdom From 75a54331d83e59747190e68ac74e889af91443a6 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Tue, 3 Jun 2014 22:52:57 +0200 Subject: [PATCH 13/20] Trying to release via https connection --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e931c98..e01532b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,9 @@ - scm:git:git@github.com:rometools/rome-parent.git - scm:git:git@github.com:rometools/rome-parent.git - https://github.com/rometools/rome-parent/ + scm:git:https://github.com/rometools/rome-parent.git + scm:git:https://github.com/rometools/rome-parent.git + https://github.com/rometools/rome-parent From b07c408bd5652510e50f8808c4c6b72e567029c1 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Tue, 3 Jun 2014 23:09:33 +0200 Subject: [PATCH 14/20] Next try to release via SSH --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e01532b..b3050e2 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ - scm:git:https://github.com/rometools/rome-parent.git - scm:git:https://github.com/rometools/rome-parent.git + scm:git:ssh://github.com/rometools/rome-parent.git + scm:git:ssh://git@github.com/rometools/rome-parent.git https://github.com/rometools/rome-parent From 77e8b0025a4d7c76820babd4424bfa6fcb85a68b Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Tue, 3 Jun 2014 23:36:39 +0200 Subject: [PATCH 15/20] [maven-release-plugin] prepare release rome-parent-1.5.0 --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b3050e2..eb85bc1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 @@ -11,7 +10,7 @@ com.rometools rome-parent - 1.5.0-SNAPSHOT + 1.5.0 pom From 8fbe33eb68aa6f950f4ff3565c4085770b0f7581 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Tue, 3 Jun 2014 23:36:43 +0200 Subject: [PATCH 16/20] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb85bc1..127cd7b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.rometools rome-parent - 1.5.0 + 1.6.0-SNAPSHOT pom From 83a442c2d166151be4d8fdc64466ed5398496123 Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Mon, 16 Jun 2014 00:29:13 -0400 Subject: [PATCH 17/20] Updated XMLRPC, commons-lang & commons-beanutils libraries. --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 127cd7b..181a0c1 100644 --- a/pom.xml +++ b/pom.xml @@ -182,12 +182,12 @@ org.apache.commons commons-lang3 - 3.3.1 + 3.3.2 commons-beanutils commons-beanutils - 1.9.1 + 1.9.2 @@ -197,9 +197,9 @@ - xmlrpc + org.apache.xmlrpc xmlrpc-client - 3.0 + 3.1.3 @@ -210,4 +210,4 @@ - \ No newline at end of file + From a719a769fde1227aab01db19ace2db792c26c4a7 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 7 Feb 2015 09:47:19 +0100 Subject: [PATCH 18/20] Updated jdom Updated slf4j-api Updated junit Replaced hamcrest-all through hamcrest-library --- pom.xml | 395 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 198 insertions(+), 197 deletions(-) diff --git a/pom.xml b/pom.xml index 181a0c1..6f41322 100644 --- a/pom.xml +++ b/pom.xml @@ -1,213 +1,214 @@ - + - 4.0.0 + 4.0.0 - - org.sonatype.oss - oss-parent - 9 - + + org.sonatype.oss + oss-parent + 9 + - com.rometools - rome-parent - 1.6.0-SNAPSHOT - pom + com.rometools + rome-parent + 1.6.0-SNAPSHOT + pom - - - - - - - - - - + + + ../rome + ../rome-certiorem + ../rome-certiorem-webapp + ../rome-fetcher + ../rome-modules + ../rome-opml + ../rome-propono + - rome-parent + rome-parent - Parent for all ROME projects + Parent for all ROME projects - http://rometools.github.io/rome-parent/ + http://rometools.github.io/rome-parent/ - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + - - scm:git:ssh://github.com/rometools/rome-parent.git - scm:git:ssh://git@github.com/rometools/rome-parent.git - https://github.com/rometools/rome-parent - + + scm:git:ssh://github.com/rometools/rome-parent.git + scm:git:ssh://git@github.com/rometools/rome-parent.git + https://github.com/rometools/rome-parent + - - - Patrick Gotthard - patrick@patrick-gotthard.de - http://www.patrick-gotthard.de - +1 - - + + + Patrick Gotthard + patrick@patrick-gotthard.de + http://www.patrick-gotthard.de + +1 + + - - UTF-8 - UTF-8 - + + UTF-8 + UTF-8 + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 1.0 - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0.0,) - - enforce - - - - - - - - - - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.apache.maven.plugins + maven-scm-publish-plugin + 1.0 + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + + + + - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + - - - - - org.jdom - jdom - 2.0.2 - - - - org.slf4j - slf4j-api - 1.7.7 - - - ch.qos.logback - logback-classic - 1.1.2 - - - - junit - junit - 4.11 - - - - org.hamcrest - hamcrest-all - 1.3 - - - - javax.servlet - servlet-api - 2.5 - - - javax.servlet.jsp - jsp-api - 2.1 - - - javax.persistence - persistence-api - 1.0.2 - - - - com.google.inject.extensions - guice-servlet - 2.0 - - - - commons-httpclient - commons-httpclient - 3.1 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - commons-beanutils - commons-beanutils - 1.9.2 - - - - jetty - jetty - 4.2.12 - - - - org.apache.xmlrpc - xmlrpc-client - 3.1.3 - - - - net.oauth.core - oauth - 20100527 - - - + + + + + org.jdom + jdom2 + 2.0.5 + + + + org.slf4j + slf4j-api + 1.7.10 + + + ch.qos.logback + logback-classic + 1.1.2 + + + + junit + junit + 4.12 + + + + org.hamcrest + hamcrest-library + 1.3 + + + + javax.servlet + servlet-api + 2.5 + + + javax.servlet.jsp + jsp-api + 2.1 + + + javax.persistence + persistence-api + 1.0.2 + + + + com.google.inject.extensions + guice-servlet + 2.0 + + + + commons-httpclient + commons-httpclient + 3.1 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + commons-beanutils + commons-beanutils + 1.9.2 + + + + jetty + jetty + 4.2.12 + + + + org.apache.xmlrpc + xmlrpc-client + 3.1.3 + + + + net.oauth.core + oauth + 20100527 + + + From 2b82a226605a6ed6d7ea48831a0f87e5ea2fa281 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sat, 7 Feb 2015 12:37:45 +0100 Subject: [PATCH 19/20] Commented out modules section --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 6f41322..953d41c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,15 +15,15 @@ pom - - ../rome - ../rome-certiorem - ../rome-certiorem-webapp - ../rome-fetcher - ../rome-modules - ../rome-opml - ../rome-propono - + + + + + + + + + rome-parent From d61743fd8ec0792828d3e1fef74135234ddb0076 Mon Sep 17 00:00:00 2001 From: mishako Date: Sat, 2 Jan 2016 18:16:12 +0100 Subject: [PATCH 20/20] Configure OSGi bundling --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index 953d41c..cf3035d 100644 --- a/pom.xml +++ b/pom.xml @@ -107,6 +107,20 @@ + + org.apache.felix + maven-bundle-plugin + 3.0.1 + + + bundle + package + + bundle + + + +