Fix missing sources (#66)

* Fix missing sources
pambrose · Jun 27, 2021 · e0cec17 · e0cec17
1 parent ccca0ec
commit e0cec17
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.10.0
+VERSION=1.10.1
 
 default: compile
 

diff --git a/README.md b/README.md
@@ -108,8 +108,8 @@ scrape_configs:
 The docker images are available via:
 
 ```bash
-docker pull pambrose/prometheus-proxy:1.10.0
-docker pull pambrose/prometheus-agent:1.10.0
+docker pull pambrose/prometheus-proxy:1.10.1
+docker pull pambrose/prometheus-agent:1.10.1
 ```
 
 Start a proxy container with:
@@ -118,15 +118,15 @@ Start a proxy container with:
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
         --env ADMIN_ENABLED=true \
         --env METRICS_ENABLED=true \
-        pambrose/prometheus-proxy:1.10.0
+        pambrose/prometheus-proxy:1.10.1
 ```
 
 Start an agent container with:
 
 ```bash
 docker run --rm -p 8083:8083 -p 8093:8093 \
         --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-        pambrose/prometheus-agent:1.10.0
+        pambrose/prometheus-agent:1.10.1
 ```
 
 Using the config
@@ -144,7 +144,7 @@ is in your current directory, run an agent container with:
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/prom-agent.conf,target=/app/prom-agent.conf \
     --env AGENT_CONFIG=prom-agent.conf \
-    pambrose/prometheus-agent:1.10.0
+    pambrose/prometheus-agent:1.10.1
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the
@@ -283,15 +283,15 @@ docker run --rm -p 8082:8082 -p 8092:8092 -p 50440:50440 -p 8080:8080 \
     --env PROXY_CONFIG=tls-no-mutual-auth.conf \
     --env ADMIN_ENABLED=true \
     --env METRICS_ENABLED=true \
-    pambrose/prometheus-proxy:1.10.0
+    pambrose/prometheus-proxy:1.10.1
 
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/testing/certs,target=/app/testing/certs \
     --mount type=bind,source="$(pwd)"/examples/tls-no-mutual-auth.conf,target=/app/tls-no-mutual-auth.conf \
     --env AGENT_CONFIG=tls-no-mutual-auth.conf \
     --env PROXY_HOSTNAME=mymachine.lan:50440 \
     --name docker-agent \
-    pambrose/prometheus-agent:1.10.0
+    pambrose/prometheus-agent:1.10.1
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the

diff --git a/bin/docker-agent.sh b/bin/docker-agent.sh
@@ -3,4 +3,4 @@
 docker run --rm -p 8083:8083 -p 8093:8093 \
   --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
   --env PROXY_HOSTNAME=mymachine.lan \
-  pambrose/prometheus-agent:1.10.0
+  pambrose/prometheus-agent:1.10.1
diff --git a/bin/docker-proxy.sh b/bin/docker-proxy.sh
@@ -2,4 +2,4 @@
 
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
   --env PROXY_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-  pambrose/prometheus-proxy:1.10.0
+  pambrose/prometheus-proxy:1.10.1
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = 'io.prometheus'
-version = '1.10.0'
+version = '1.10.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -84,7 +84,7 @@ dependencies {
 buildConfig {
     buildConfigField('String', 'APP_NAME', "\"${project.name}\"")
     buildConfigField('String', 'APP_VERSION', "\"${project.version}\"")
-    buildConfigField('String', 'APP_RELEASE_DATE', "\"6/25/21\"")
+    buildConfigField('String', 'APP_RELEASE_DATE', "\"6/26/21\"")
 }
 
 compileKotlin.dependsOn ':generateProto'
@@ -121,15 +121,15 @@ configurations.all {
 
 //startScripts.enabled = false
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    from sourceSets.main.allJava
-    archiveClassifier.set("sources")
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set("javadoc")
-    from javadoc.destinationDir
-}
+//task sourcesJar(type: Jar, dependsOn: classes) {
+//    from sourceSets.main.allJava
+//    archiveClassifier.set("sources")
+//}
+//
+//task javadocJar(type: Jar, dependsOn: javadoc) {
+//    archiveClassifier.set("javadoc")
+//    from javadoc.destinationDir
+//}
 
 //publishing {
 //    publications {
@@ -143,15 +143,25 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 //    }
 //}
 
-//java {
-//    withSourcesJar()
-//}
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
 
 artifacts {
     archives sourcesJar
     //archives javadocJar
 }
 
+java {
+    withSourcesJar()
+}
+
 //jacocoTestReport {
 //    reports {
 //        xml.enabled true

diff --git a/etc/compose/proxy.yml b/etc/compose/proxy.yml
@@ -1,6 +1,6 @@
 prometheus-proxy:
   autoredeploy: true
-  image: 'pambrose/prometheus-proxy:1.10.0'
+  image: 'pambrose/prometheus-proxy:1.10.1'
   ports:
     - '8080:8080'
     - '8082:8082'

diff --git a/gradle.properties b/gradle.properties
@@ -22,5 +22,5 @@ prometheus_version=0.11.0
 protoc_version=3.12.4
 slf4j_version=1.7.30
 typesafe_version=1.4.1
-utils_version=1.14.0
+utils_version=1.15.0
 zipkin_version=5.13.3