Skip to content

Commit b96b93d

Browse files
committed
Revert "Utilize VT if possible (#381)"
This reverts commit 6f0ad55.
1 parent c28e8fa commit b96b93d

File tree

4 files changed

+3
-129
lines changed

4 files changed

+3
-129
lines changed

pom.xml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -182,42 +182,4 @@
182182
</plugins>
183183
</build>
184184

185-
<profiles>
186-
<profile>
187-
<id>jdk21</id>
188-
<activation>
189-
<jdk>[21,)</jdk>
190-
</activation>
191-
<build>
192-
<plugins>
193-
<plugin>
194-
<groupId>org.apache.maven.plugins</groupId>
195-
<artifactId>maven-compiler-plugin</artifactId>
196-
<executions>
197-
<execution>
198-
<id>java21</id>
199-
<goals>
200-
<goal>compile</goal>
201-
</goals>
202-
<phase>compile</phase>
203-
<configuration>
204-
<release>21</release>
205-
<compileSourceRoots>
206-
<compileSourceRoot>${project.basedir}/src/main/java21</compileSourceRoot>
207-
</compileSourceRoots>
208-
<multiReleaseOutput>true</multiReleaseOutput>
209-
</configuration>
210-
</execution>
211-
</executions>
212-
</plugin>
213-
</plugins>
214-
</build>
215-
</profile>
216-
<profile>
217-
<id>plexus-release</id>
218-
<properties>
219-
<minimalJavaBuildVersion>21</minimalJavaBuildVersion>
220-
</properties>
221-
</profile>
222-
</profiles>
223185
</project>

src/main/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.SequenceInputStream;
2424
import java.io.UncheckedIOException;
2525
import java.util.concurrent.ExecutionException;
26+
import java.util.concurrent.Executors;
2627
import java.util.zip.Deflater;
2728
import java.util.zip.ZipEntry;
2829

@@ -117,8 +118,8 @@ public ConcurrentJarCreator(boolean compressAddedZips, int nThreads) throws IOEx
117118
manifest = createDeferred(defaultSupplier);
118119
directories = createDeferred(defaultSupplier);
119120
synchronousEntries = createDeferred(defaultSupplier);
120-
parallelScatterZipCreator = new ParallelScatterZipCreator(
121-
ConcurrentJarCreatorExecutorServiceFactory.createExecutorService(nThreads), defaultSupplier);
121+
parallelScatterZipCreator =
122+
new ParallelScatterZipCreator(Executors.newFixedThreadPool(nThreads), defaultSupplier);
122123
}
123124

124125
/**

src/main/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreatorExecutorServiceFactory.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/main/java21/org/codehaus/plexus/archiver/zip/ConcurrentJarCreatorExecutorServiceFactory.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)