From 5d38fc4526c1755788466febfa822e2aa71e15c0 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 24 Jun 2016 17:46:30 +0200 Subject: [PATCH] [Project] Removed parent --- li.strolch.parent/.gitignore | 3 - li.strolch.parent/LICENSE | 202 -------------- li.strolch.parent/README.md | 6 - li.strolch.parent/pom.xml | 428 ------------------------------ pom.xml | 496 ++++++++++++++++++++++++++++------- 5 files changed, 407 insertions(+), 728 deletions(-) delete mode 100644 li.strolch.parent/.gitignore delete mode 100644 li.strolch.parent/LICENSE delete mode 100644 li.strolch.parent/README.md delete mode 100644 li.strolch.parent/pom.xml diff --git a/li.strolch.parent/.gitignore b/li.strolch.parent/.gitignore deleted file mode 100644 index 6efaec8b2..000000000 --- a/li.strolch.parent/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target/ -.project -.settings diff --git a/li.strolch.parent/LICENSE b/li.strolch.parent/LICENSE deleted file mode 100644 index d64569567..000000000 --- a/li.strolch.parent/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - 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. diff --git a/li.strolch.parent/README.md b/li.strolch.parent/README.md deleted file mode 100644 index f5ff4305e..000000000 --- a/li.strolch.parent/README.md +++ /dev/null @@ -1,6 +0,0 @@ -li.strolch.parent -================= - -[![Build Status](http://jenkins.eitchnet.ch/buildStatus/icon?job=li.strolch.parent)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.parent/) - -Parent for all li.strolch projects for easier project maintenance diff --git a/li.strolch.parent/pom.xml b/li.strolch.parent/pom.xml deleted file mode 100644 index 3d70b08fa..000000000 --- a/li.strolch.parent/pom.xml +++ /dev/null @@ -1,428 +0,0 @@ - - - 4.0.0 - - - li.strolch - li.strolch - 1.1.0-SNAPSHOT - ../pom.xml - - - li.strolch.parent - pom - li.strolch.parent - Parent for all li.strolch projects for easier project maintenance - 2013 - - - - - scm:git:https://github.com/eitchnet/strolch.git - scm:git:git@github.com:eitch/strolch.git - https://github.com/eitchnet/strolch - - - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - eitchnet.ch - http://www.strolch.li - - - - - eitch - Robert von Burg - eitch@eitchnet.ch - http://www.eitchnet.ch - eitchnet.ch - http://www.eitchnet.ch - - architect - developer - - +1 - - - - - - - li.strolch - li.strolch.model - ${project.version} - - - li.strolch - li.strolch.agent - ${project.version} - - - li.strolch - li.strolch.service - ${project.version} - - - li.strolch - li.strolch.persistence.xml - ${project.version} - - - li.strolch - li.strolch.persistence.postgresql - ${project.version} - - - li.strolch - li.strolch.rest - ${project.version} - - - - - li.strolch - li.strolch.testbase - ${project.version} - test - - - - - ch.eitchnet - ch.eitchnet.utils - ${eitchnet.utils.version} - - - ch.eitchnet - ch.eitchnet.xmlpers - ${eitchnet.xmlpers.version} - - - ch.eitchnet - ch.eitchnet.privilege - ${eitchnet.privilege.version} - - - - - org.slf4j - slf4j-api - 1.7.2 - - - commons-cli - commons-cli - 1.2 - - - com.github.petitparser.java-petitparser - petitparser-core - 2.0.2 - - - - - com.google.code.gson - gson - 2.3.1 - - - - - javax.mail - mail - 1.5.0-b01 - - - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - - - junit - junit - 4.11 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.hamcrest - hamcrest-library - 1.3 - test - - - org.slf4j - slf4j-log4j12 - 1.7.2 - test - - - - - - - - - ch.eitchnet - ch.eitchnet.utils - - - org.slf4j - slf4j-api - - - - - junit - junit - test - - - org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library - test - - - org.slf4j - slf4j-log4j12 - test - - - - - - - src/main/resources - true - - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.2 - - - org.apache.maven.plugins - maven-scm-plugin - 1.9.4 - - ${project.artifactId}-${project.version} - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.3 - - - validate - - create - - - - - false - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - true - true - -Xlint:all - - - - - org.apache.maven.plugins - maven-site-plugin - 3.4 - - UTF-8 - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.10 - - true - true - - - - - org.apache.maven.plugins - maven-source-plugin - 2.4 - - - attach-sources - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - - true - true - - - - - - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - false - ${warFinalName} - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - ${tomcat7Url} - ${tomcat7ServerId} - /${warFinalName} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - deploy - - jar - - - - - -Xdoclint:none - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - deploy - deploy - - deploy - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/lib - false - false - true - false - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.5 - - - - true - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 12ce58934..f5fb08300 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,52 @@ - + 4.0.0 li.strolch li.strolch 1.1.0-SNAPSHOT li.strolch + Module build for strolch pom - + http://www.strolch.li 2014 + + scm:git:https://github.com/eitchnet/strolch.git + scm:git:git@github.com:eitch/strolch.git + https://github.com/eitchnet/strolch + + + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + eitchnet.ch + http://www.strolch.li + + + + + eitch + Robert von Burg + eitch@eitchnet.ch + http://www.eitchnet.ch + eitchnet.ch + http://www.eitchnet.ch + + architect + developer + + +1 + + + 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT @@ -21,93 +57,6 @@ ${maven.build.timestamp} - - - - - - jitpack.io - snapshots - https://jitpack.io - - true - - - true - - - - - - - - - - archive.eitchnet.ch - Internal Releases - https://archive.eitchnet.ch/repository/internal/ - - - archive.eitchnet.ch - Internal Snapshots - https://archive.eitchnet.ch/repository/snapshots/ - - - - - scm:git:https://github.com/eitchnet/strolch.git - scm:git:git@github.com:eitch/strolch.git - https://github.com/eitchnet/strolch - - li.strolch.privilege li.strolch.utils @@ -129,4 +78,373 @@ strolch_minimal strolch_minimal_rest + + + + + li.strolch + li.strolch.model + ${project.version} + + + li.strolch + li.strolch.agent + ${project.version} + + + li.strolch + li.strolch.service + ${project.version} + + + li.strolch + li.strolch.persistence.xml + ${project.version} + + + li.strolch + li.strolch.persistence.postgresql + ${project.version} + + + li.strolch + li.strolch.rest + ${project.version} + + + + + li.strolch + li.strolch.testbase + ${project.version} + test + + + + + ch.eitchnet + ch.eitchnet.utils + ${eitchnet.utils.version} + + + ch.eitchnet + ch.eitchnet.xmlpers + ${eitchnet.xmlpers.version} + + + ch.eitchnet + ch.eitchnet.privilege + ${eitchnet.privilege.version} + + + + + org.slf4j + slf4j-api + 1.7.2 + + + commons-cli + commons-cli + 1.2 + + + com.github.petitparser.java-petitparser + petitparser-core + 2.0.2 + + + + + com.google.code.gson + gson + 2.3.1 + + + + + javax.mail + mail + 1.5.0-b01 + + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.hamcrest + hamcrest-library + 1.3 + test + + + org.slf4j + slf4j-log4j12 + 1.7.2 + test + + + + + + + + src/main/resources + true + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.2 + + + org.apache.maven.plugins + maven-scm-plugin + 1.9.4 + + ${project.artifactId}-${project.version} + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.3 + + + validate + + create + + + + + false + false + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + true + true + -Xlint:all + + + + + org.apache.maven.plugins + maven-site-plugin + 3.4 + + UTF-8 + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.10 + + true + true + + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + + true + true + + + + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + false + ${warFinalName} + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + ${tomcat7Url} + ${tomcat7ServerId} + /${warFinalName} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + deploy + + jar + + + + + -Xdoclint:none + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + deploy + deploy + + deploy + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/lib + false + false + true + false + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.5.5 + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + jitpack.io + snapshots + https://jitpack.io + + true + + + true + + + + + + + + archive.eitchnet.ch + Internal Releases + https://archive.eitchnet.ch/repository/internal/ + + + archive.eitchnet.ch + Internal Snapshots + https://archive.eitchnet.ch/repository/snapshots/ + + +