zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin-brave-karaf] branch master updated: Switches build to Apache repositories (#16)
Date Thu, 31 Jan 2019 10:56:08 GMT
This is an automated email from the ASF dual-hosted git repository.

adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new cbd41f8  Switches build to Apache repositories (#16)
cbd41f8 is described below

commit cbd41f8a5c345e15526391c9c8eb60c312f089c5
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Thu Jan 31 11:56:03 2019 +0100

    Switches build to Apache repositories (#16)
---
 .circleci/config.yml                              | 143 ----------------------
 .settings.xml                                     |  47 -------
 DISCLAIMER                                        |   5 +
 Jenkinsfile                                       |   5 +-
 RELEASE.md                                        |  41 -------
 build-support/go-offline.sh                       |  37 ------
 build-support/pom-no-crossmodule-dependencies.xsl |  29 -----
 build-support/publish-snapshot.sh                 |  26 ----
 build-support/publish-stable.sh                   |  24 ----
 build-support/trigger-publish.sh                  |  41 -------
 pom.xml                                           |  59 ++++-----
 11 files changed, 33 insertions(+), 424 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index f0befa3..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# 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.
-#
-
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/openjdk:11-jdk
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          key: maven-dependencies-{{ checksum "pom.xml" }}
-
-      - run:
-          name: Download dependencies
-          command: |
-            sudo apt-get install xsltproc
-            ./build-support/go-offline.sh
-      - save_cache:
-          key: maven-dependencies-{{ checksum "pom.xml" }}
-          paths:
-            - ~/.m2
-
-      - run:
-          name: Tests
-          # use install, as opposed to verify, to ensure invoker tests use latest code
-          command: ./mvnw clean install
-
-      - run:
-          name: Collect test reports
-          command: |
-            mkdir -p /tmp/test-reports/unit-tests/
-            find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} /tmp/test-reports/unit-tests/
\;
-
-      - store_test_results:
-          path: /tmp/test-reports/
-
-  publish_snapshot:
-    docker:
-      - image: circleci/openjdk:11-jdk
-    steps:
-      - checkout
-      - restore_cache:
-          key: maven-dependencies-{{ checksum "pom.xml" }}
-      - run:
-          name: Publish snapshot
-          command: |
-            # Guard against running this on pull requests or forks
-            [ "$CIRCLE_PROJECT_USERNAME" == "apache" ] || exit 0
-            [ -z "$CIRCLE_PR_NUMBER" ] || exit 0
-            ./build-support/publish-snapshot.sh
-
-  publish_stable:
-    docker:
-      - image: circleci/openjdk:11-jdk
-    steps:
-      - checkout
-      - restore_cache:
-          key: maven-dependencies-{{ checksum "pom.xml" }}
-      - run:
-          name: Publish stable version
-          # triples the timeout to 30 minutes as maven central sync takes a lot longer than
10m
-          no_output_timeout: 30m
-          command: |
-            # Guard against running this on pull requests or forks
-            [ "$CIRCLE_PROJECT_USERNAME" == "apache" ] || exit 0
-            [ -z "$CIRCLE_PR_NUMBER" ] || exit 0
-            ./build-support/publish-stable.sh
-
-  trigger_publish:
-    docker:
-      - image: circleci/openjdk:11-jdk
-    steps:
-      - checkout
-      - restore_cache:
-          key: maven-dependencies-{{ checksum "pom.xml" }}
-      - run:
-          name: Configure Git for release
-          command: |
-            # parameters used during release
-            # allocate commits to CI, not the owner of the deploy key
-            git config user.name "zipkinci"
-            git config user.email "zipkinci+zipkin-dev@googlegroups.com"
-            # setup https authentication credentials, used by ./mvnw release:prepare
-            git config credential.helper "store --file=.git/credentials"
-            echo "https://$GH_TOKEN:@github.com" > .git/credentials
-      - run:
-          name: Trigger publish
-          command: |
-            # Guard against running this on pull requests or forks
-            [ "$CIRCLE_PROJECT_USERNAME" == "openzipkin" ] || exit 0
-            [ -z "$CIRCLE_PR_NUMBER" ] || exit 0
-            ./build-support/trigger-publish.sh
-
-
-workflows:
-  version: 2
-  build_and_publish:
-    jobs:
-      - build:
-          filters:
-           tags:
-              only: /\d+\.\d+\.\d+/
-      - publish_snapshot:
-          requires:
-            - build
-          filters:
-            branches:
-              only: master
-      - publish_stable:
-          requires:
-            - build
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /\d+\.\d+\.\d+/
-      - trigger_publish:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /release-\d+\.\d+\.\d+/
-
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/22adbb9973299092e6ae
diff --git a/.settings.xml b/.settings.xml
deleted file mode 100644
index 4238612..0000000
--- a/.settings.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                          http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <servers>
-    <server>
-      <id>sonatype</id>
-      <username>${env.SONATYPE_USER}</username>
-      <password>${env.SONATYPE_PASSWORD}</password>
-    </server>
-    <server>
-      <id>bintray</id>
-      <username>${env.BINTRAY_USER}</username>
-      <password>${env.BINTRAY_KEY}</password>
-    </server>
-    <server>
-      <id>jfrog-snapshots</id>
-      <username>${env.BINTRAY_USER}</username>
-      <password>${env.BINTRAY_KEY}</password>
-    </server>
-    <server>
-      <id>github.com</id>
-      <username>${env.GH_USER}</username>
-      <password>${env.GH_TOKEN}</password>
-    </server>
-  </servers>
-</settings>
-
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..f73ab06
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,5 @@
+Apache Zipkin (incubating) is an effort undergoing incubation at The Apache Software Foundation
(ASF), sponsored by the Apache Incubator PMC.
+Incubation is required of all newly accepted projects until a further review indicates 
+that the infrastructure, communications, and decision making process have stabilized in a
manner consistent with other successful ASF projects. 
+While incubation status is not necessarily a reflection of the completeness or stability
of the code, 
+it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/Jenkinsfile b/Jenkinsfile
index e21450b..99e7438 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,17 +57,14 @@ pipeline {
             }
         }
 
-        /*
-        TODO uncomment and finish up the command here once we're ready to release snapshots
         stage('Publish snapshot') {
             when {
                 branch 'master'
             }
             steps {
-                sh './mvnw $TODO'
+                sh './mvnw clean deploy -Papache-release'
             }
         }
-         */
     }
 
     post {
diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index bdb1b4c..0000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Zipkin AWS Release Process
-
-This repo uses semantic versions. Please keep this in mind when choosing version numbers.
-
-1. **Alert others you are releasing**
-
-   There should be no commits made to master while the release is in progress (about 10 minutes).
Before you start
-   a release, alert others on [gitter](https://gitter.im/openzipkin/zipkin) so that they
don't accidentally merge
-   anything. If they do, and the build fails because of that, you'll have to recreate the
release tag described below.
-
-1. **Push a git tag**
-
-   The tag should be of the format `release-N.M.L`, for example `release-3.7.1`.
-
-1. **Wait for CircleCI**
-
-   This part is controlled by [`build-support/publish-stable.sh`](build-support/publish-stable.sh).
It creates a bunch of new commits, bumps
-   the version, publishes artifacts, and syncs to Maven Central. https://circleci.com/gh/openzipkin/brave
-
-## Credentials
-
-Credentials of various kind are needed for the release process to work. If you notice something
-failing due to unauthorized, re-save them as [environment variables](https://circleci.com/gh/openzipkin/brave/edit#env-vars).
-
-## First release of the year
-
-The license plugin verifies license headers of files include a copyright notice indicating
the years a file was affected.
-This information is taken from git history. There's a once-a-year problem with files that
include version numbers (pom.xml).
-When a release tag is made, it increments version numbers, then commits them to git. On the
first release of the year,
-further commands will fail due to the version increments invalidating the copyright statement.
The way to sort this out is
-the following:
-
-Before you do the first release of the year, move the SNAPSHOT version back and forth from
whatever the current is.
-In-between, re-apply the licenses.
-```bash
-$ ./mvnw versions:set -DnewVersion=1.3.3-SNAPSHOT -DgenerateBackupPoms=false
-$ ./mvnw com.mycila:license-maven-plugin:format
-$ ./mvnw versions:set -DnewVersion=1.3.2-SNAPSHOT -DgenerateBackupPoms=false
-$ git commit -am"Adjusts copyright headers for this year"
-```
-
diff --git a/build-support/go-offline.sh b/build-support/go-offline.sh
deleted file mode 100755
index 745320f..0000000
--- a/build-support/go-offline.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-# Due to https://issues.apache.org/jira/browse/MDEP-323 and cross-module dependencies,
-# we can't easily run mvn dependency:go-offline. This is a workaround for that.
-# It removes all dependencies on io.zipkin.java and ${project.groupId} using XSLT,
-# then runs go-offline on the resulting POMs.
-
-set -xeuo pipefail
-
-rm -rf go-offline-builddir
-mkdir -p go-offline-builddir
-trap "rm -rf $(pwd)/go-offline-builddir" EXIT
-
-for f in $(find . -name 'pom.xml'); do
-    echo $f
-    mkdir -p $(dirname go-offline-builddir/$f)
-    xsltproc ./build-support/pom-no-crossmodule-dependencies.xsl $f > go-offline-builddir/$f
-done
-
-cd go-offline-builddir
-../mvnw dependency:go-offline
diff --git a/build-support/pom-no-crossmodule-dependencies.xsl b/build-support/pom-no-crossmodule-dependencies.xsl
deleted file mode 100644
index bb7a4b3..0000000
--- a/build-support/pom-no-crossmodule-dependencies.xsl
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:pom="http://maven.apache.org/POM/4.0.0">
-  <xsl:template match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="pom:dependency[pom:groupId = 'org.apache.zipkin.brave.karaf']"
/>
-  <xsl:template match="pom:dependency[pom:groupId = '${project.groupId}']" />
-</xsl:stylesheet>
diff --git a/build-support/publish-snapshot.sh b/build-support/publish-snapshot.sh
deleted file mode 100755
index 6038bb2..0000000
--- a/build-support/publish-snapshot.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -euo pipefail
-set -x
-
-if ./mvnw help:evaluate -N -Dexpression=project.version | grep -v '\['  | grep -q SNAPSHOT;
then
-    ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests deploy
-else
-    echo "Not building release versions, those are built by the tag builder using the publish-stable.sh
script"
-fi
diff --git a/build-support/publish-stable.sh b/build-support/publish-stable.sh
deleted file mode 100755
index 2ea161d..0000000
--- a/build-support/publish-stable.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -euo pipefail
-set -x
-
-./mvnw -DskipTests install -nsu
-./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests deploy
-./mvnw --batch-mode -s ./.settings.xml -nsu -N io.zipkin.centralsync-maven-plugin:centralsync-maven-plugin:sync
diff --git a/build-support/trigger-publish.sh b/build-support/trigger-publish.sh
deleted file mode 100755
index 059dd95..0000000
--- a/build-support/trigger-publish.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -euo pipefail
-set -x
-
-release_version() {
-    echo "${CIRCLE_TAG}" | sed 's/^release-//'
-}
-
-safe_checkout_master() {
-  # We need to be on a branch for release:perform to be able to create commits, and we want
that branch to be master.
-  # But we also want to make sure that we build and release exactly the tagged version, so
we verify that the remote
-  # master is where our tag is.
-  git checkout -B master
-  git fetch origin master:origin/master
-  commit_local_master="$(git show --pretty='format:%H' master)"
-  commit_remote_master="$(git show --pretty='format:%H' origin/master)"
-  if [ "$commit_local_master" != "$commit_remote_master" ]; then
-    echo "Master on remote 'origin' has commits since the version under release, aborting"
-    exit 1
-  fi
-}
-
-safe_checkout_master
-./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DreleaseVersion="$(release_version)"
-Darguments="-DskipTests" release:prepare
diff --git a/pom.xml b/pom.xml
index 1cf4581..4c1ebe8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,12 +64,12 @@
 
   <name>Brave Karaf (Parent)</name>
   <description>Brave Karaf (Parent)</description>
-  <url>https://github.com/openzipkin/brave-karaf</url>
+  <url>https://github.com/apache/incubator-zipkin-brave-karaf</url>
   <inceptionYear>2016</inceptionYear>
 
   <organization>
-    <name>OpenZipkin</name>
-    <url>http://zipkin.io/</url>
+    <name>The Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
   </organization>
 
   <licenses>
@@ -81,9 +81,9 @@
   </licenses>
 
   <scm>
-    <url>https://github.com/openzipkin/brave-karaf</url>
-    <connection>scm:git:https://github.com/openzipkin/brave-karaf.git</connection>
-    <developerConnection>scm:git:https://github.com/openzipkin/brave-karaf.git</developerConnection>
+    <url>https://github.com/apache/incubator-zipkin-brave-karaf</url>
+    <connection>scm:git:https://github.com/apache/incubator-zipkin-brave-karaf.git</connection>
+    <developerConnection>scm:git:https://github.com/apache/incubator-zipkin-brave-karaf.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
 
@@ -96,20 +96,35 @@
     </developer>
   </developers>
 
+  <mailingLists>
+    <mailingList>
+      <name>Zipkin Developer List</name>
+      <post>dev@zipkin.apache.org</post>
+      <subscribe>dev-subscribe@zipkin.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@zipkin.apache.org</unsubscribe>
+    </mailingList>
+    <mailingList>
+      <name>Zipkin Commits</name>
+      <post>commits@zipkin.apache.org</post>
+      <subscribe>commits-subscribe@zipkin.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@zipkin.apache.org</unsubscribe>
+    </mailingList>
+  </mailingLists>
+
   <distributionManagement>
     <repository>
-      <id>bintray</id>
-      <url>https://api.bintray.com/maven/openzipkin/maven/brave-karaf/;publish=1</url>
+      <id>apache.releases</id>
+      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
     </repository>
     <snapshotRepository>
-      <id>jfrog-snapshots</id>
-      <url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url>
+      <id>apache.snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
 
   <issueManagement>
     <system>Github</system>
-    <url>https://github.com/openzipkin/brave-karaf/issues</url>
+    <url>https://github.com/apache/incubator-zipkin-brave-karaf/issues</url>
   </issueManagement>
 
   <dependencyManagement>
@@ -211,7 +226,6 @@
     </dependency>
   </dependencies>
 
-
   <build>
     <pluginManagement>
       <plugins>
@@ -339,6 +353,7 @@
             <exclude>etc/header.txt</exclude>
             <exclude>**/.idea/**</exclude>
             <exclude>LICENSE</exclude>
+            <exclude>DISCLAIMER</exclude>
             <exclude>**/*.md</exclude>
           </excludes>
           <strictCheck>true</strictCheck>
@@ -423,26 +438,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <useReleaseProfile>false</useReleaseProfile>
-          <releaseProfiles>release</releaseProfiles>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <tagNameFormat>@{project.version}</tagNameFormat>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>io.zipkin.centralsync-maven-plugin</groupId>
-        <artifactId>centralsync-maven-plugin</artifactId>
-        <version>0.1.0</version>
-        <configuration>
-          <packageName>brave-karaf</packageName>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 


Mime
View raw message