From 5cfcf465e2fbe2b057016cceb997106660b75b48 Mon Sep 17 00:00:00 2001 From: sseifert Date: Tue, 22 Mar 2016 18:19:36 +0100 Subject: [PATCH 01/22] =?UTF-8?q?[jgitflow-maven-plugin]=C2=A0updating=20p?= =?UTF-8?q?oms=20for=201.1.1-SNAPSHOT=20development?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 5b7b226..97c8692 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy - 1.0.1-SNAPSHOT + 1.1.1-SNAPSHOT jar Maven NodeJS Proxy diff --git a/pom.xml b/pom.xml index efddc69..c32fc28 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy.root - 1.0.1-SNAPSHOT + 1.1.1-SNAPSHOT pom Maven NodeJS Proxy Root From c4bacd603aec5d45e4b39d54f53fd1a697f0c34e Mon Sep 17 00:00:00 2001 From: sseifert Date: Tue, 22 Mar 2016 18:24:08 +0100 Subject: [PATCH 02/22] =?UTF-8?q?[jgitflow-maven-plugin]=C2=A0updating=20d?= =?UTF-8?q?evelop=20poms=20to=20master=20versions=20to=20avoid=20merge=20c?= =?UTF-8?q?onflicts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 97c8692..02030b2 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy - 1.1.1-SNAPSHOT + 1.1.0 jar Maven NodeJS Proxy diff --git a/pom.xml b/pom.xml index c32fc28..83d5691 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy.root - 1.1.1-SNAPSHOT + 1.1.0 pom Maven NodeJS Proxy Root From 92548a0b0dc6846e114709ac74108ec0123d17ae Mon Sep 17 00:00:00 2001 From: sseifert Date: Tue, 22 Mar 2016 18:24:09 +0100 Subject: [PATCH 03/22] =?UTF-8?q?[jgitflow-maven-plugin]=C2=A0Updating=20d?= =?UTF-8?q?evelop=20poms=20back=20to=20pre=20merge=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 02030b2..97c8692 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy - 1.1.0 + 1.1.1-SNAPSHOT jar Maven NodeJS Proxy diff --git a/pom.xml b/pom.xml index 83d5691..c32fc28 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy.root - 1.1.0 + 1.1.1-SNAPSHOT pom Maven NodeJS Proxy Root From 38b245e96945ee5b048730fc1aebeb7e21c08666 Mon Sep 17 00:00:00 2001 From: sseifert Date: Tue, 22 Mar 2016 18:45:10 +0100 Subject: [PATCH 04/22] remove dot after version info --- .../wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java index bd75cd3..3630308 100644 --- a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java +++ b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java @@ -81,7 +81,7 @@ public static String build(MavenProxyConfiguration config) { + exampleUrlsMarkup + "" + "

For all files SHA1 checksums are supported (.sha1 suffix). MD5 checksums are not supported.

" - + (serviceVersion != null ? "

Version " + IndexPageBuilder.class.getPackage().getImplementationVersion() + ".

" : "") + + (serviceVersion != null ? "

Version " + IndexPageBuilder.class.getPackage().getImplementationVersion() + "

" : "") + "" + ""; } From 5885c43f90ee627d1f1c25dcac1f4fa1eabc2f39 Mon Sep 17 00:00:00 2001 From: sseifert Date: Tue, 22 Mar 2016 21:58:48 +0100 Subject: [PATCH 05/22] fix typos --- .../maven/nodejsproxy/resource/IndexPageBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java index 3630308..be36d60 100644 --- a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java +++ b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java @@ -56,7 +56,6 @@ public static String build(MavenProxyConfiguration config) { url = StringUtils.replace(url, "${nodeJsSampleVersion}", config.getNodeJsSampleVersion()); url = StringUtils.replace(url, "${npmSampleVersion}", config.getNpmSampleVersion()); exampleUrlsMarkup.append("
  • ").append(url).append("
    • "); - } String serviceVersion = IndexPageBuilder.class.getPackage().getImplementationVersion(); @@ -70,13 +69,13 @@ public static String build(MavenProxyConfiguration config) { + "

    Maven NodeJS Proxy

    " + "

    This is a Maven Artifact Proxy for NodeJS binaries located at: " + "" + config.getNodeJsBinariesRootUrl() + "

    " - + "

    Every call to this repository is routed directly to this URL.

    " - + "

    Please never use this Maven repository directly in your maven builds, but only via an Repository Manager " + + "

    Every call to this Maven repository is routed directly to the NodeJS distribution server.

    " + + "

    Please never use this Maven repository directly in your maven builds, use it only via a Repository Manager " + "which caches the resolved artifacts.

    " + "

    If you want to setup your own proxy get the source code: " + "https://github.com/wcm-io-devops/maven-nodejs-proxy

    " + "
    " - + "

    Examples:

    " + + "

    Example artifacts:

    " + "
      " + exampleUrlsMarkup + "
    " From 6d4afb2fb27b0b74266f227d00e6addab8459dc0 Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 9 Feb 2017 21:31:51 +0100 Subject: [PATCH 06/22] update dependency --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 97c8692..5c3fb64 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.2 + 1.0.4 diff --git a/pom.xml b/pom.xml index c32fc28..35aad6c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.2 + 1.0.4 From b20dbb949cc5a79045daa7cb2d46e7acc19777fb Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 23 Feb 2017 13:21:15 +0100 Subject: [PATCH 07/22] update .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8235d3e..956ee98 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ pom.xml.versionsBackup pom.xml.next release.properties maven-eclipse.xml +infinitest.filters node_modules/ npm-debug.log @@ -17,10 +18,12 @@ npm-debug.log .pmd .checkstyle .idea -.iml +.vagrant +*.iml .DS_Store .rubygems .sass-cache .rubygems-gem-maven-plugin *.sublime-* +*nbactions*.xml .temp/ From 9d886a79e27799d6e29a430af3ba68e44ef3cfc6 Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 19 Oct 2017 22:37:41 +0200 Subject: [PATCH 08/22] update dependency --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 5c3fb64..7f8b960 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.4 + 1.0.8 diff --git a/pom.xml b/pom.xml index 35aad6c..0057109 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.4 + 1.0.8 From ad5bb7c1dcb47f07196bd7f21bda70983433ceb6 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Fri, 1 Dec 2017 11:27:48 +0100 Subject: [PATCH 09/22] Update readme with link to new ansible-maven-nodejs-proxy role --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ada9d14..05426d9 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,6 @@ Steps to build and start the proxy: --- A public instance of this proxy is available at: https://maven-nodejs-proxy.pvtool.org/ + +A Ansible role for this proxy is available at: +https://github.com/wcm-io-devops/ansible-maven-nodejs-proxy From 5ca847c2bfa40309ab6c0963eee025ceaaeb5636 Mon Sep 17 00:00:00 2001 From: sseifert Date: Mon, 4 Dec 2017 13:24:39 +0100 Subject: [PATCH 10/22] fix regex for release tags (without xyz- prefix) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a55b1a..5de354c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,10 @@ script: # Remove wcm.io artefacts from repository before cache - rm -rf $HOME/.m2/repository/io/wcm -# exlude release tags like xyz-1.0.0 or xyz-1 +# exlude release tags like 1.0.0 branches: except: - - /^.*\-\d+(\.\d+\.\d+)?(\..*|\-.*)?$/ + - /^\d+(\.\d+\.\d+)?(\..*|\-.*)?$/ # Cache Maven Repository cache: From 305f3f759554ae401ad831e3bff41f0ad095e08a Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 11 Jan 2018 15:39:39 +0100 Subject: [PATCH 11/22] update parent dependency --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 7f8b960..a344df6 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.8 + 1.0.9-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0057109..b049edc 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.8 + 1.0.9-SNAPSHOT From 23546b5852c180c837ec391ecf2d6147ce63eeda Mon Sep 17 00:00:00 2001 From: sseifert Date: Mon, 15 Jan 2018 11:04:39 +0100 Subject: [PATCH 12/22] update dependency --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index a344df6..4aa580b 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.9-SNAPSHOT + 1.0.10 diff --git a/pom.xml b/pom.xml index b049edc..ab137b0 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.9-SNAPSHOT + 1.0.10 From 72c8db6115f18d6455e05cdf5bd59491ef570873 Mon Sep 17 00:00:00 2001 From: sseifert Date: Tue, 10 Apr 2018 10:17:58 +0200 Subject: [PATCH 13/22] normalize whitespaces --- maven-nodejs-proxy/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 4aa580b..2dae3d3 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -61,7 +61,7 @@ ${dropwizard.version} test - + commons-io commons-io @@ -84,10 +84,10 @@ - + - + org.apache.maven.plugins maven-shade-plugin @@ -120,8 +120,8 @@ - - + + org.apache.maven.plugins maven-jar-plugin From 90924ef7dc74dec5b1d7e79af7a09a930d58dac7 Mon Sep 17 00:00:00 2001 From: sseifert Date: Wed, 11 Jul 2018 21:26:00 +0200 Subject: [PATCH 14/22] update dependencies --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 2dae3d3..f7435df 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.10 + 1.1.0 diff --git a/pom.xml b/pom.xml index ab137b0..0fb2bf9 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.0.10 + 1.1.0 From bf69283a2ca8b09517a4d99c4c01b7c9d4d1e6a0 Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 7 Mar 2019 10:25:36 +0100 Subject: [PATCH 15/22] add java11 build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5de354c..a3c9c14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ language: java jdk: - oraclejdk8 +- oraclejdk11 # Make sure travis can use container-based infrastructure sudo: false From d540f470b796af458f8275bb536e674bbcef7678 Mon Sep 17 00:00:00 2001 From: sseifert Date: Sun, 10 Mar 2019 17:43:31 +0100 Subject: [PATCH 16/22] make build compatible with Java 11 --- .travis.yml | 4 ++-- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3c9c14..27a3a2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ language: java jdk: - oraclejdk8 -- oraclejdk11 +- openjdk11 # Make sure travis can use container-based infrastructure sudo: false @@ -29,7 +29,7 @@ sudo: false install: "mvn -s ./.travis.maven-settings.xml clean" script: -- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U -Dmaven.javadoc.skip=true install" +- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U install" # Remove wcm.io artefacts from repository before cache - rm -rf $HOME/.m2/repository/io/wcm diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index f7435df..bca5b5a 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.1.0 + 1.1.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0fb2bf9..cdfec14 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.1.0 + 1.1.1-SNAPSHOT From 16977e552e709fd4ae592aa74a8492e33b2f90eb Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 14 Mar 2019 23:45:24 +0100 Subject: [PATCH 17/22] update dependencies --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index bca5b5a..42a62cb 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.1.1-SNAPSHOT + 1.1.2 diff --git a/pom.xml b/pom.xml index cdfec14..3037d9a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.1.1-SNAPSHOT + 1.1.2 From c570b0a66453f4e72fc2ad3cf376be12d8a28b0d Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 4 Apr 2019 21:23:51 +0200 Subject: [PATCH 18/22] Add support for downloading Windows NodeJS binaries as ZIP including NPM which is available since Node 6.3.0. --- changes.xml | 6 +++ maven-nodejs-proxy/config.yml | 2 +- .../resource/IndexPageBuilder.java | 49 +++++++++---------- .../resource/MavenProxyResource.java | 10 ++-- .../resource/MavenProxyResourceTest.java | 14 +++--- 5 files changed, 44 insertions(+), 37 deletions(-) diff --git a/changes.xml b/changes.xml index 491ab1c..267cf9d 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Add support for downloading Windows NodeJS binaries as ZIP including NPM which is available since Node 6.3.0. + + + Binary File Structre changed in NPM Versions > 0.x and support for SHA-256 checksums. diff --git a/maven-nodejs-proxy/config.yml b/maven-nodejs-proxy/config.yml index c4a0fa5..8477f93 100644 --- a/maven-nodejs-proxy/config.yml +++ b/maven-nodejs-proxy/config.yml @@ -24,7 +24,7 @@ npmBinariesUrl: "/npm/npm-${version}.${type}" nodeJsChecksumUrl: "/v${version}/SHASUMS256.txt" # Sample versions for index page -nodeJsSampleVersion: 4.4.0 +nodeJsSampleVersion: 10.15.0 npmSampleVersion: 1.4.9 # HTTP Client settings diff --git a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java index be36d60..aeb91a8 100644 --- a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java +++ b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/IndexPageBuilder.java @@ -30,9 +30,8 @@ public final class IndexPageBuilder { private static final String[] EXAMPLE_URLS = new String[] { "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}.pom", - "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}-windows-x86.exe", - "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}-windows-x64.exe", - "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}-linux-x86.tar.gz", + "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}-win-x86.zip", + "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}-win-x64.zip", "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}-linux-x64.tar.gz", "${groupIdPath}/${nodeJsArtifactId}/${nodeJsSampleVersion}/${nodeJsArtifactId}-${nodeJsSampleVersion}-darwin-x64.tar.gz", "${groupIdPath}/${npmArtifactId}/${npmSampleVersion}/${npmArtifactId}-${npmSampleVersion}.pom", @@ -61,28 +60,28 @@ public static String build(MavenProxyConfiguration config) { String serviceVersion = IndexPageBuilder.class.getPackage().getImplementationVersion(); return "\n" - + "" - + "Maven NodeJS Proxy" - + "" - + "" - + "" - + "

    Maven NodeJS Proxy

    " - + "

    This is a Maven Artifact Proxy for NodeJS binaries located at: " - + "" + config.getNodeJsBinariesRootUrl() + "

    " - + "

    Every call to this Maven repository is routed directly to the NodeJS distribution server.

    " - + "

    Please never use this Maven repository directly in your maven builds, use it only via a Repository Manager " - + "which caches the resolved artifacts.

    " - + "

    If you want to setup your own proxy get the source code: " - + "https://github.com/wcm-io-devops/maven-nodejs-proxy

    " - + "
    " - + "

    Example artifacts:

    " - + "
      " - + exampleUrlsMarkup - + "
    " - + "

    For all files SHA1 checksums are supported (.sha1 suffix). MD5 checksums are not supported.

    " - + (serviceVersion != null ? "

    Version " + IndexPageBuilder.class.getPackage().getImplementationVersion() + "

    " : "") - + "" - + ""; + + "" + + "Maven NodeJS Proxy" + + "" + + "" + + "" + + "

    Maven NodeJS Proxy

    " + + "

    This is a Maven Artifact Proxy for NodeJS binaries located at: " + + "" + config.getNodeJsBinariesRootUrl() + "

    " + + "

    Every call to this Maven repository is routed directly to the NodeJS distribution server.

    " + + "

    Please never use this Maven repository directly in your maven builds, use it only via a Repository Manager " + + "which caches the resolved artifacts.

    " + + "

    If you want to setup your own proxy get the source code: " + + "https://github.com/wcm-io-devops/maven-nodejs-proxy

    " + + "
    " + + "

    Example artifacts:

    " + + "
      " + + exampleUrlsMarkup + + "
    " + + "

    For all files SHA1 checksums are supported (.sha1 suffix). MD5 checksums are not supported.

    " + + (serviceVersion != null ? "

    Version " + IndexPageBuilder.class.getPackage().getImplementationVersion() + "

    " : "") + + "" + + ""; } } diff --git a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResource.java b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResource.java index 6329f74..c3c5e43 100644 --- a/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResource.java +++ b/maven-nodejs-proxy/src/main/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResource.java @@ -206,7 +206,7 @@ public Response getBinary( } String url = buildBinaryUrl(artifactType, version, null, null, StringUtils.removeEnd(type, ".sha1")); - return getBinary(url, version, getChecksum, null); + return getBinary(url, getChecksum, null); } private Response getBinaryWithChecksumValidation(String url, String version, boolean getChecksum) throws IOException { @@ -222,10 +222,10 @@ private Response getBinaryWithChecksumValidation(String url, String version, boo return Response.status(Response.Status.NOT_FOUND).build(); } - return getBinary(url, version, getChecksum, checksum); + return getBinary(url, getChecksum, checksum); } - private Response getBinary(String url, String version, boolean getChecksum, String expectedChecksum) throws IOException { + private Response getBinary(String url, boolean getChecksum, String expectedChecksum) throws IOException { log.info("Proxy file: {}", url); HttpGet get = new HttpGet(url); HttpResponse response = httpClient.execute(get); @@ -335,7 +335,7 @@ private String buildBinaryUrl(ArtifactType artifactType, String version, String String url; switch (artifactType) { case NODEJS: - if (StringUtils.equals(os, "windows")) { + if (StringUtils.equals(os, "windows") && StringUtils.equals(type, "exe")) { if (isVersion4Up(version)) { url = config.getNodeJsBinariesUrlWindows(); } @@ -358,7 +358,7 @@ else if (StringUtils.equals(arch, "x86")) { } url = config.getNodeJsBinariesRootUrl() + url; url = StringUtils.replace(url, "${version}", StringUtils.defaultString(version)); - url = StringUtils.replace(url, "${os}", StringUtils.defaultString(os)); + url = StringUtils.replace(url, "${os}", StringUtils.defaultString(StringUtils.replace(os, "windows", "win"))); url = StringUtils.replace(url, "${arch}", StringUtils.defaultString(arch)); url = StringUtils.replace(url, "${type}", StringUtils.defaultString(type)); return url; diff --git a/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResourceTest.java b/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResourceTest.java index 63ed700..e87e5bf 100644 --- a/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResourceTest.java +++ b/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/MavenProxyResourceTest.java @@ -36,18 +36,20 @@ import io.dropwizard.testing.junit.ResourceTestRule; - public class MavenProxyResourceTest { // test with the following NodeJS and NPM versions private static final String[] NODEJS_VERSIONS = { - "0.12.0", - "4.4.0" + "6.3.0", + "10.15.0" }; private static final String[] NODEJS_TARGETS = { + "-windows-x86.zip", + "-windows-x64.zip", + "-win-x86.zip", + "-win-x64.zip", "-windows-x86.exe", "-windows-x64.exe", - "-linux-x86.tar.gz", "-linux-x64.tar.gz", "-darwin-x64.tar.gz" }; @@ -60,8 +62,8 @@ public class MavenProxyResourceTest { @Rule public ResourceTestRule context = new ResourceTestRule.Builder() - .addResource(new MavenProxyResource(TestContext.getConfiguration(), TestContext.getHttpClient())) - .build(); + .addResource(new MavenProxyResource(TestContext.getConfiguration(), TestContext.getHttpClient())) + .build(); @Test public void testGetIndex() { From feadcf3a2728a7de9b33478849ed413e9b7a74e8 Mon Sep 17 00:00:00 2001 From: sseifert Date: Thu, 4 Apr 2019 21:37:31 +0200 Subject: [PATCH 19/22] Update to dropwizard 1.3.9. --- changes.xml | 3 +++ maven-nodejs-proxy/pom.xml | 6 +++--- .../wcm/devops/maven/nodejsproxy/resource/TestContext.java | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes.xml b/changes.xml index 267cf9d..69efe09 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Add support for downloading Windows NodeJS binaries as ZIP including NPM which is available since Node 6.3.0. + + Update to dropwizard 1.3.9. +     diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 42a62cb..c1e39d8 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -38,7 +38,7 @@ Maven proxy to download NodeJS binaries as Maven artifacts. - 0.9.2 + 1.3.9 @@ -65,14 +65,14 @@ commons-io commons-io - 2.4 + 2.6 compile commons-codec commons-codec - 1.10 + 1.12 compile diff --git a/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/TestContext.java b/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/TestContext.java index f2311d5..2b7cf97 100644 --- a/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/TestContext.java +++ b/maven-nodejs-proxy/src/test/java/io/wcm/devops/maven/nodejsproxy/resource/TestContext.java @@ -29,6 +29,7 @@ import io.dropwizard.configuration.ConfigurationException; import io.dropwizard.configuration.ConfigurationFactory; +import io.dropwizard.configuration.YamlConfigurationFactory; import io.dropwizard.jackson.Jackson; import io.wcm.devops.maven.nodejsproxy.MavenProxyConfiguration; @@ -41,7 +42,7 @@ private TestContext() { } static MavenProxyConfiguration getConfiguration() { - ConfigurationFactory factory = new ConfigurationFactory( + ConfigurationFactory factory = new YamlConfigurationFactory( MavenProxyConfiguration.class, null, OBJECT_MAPPER, "override"); try { File configFile = new File("config.yml"); From 5cb0be175b1759d3f80acc52ebab72c07835d355 Mon Sep 17 00:00:00 2001 From: sseifert Date: Fri, 5 Apr 2019 00:28:40 +0200 Subject: [PATCH 20/22] prepare release --- changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index 69efe09..be05b66 100644 --- a/changes.xml +++ b/changes.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + Add support for downloading Windows NodeJS binaries as ZIP including NPM which is available since Node 6.3.0. From e33d3b5d7ed10e8c117f3dc575aec3f7ae63741d Mon Sep 17 00:00:00 2001 From: sseifert Date: Fri, 5 Apr 2019 00:29:46 +0200 Subject: [PATCH 21/22] =?UTF-8?q?[jgitflow-maven-plugin]=C2=A0updating=20p?= =?UTF-8?q?oms=20for=201.2.0=20branch=20with=20snapshot=20versions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index c1e39d8..2194824 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT jar Maven NodeJS Proxy diff --git a/pom.xml b/pom.xml index 3037d9a..e3d8842 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy.root - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT pom Maven NodeJS Proxy Root From 8fa83b57429989fb9c38afbef9b85eb5234b3a1f Mon Sep 17 00:00:00 2001 From: sseifert Date: Fri, 5 Apr 2019 00:29:47 +0200 Subject: [PATCH 22/22] =?UTF-8?q?[jgitflow-maven-plugin]=C2=A0updating=20p?= =?UTF-8?q?oms=20for=20branch'release/1.2.0'=20with=20non-snapshot=20versi?= =?UTF-8?q?ons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven-nodejs-proxy/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-nodejs-proxy/pom.xml b/maven-nodejs-proxy/pom.xml index 2194824..a45ac04 100644 --- a/maven-nodejs-proxy/pom.xml +++ b/maven-nodejs-proxy/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy - 1.2.0-SNAPSHOT + 1.2.0 jar Maven NodeJS Proxy diff --git a/pom.xml b/pom.xml index e3d8842..a8ce129 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.maven io.wcm.devops.maven.nodejs-proxy.root - 1.2.0-SNAPSHOT + 1.2.0 pom Maven NodeJS Proxy Root