From 1aac8410ab85e418822d429aa8ec547cdc10866b Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:35:39 +0530 Subject: [PATCH 1/5] D-20684: Fixed the Same Checksum for all the Folder type dar imports --- build.gradle | 10 +++++++-- .../deployit/ci/dar/RemotePackaging.java | 22 +++---------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 51b865a..b26d11f 100644 --- a/build.gradle +++ b/build.gradle @@ -123,16 +123,22 @@ configurations { } ext { - xlPlatformVersion = "10.0.14" + xlPlatformVersion = "2017.6.0" } dependencies { + // https://mvnrepository.com/artifact/com.typesafe/config + compile 'com.typesafe:config:1.3.0' compile "com.xebialabs.deployit.engine:packager:$xlPlatformVersion" compile "com.xebialabs.deployit:engine-api:$xlPlatformVersion" compile "com.xebialabs.deployit.engine:remote-booter:$xlPlatformVersion" compile "org.jdom:jdom2:2.0.5" provided 'org.slf4j:slf4j-api:1.7.7' - + compile "de.schlichtherle.truezip:truezip-driver-file" + compile "de.schlichtherle.truezip:truezip-driver-zip" + compile "de.schlichtherle.truezip:truezip-driver-tar:7.7.10" + compile "de.schlichtherle.truezip:truezip-file" + compile "de.schlichtherle.truezip:truezip-kernel" jenkinsPlugins "org.jenkins-ci.plugins:credentials:1.16.1@jar" jenkinsPlugins "org.jenkins-ci.plugins.workflow:workflow-step-api:1.10@jar" diff --git a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java index 184ebde..77eba2a 100644 --- a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java +++ b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java @@ -61,8 +61,8 @@ public class RemotePackaging implements Callable { private BooterConfig booterConfig; private Collection descriptors; private String registryVersion; - private Function0 messageDigest; - private static final Logger logger = LoggerFactory.getLogger(RemotePackaging.class); +// private Function0 messageDigest; +// private static final Logger logger = LoggerFactory.getLogger(RemotePackaging.class); public RemotePackaging forDeploymentPackage(DeploymentPackage deploymentPackage) { this.deploymentPackage = deploymentPackage; @@ -96,23 +96,7 @@ public RemotePackaging withRegistryVersion(String registryVersion) { public String call() throws RuntimeException { targetDir.mkdirs(); ManifestWriter mw = new ManifestXmlWriter(); - InputStream ioStream = this.getClass() - .getClassLoader() - .getResourceAsStream("reference.conf"); - Reader reader = new InputStreamReader(ioStream); - Config config = ConfigFactory.parseReader(reader); - DarPackager pkger = new DarPackager(mw,new Function0() { - @Override - public MessageDigest apply(){ - MessageDigest messageDigest = null; - try { - messageDigest = MessageDigest.getInstance("SHA1"); - } catch (NoSuchAlgorithmException e){ - logger.info(e.getMessage()); - } - return messageDigest; - } - },config); + DarPackager pkger = new DarPackager(mw); DescriptorRegistry descriptorRegistry = DescriptorRegistry.getDescriptorRegistry(booterConfig); if (null == descriptorRegistry) { SlaveRemoteDescriptorRegistry.boot(descriptors, booterConfig, registryVersion); From fbc697058f7725f1233a0cfee6c7024817da2992 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Tue, 7 Jun 2022 17:22:05 +0530 Subject: [PATCH 2/5] D-20864: Jenkins Plugin package operation hardcodes checksum on all artifacts --- build.gradle | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b26d11f..22bb844 100644 --- a/build.gradle +++ b/build.gradle @@ -123,22 +123,42 @@ configurations { } ext { - xlPlatformVersion = "2017.6.0" + xlPlatformVersion = "10.0.14" + xlPlatformVersionPackager = "2017.6.0" } dependencies { - // https://mvnrepository.com/artifact/com.typesafe/config + compile ("com.xebialabs.deployit.engine:remote-booter:$xlPlatformVersion") { + transitive = false; + } + compile ("com.xebialabs.deployit.engine:engine-xml:$xlPlatformVersion") { + transitive = true; + } + compile ("com.xebialabs.deployit.engine:packager:$xlPlatformVersionPackager") { + transitive = false; + } + compile ("com.xebialabs.deployit:appserver-api:$xlPlatformVersion"){ + transitive = false; + } + compile "org.scala-lang:scala-library:2.12.3" compile 'com.typesafe:config:1.3.0' - compile "com.xebialabs.deployit.engine:packager:$xlPlatformVersion" - compile "com.xebialabs.deployit:engine-api:$xlPlatformVersion" - compile "com.xebialabs.deployit.engine:remote-booter:$xlPlatformVersion" + compile "com.thoughtworks.xstream:xstream:1.4.13" + compile "commons-codec:commons-codec:1.15" + compile "joda-time:joda-time:2.10.6" + compile "nl.javadude.scannit:scannit:1.4.1" + compile "org.jboss.resteasy:resteasy-jaxrs:3.12.1.Final" + compile "org.apache.httpcomponents:httpclient:4.5.13" + compile "org.apache.httpcomponents:httpcore:4.4.13" + compile "org.apache.httpcomponents:httpmime:4.5.13" + compile "javax.xml.bind:jaxb-api:2.3.1" compile "org.jdom:jdom2:2.0.5" provided 'org.slf4j:slf4j-api:1.7.7' - compile "de.schlichtherle.truezip:truezip-driver-file" - compile "de.schlichtherle.truezip:truezip-driver-zip" + compile "de.schlichtherle.truezip:truezip-driver-file:7.7.10" + compile "de.schlichtherle.truezip:truezip-driver-zip:7.7.10" compile "de.schlichtherle.truezip:truezip-driver-tar:7.7.10" - compile "de.schlichtherle.truezip:truezip-file" - compile "de.schlichtherle.truezip:truezip-kernel" + compile "de.schlichtherle.truezip:truezip-file:7.7.10" + compile "de.schlichtherle.truezip:truezip-kernel:7.7.10" + jenkinsPlugins "org.jenkins-ci.plugins:credentials:1.16.1@jar" jenkinsPlugins "org.jenkins-ci.plugins.workflow:workflow-step-api:1.10@jar" From 854793bb82717ef71104082df6fba2f787319f06 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:30:30 +0530 Subject: [PATCH 3/5] D-20864: Added the old logic os packager --- .../deployit/ci/dar/RemotePackaging.java | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java index 77eba2a..8892593 100644 --- a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java +++ b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java @@ -61,8 +61,8 @@ public class RemotePackaging implements Callable { private BooterConfig booterConfig; private Collection descriptors; private String registryVersion; -// private Function0 messageDigest; -// private static final Logger logger = LoggerFactory.getLogger(RemotePackaging.class); + private Function0 messageDigest; + private static final Logger logger = LoggerFactory.getLogger(RemotePackaging.class); public RemotePackaging forDeploymentPackage(DeploymentPackage deploymentPackage) { this.deploymentPackage = deploymentPackage; @@ -114,6 +114,43 @@ public String call() throws RuntimeException { return pkger.buildPackage(deploymentPackage, targetDir.getAbsolutePath(), true).getPath(); } + public String oldcall() throws RuntimeException { + targetDir.mkdirs(); + ManifestWriter mw = new ManifestXmlWriter(); + InputStream ioStream = this.getClass() + .getClassLoader() + .getResourceAsStream("reference.conf"); + Reader reader = new InputStreamReader(ioStream); + Config config = ConfigFactory.parseReader(reader); + DarPackager pkger = new DarPackager(mw,new Function0() { + @Override + public MessageDigest apply(){ + MessageDigest messageDigest = null; + try { + messageDigest = MessageDigest.getInstance("SHA1"); + } catch (NoSuchAlgorithmException e){ + logger.info(e.getMessage()); + } + return messageDigest; + } + },config); + DescriptorRegistry descriptorRegistry = DescriptorRegistry.getDescriptorRegistry(booterConfig); + if (null == descriptorRegistry) { + SlaveRemoteDescriptorRegistry.boot(descriptors, booterConfig, registryVersion); + } else { + if (descriptorRegistry instanceof Versioned) { + Versioned versionedDescriptorRegistry = (Versioned) descriptorRegistry; + if (!versionedDescriptorRegistry.getVersion().equals(this.registryVersion)) { + SlaveRemoteDescriptorRegistry.boot(descriptors, booterConfig, registryVersion); + } + } + else { + // do nothing for normal remote descriptor registries - those should be reloaded from the UI + } + } + return pkger.buildPackage(deploymentPackage, targetDir.getAbsolutePath(), true).getPath(); + } + /** * This method has an empty implementation, which is added after upgrading the Jenkins core version to 1.642.3 * @param checker From 0caac40899e42286e539bbd6adb6c1bde4691ff2 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:36:03 +0530 Subject: [PATCH 4/5] D-20864: Added the old logic os packager --- .../java/com/xebialabs/deployit/ci/dar/RemotePackaging.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java index 8892593..baff6c1 100644 --- a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java +++ b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java @@ -113,7 +113,9 @@ public String call() throws RuntimeException { } return pkger.buildPackage(deploymentPackage, targetDir.getAbsolutePath(), true).getPath(); } - + /** + * Old Call logic for packager - Once Deploy Fixes D-21539 , will update the call with below logic. + */ public String oldcall() throws RuntimeException { targetDir.mkdirs(); ManifestWriter mw = new ManifestXmlWriter(); From 3b2276c60fa3f82847807229cb2995f82ca87415 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Mon, 13 Jun 2022 15:05:33 +0530 Subject: [PATCH 5/5] D-20864: Updated the logi --- .../deployit/ci/dar/RemotePackaging.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java index baff6c1..228399f 100644 --- a/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java +++ b/src/main/java/com/xebialabs/deployit/ci/dar/RemotePackaging.java @@ -124,18 +124,19 @@ public String oldcall() throws RuntimeException { .getResourceAsStream("reference.conf"); Reader reader = new InputStreamReader(ioStream); Config config = ConfigFactory.parseReader(reader); - DarPackager pkger = new DarPackager(mw,new Function0() { - @Override - public MessageDigest apply(){ - MessageDigest messageDigest = null; - try { - messageDigest = MessageDigest.getInstance("SHA1"); - } catch (NoSuchAlgorithmException e){ - logger.info(e.getMessage()); - } - return messageDigest; - } - },config); + DarPackager pkger = new DarPackager(mw); +// DarPackager pkger = new DarPackager(mw,new Function0() { +// @Override +// public MessageDigest apply(){ +// MessageDigest messageDigest = null; +// try { +// messageDigest = MessageDigest.getInstance("SHA1"); +// } catch (NoSuchAlgorithmException e){ +// logger.info(e.getMessage()); +// } +// return messageDigest; +// } +// },config); DescriptorRegistry descriptorRegistry = DescriptorRegistry.getDescriptorRegistry(booterConfig); if (null == descriptorRegistry) { SlaveRemoteDescriptorRegistry.boot(descriptors, booterConfig, registryVersion);