From 2d3646b786a42531853be40d3e19ed6bc5933167 Mon Sep 17 00:00:00 2001 From: Grzegorz Grzybek Date: Mon, 10 Dec 2018 11:05:01 +0100 Subject: [PATCH] [build] Review main POM and update plugin dependencies --- license-header.txt | 16 ++ license-headers.xml | 34 +++ pom.xml | 499 +++++++++++++++++++++++++++----------------- 3 files changed, 354 insertions(+), 195 deletions(-) create mode 100644 license-header.txt create mode 100644 license-headers.xml diff --git a/license-header.txt b/license-header.txt new file mode 100644 index 000000000..60b675e31 --- /dev/null +++ b/license-header.txt @@ -0,0 +1,16 @@ +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you 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/license-headers.xml b/license-headers.xml new file mode 100644 index 000000000..04a278606 --- /dev/null +++ b/license-headers.xml @@ -0,0 +1,34 @@ + + + + + /* + * + */ + + (\s|\t)*/\*.*$ + .*\*/(\s|\t)*$ + false + true + false + + diff --git a/pom.xml b/pom.xml index 45da84b29..5e3811a9a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,24 @@ + + 4.0.0 @@ -5,7 +26,7 @@ org.ops4j master - 4.2.0 + 4.3.0 org.ops4j.pax @@ -15,12 +36,57 @@ OPS4J Pax Url Pax Url - OSGi URL handlers - - - 3.0.0 - - ${wiki.url} + + UTF-8 + UTF-8 + + scm:git:git@github.com:ops4j/org.ops4j.pax.url.git + https://ops4j1.jira.com/wiki/spaces/paxurl/overview + + + + 3.0.0 + 8.9 + 3.8.0 + 3.0.0-M2 + 3.0.1 + 3.2.1 + 3.7.1 + 2.21.0 + 3.5.1 + 3.0.0 + 3.0 + 1.4.0 + + + + 4.3.1 + 4.3.1 + 1.5.0 + 2.3.0 + 1.0.2 + 3.5.0 + 1.8.3 + + + 1.6.6 + 1.0.7 + + 1.0.2.v20150114 + 3.2.1 + 2.8 + + 4.3.3 + 4.3.6 + + + + scm:git:git@github.com:ops4j/org.ops4j.pax.url.git + ${release-paxurl-altGitURL} + https://github.com/ops4j/org.ops4j.pax.url/tree/master + HEAD + pax-url-aether-support @@ -38,122 +104,13 @@ itest - - jira - http://team.ops4j.org/browse/PAXURL - - - - scm:git:git://github.com/ops4j/org.ops4j.pax.url.git - ${release-paxurl-altGitURL} - http://github.com/ops4j/org.ops4j.pax.url/tree/master - HEAD - - - - scm:git:ssh://git@github.com/ops4j/org.ops4j.pax.url.git - UTF-8 - 1.0.2.v20150114 - 1.5.0 - 2.3.0 - - 1.0.7 - 3.2.1 - 4.3.1 - 4.3.1 - 3.5.0 - 1.8.2 - 1.6.6 - 2.8 - http://team.ops4j.org/wiki/display/paxurl - - - - - - org.codehaus.mojo - retrotranslator-maven-plugin - - - - translate-project - - - jdk14 - jdk14 - true - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce - - - - (3.0.0,) - This project requires Maven 3 - - - - - - enforce - - - - - - - - - org.apache.felix - maven-bundle-plugin - - - ${wiki.url} - <_include>-osgi.bnd - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - -Xlint:all - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.2 - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - - - - - - org.apache.felix - org.osgi.service.obr - 1.0.2 - + + + + org.ops4j.base ops4j-base-lang @@ -179,7 +136,9 @@ ops4j-base-util-xml ${dependency.base.version} + + org.ops4j.pax.swissbox pax-swissbox-bnd @@ -201,46 +160,47 @@ ${dependency.swissbox.version} - - org.apache.maven.wagon - wagon-file - ${dependency.wagon.version} - + - org.apache.maven.wagon - wagon-http - ${dependency.wagon.version} + org.osgi + org.osgi.core + ${dependency.osgicore.version} - - org.apache.httpcomponents - httpclient - 4.3.6 + org.osgi + org.osgi.compendium + ${dependency.osgicomp.version} + + + - org.apache.httpcomponents - httpcore - 4.3.3 + org.apache.felix + org.osgi.service.obr + ${dependency.obr.version} + + + - org.apache.maven.wagon - wagon-provider-api - ${dependency.wagon.version} + biz.aQute.bnd + bndlib + ${dependency.bndlib.version} + + org.codehaus.plexus plexus-utils 3.0.17 - org.sonatype.plexus plexus-sec-dispatcher 1.4 - org.sonatype.plexus plexus-cipher @@ -252,31 +212,26 @@ aether-api ${dependency.aether.version} - org.eclipse.aether aether-impl ${dependency.aether.version} - org.eclipse.aether aether-spi ${dependency.aether.version} - org.eclipse.aether aether-util ${dependency.aether.version} - org.eclipse.aether aether-connector-basic ${dependency.aether.version} - org.eclipse.aether aether-transport-wagon @@ -298,7 +253,6 @@ maven-aether-provider ${dependency.maven.version} - org.apache.maven maven-settings-builder @@ -306,10 +260,36 @@ - biz.aQute.bnd - bndlib - ${dependency.bndlib.version} + org.apache.maven.wagon + wagon-file + ${dependency.wagon.version} + + + org.apache.maven.wagon + wagon-http + ${dependency.wagon.version} + + org.apache.maven.wagon + wagon-provider-api + ${dependency.wagon.version} + + + + + + + org.apache.httpcomponents + httpclient + ${dependency.httpcomponents.client} + + + org.apache.httpcomponents + httpcore + ${dependency.httpcomponents.core} + + + org.slf4j @@ -326,30 +306,16 @@ jcl-over-slf4j ${dependency.slf4j.version} + ch.qos.logback logback-classic ${dependency.logback.version} test - - commons-logging - commons-logging - 1.1.3 - - - - org.osgi - org.osgi.core - ${dependency.osgicore.version} - - - org.osgi - org.osgi.compendium - ${dependency.osgicomp.version} - + junit junit @@ -362,22 +328,111 @@ 3.1 test + - - - - false - - - true - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/ops4j-snapshots - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.plugin.maven-compiler-plugin} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.plugin.maven-javadoc-plugin} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${version.plugin.maven-enforcer-plugin} + + + org.apache.maven.plugins + maven-shade-plugin + ${version.plugin.maven-shade-plugin} + + + org.apache.maven.plugins + maven-site-plugin + ${version.plugin.maven-site-plugin} + + + + org.apache.felix + maven-bundle-plugin + ${version.plugin.felix.maven-bundle-plugin} + + + + com.mycila + license-maven-plugin + ${version.plugin.mycila.license-maven-plugin} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + -Xlint:all + + 1.7 + 1.7 + + + + + org.apache.felix + maven-bundle-plugin + + NONE + + ${wiki.url} + <_include>-osgi.bnd + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce + validate + + enforce + + + + + [3.0.0,) + This project requires Maven 3 + + + [1.7,) + + + + + + + + + + ${wiki.url} + + + jira + https://ops4j1.jira.com/projects/PAXURL/summary/statistics + @@ -416,30 +471,84 @@ UTC+1 + + ggrzybek + Grzegorz Grzybek + gr.grzybek@gmail.com + + Developer + + UTC+1 + - - + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/ops4j-snapshots + + false + + + true + + + + + + - jdk8 - - 1.8 - + license - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - + + + com.mycila + license-maven-plugin + + true + true +
license-header.txt
+ + src/main/java/**/*.java + src/test/java/**/*.java + + pom.xml + **/*.xml + **/*.cfg + **/*.properties + + + + + + + license-headers.xml + +
+ + + license-format + process-sources + + format + + + + license-check + + verify + + check + + + +
+
+
-