diff options
author | Alexander Kurtakov | 2021-03-22 10:38:26 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2021-03-22 10:38:26 +0000 |
commit | d6c13f6c3aefc558ea45a33188c269894460bc2b (patch) | |
tree | 243130dcea5b13f02da4e9d9f060f1ebbeeb7b30 | |
parent | affdf325b5577a84e2105d6671282d8f104c9e8c (diff) | |
download | rt.equinox.p2-d6c13f6c3aefc558ea45a33188c269894460bc2b.tar.gz rt.equinox.p2-d6c13f6c3aefc558ea45a33188c269894460bc2b.tar.xz rt.equinox.p2-d6c13f6c3aefc558ea45a33188c269894460bc2b.zip |
Bug 572043 - Deprecate pack200 support for removalI20210324-0320I20210323-2250I20210323-1800I20210323-1240I20210323-0200I20210322-1800
Deprecate pack200 in ant tasks and show warnings in the ant log.
Change-Id: I5a7ce482f3be8a1f66c6d1e4989671136ff24149
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
3 files changed, 20 insertions, 10 deletions
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessorExecutor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessorExecutor.java index 4eb4817d3..d1d3f2a0e 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessorExecutor.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessorExecutor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 IBM Corporation and others. + * Copyright (c) 2007, 2021 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -24,8 +24,11 @@ public class JarProcessorExecutor { public static class Options { public String outputDir = "."; //$NON-NLS-1$ public String signCommand = null; + @Deprecated(forRemoval = true, since = "1.2.0") public boolean pack = false; + @Deprecated(forRemoval = true, since = "1.2.0") public boolean repack = false; + @Deprecated(forRemoval = true, since = "1.2.0") public boolean unpack = false; public boolean verbose = false; public boolean processAll = false; diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/JarProcessorTask.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/JarProcessorTask.java index e70ffb4fe..691676fd5 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/JarProcessorTask.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/JarProcessorTask.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2017 IBM Corporation and others. + * Copyright (c) 2007, 2021 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -21,9 +21,8 @@ import org.apache.tools.ant.types.FileSet; import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor.Options; /** - * This task provides massaging facilities for jar files. - * It supports: signing, unsigning, normalization, packing - * - + * This task provides massaging facilities for jar files. It supports: signing, + * unsigning, normalization, packing - */ public class JarProcessorTask extends Task { private final Options options = new Options(); @@ -66,11 +65,15 @@ public class JarProcessorTask extends Task { signArgs.setProperty(KEYPASS, keypass); } + @Deprecated(forRemoval = true, since = "1.2.0") public void setPack(boolean pack) { + log("Support for pack200 is scheduled for removal after June 2023.", Project.MSG_WARN); //$NON-NLS-1$ options.pack = pack; } + @Deprecated(forRemoval = true, since = "1.2.0") public void setNormalize(boolean normalize) { + log("Support for pack200 is scheduled for removal after June 2023.", Project.MSG_WARN); //$NON-NLS-1$ options.repack = normalize; } @@ -89,11 +92,11 @@ public class JarProcessorTask extends Task { } private void adjustAndValidateConfiguration() { - //Sign and pack implies a normalization + // Sign and pack implies a normalization if (options.signCommand != null && options.pack) options.repack = true; - //Check that alias, and storepass are set + // Check that alias, and storepass are set if (options.signCommand != null && signArgs.getProperty(UNSIGN) == null) { if (signArgs.getProperty(ALIAS) == null) throw new BuildException("Alias must be set"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java index 243e468d2..6a41e1dcc 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/ProcessRepoTask.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 IBM Corporation and others. + * Copyright (c) 2009, 2021 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -17,8 +17,7 @@ package org.eclipse.equinox.p2.internal.repository.tools.tasks; import java.io.File; import java.net.URI; import java.net.URISyntaxException; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; +import org.apache.tools.ant.*; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.URIUtil; import org.eclipse.equinox.internal.p2.jarprocessor.ant.JarProcessorTask; @@ -64,6 +63,7 @@ public class ProcessRepoTask extends Task { private SigningOptions signing = null; private JarProcessorTask jarProcessor = null; + @SuppressWarnings("removal") @Override public void execute() throws BuildException { File file = URIUtil.toFile(repository); @@ -112,11 +112,15 @@ public class ProcessRepoTask extends Task { } } + @Deprecated(forRemoval = true, since = "2.3.0") public void setPack(boolean pack) { + log("Support for pack200 is scheduled for removal after June 2023.", Project.MSG_WARN); //$NON-NLS-1$ this.pack = pack; } + @Deprecated(forRemoval = true, since = "2.3.0") public void setNormalize(boolean normalize) { + log("Support for pack200 is scheduled for removal after June 2023.", Project.MSG_WARN); //$NON-NLS-1$ this.repack = normalize; } |