From 250e9a4f246dd655a66bde39a1085a89873b8cc7 Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 9 Aug 2016 15:00:34 +0200 Subject: [PATCH 1/2] make snapshot deployment working --- jsprit-analysis/pom.xml | 2 +- jsprit-core/pom.xml | 2 +- jsprit-examples/pom.xml | 2 +- jsprit-instances/pom.xml | 2 +- jsprit-io/pom.xml | 4 +- pom.xml | 224 ++++++++++++++++++--------------------- 6 files changed, 112 insertions(+), 124 deletions(-) diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index ca819f59..dc12d885 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -18,7 +18,7 @@ - jsprit + com.graphhopper jsprit 1.6.3-SNAPSHOT diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index 230c89bf..5e2d2512 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -19,7 +19,7 @@ - jsprit + com.graphhopper jsprit 1.6.3-SNAPSHOT diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index cef68457..0600d0d3 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -18,7 +18,7 @@ - jsprit + com.graphhopper jsprit 1.6.3-SNAPSHOT diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 7c961885..5f7aace3 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -18,7 +18,7 @@ - jsprit + com.graphhopper jsprit 1.6.3-SNAPSHOT diff --git a/jsprit-io/pom.xml b/jsprit-io/pom.xml index 5fd2277d..343cfe84 100644 --- a/jsprit-io/pom.xml +++ b/jsprit-io/pom.xml @@ -21,8 +21,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - jsprit - jsprit + com.graphhopper + jsprit 1.6.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f4fd1fb7..430ea49b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,26 @@ +~ Licensed to GraphHopper GmbH under one or more contributor +~ license agreements. See the NOTICE file distributed with this work for +~ additional information regarding copyright ownership. +~ +~ GraphHopper GmbH 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. +--> 4.0.0 - jsprit + com.graphhopper jsprit 1.6.3-SNAPSHOT @@ -33,15 +33,15 @@ - GNU Lesser General Public Licence, version 3.0 - http://opensource.org/licenses/LGPL-3.0 + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 Stefan Schroeder - stefan.schroeder@graphhopper.com + my.name@graphhopper.com @@ -61,18 +61,6 @@ https://github.com/jsprit/jsprit/issues - - - jsprit-snapshots - https://github.com/jsprit/mvn-rep/raw/master/snapshots - - - - jsprit-releases - https://github.com/jsprit/mvn-rep/raw/master/releases - - - jsprit-core jsprit-analysis @@ -110,67 +98,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins maven-compiler-plugin @@ -212,21 +140,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - org.apache.maven.plugins - maven-source-plugin - 2.4 - org.apache.maven.plugins maven-assembly-plugin @@ -238,16 +151,6 @@ 2.6 - - org.apache.maven.plugins - maven-release-plugin - 2.5 - - v@{project.version} - - - - @@ -264,7 +167,6 @@ - junit @@ -281,6 +183,92 @@ + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + + + + + release + + false + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.0 + + + attach-sources + + jar-no-fork + + + + + + + + From 742dcf533b7280616b1ac11dbe3d3cf5094971da Mon Sep 17 00:00:00 2001 From: oblonski Date: Thu, 11 Aug 2016 12:11:14 +0200 Subject: [PATCH 2/2] refine scm and issuemanagement --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 430ea49b..bff8d36e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,15 +50,15 @@ - scm:git:git@github.com:jsprit/jsprit.git - scm:git:https://github.com/jsprit/jsprit.git - http://github.com/jsprit/jsprit/tree/master + scm:git:git@github.com:graphhopper/jsprit.git + scm:git:https://github.com/graphhopper/jsprit.git + http://github.com/graphhopper/jsprit/tree/master HEAD github - https://github.com/jsprit/jsprit/issues + https://github.com/graphhopper/jsprit/issues @@ -183,7 +183,7 @@ - + - + ossrh https://oss.sonatype.org/content/repositories/snapshots - - + + @@ -239,7 +239,7 @@ true - + org.apache.maven.plugins maven-javadoc-plugin