This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 66f00826a9d SOLR-17332: Remove remnants of post.jar in build tooling.
(#2516)
66f00826a9d is described below
commit 66f00826a9d39ed2b9b67125c34ef0bc5e8a5c68
Author: Eric Pugh <[email protected]>
AuthorDate: Fri Jun 14 10:31:12 2024 -0400
SOLR-17332: Remove remnants of post.jar in build tooling. (#2516)
Replaced by bin/solr post and the PostTool.
---
build.gradle | 2 --
gradle/ant-compat/solr.post-jar.gradle | 51 ----------------------------------
solr/.gitignore | 1 -
3 files changed, 54 deletions(-)
diff --git a/build.gradle b/build.gradle
index 9da30ad4bf7..caf0884e954 100644
--- a/build.gradle
+++ b/build.gradle
@@ -201,6 +201,4 @@ apply from: file('gradle/hacks/dummy-outputs.gradle')
apply from: file('gradle/solr/packaging.gradle')
apply from: file('gradle/solr/solr-forbidden-apis.gradle')
-apply from: file('gradle/ant-compat/solr.post-jar.gradle')
-
apply from: file('gradle/node.gradle')
diff --git a/gradle/ant-compat/solr.post-jar.gradle
b/gradle/ant-compat/solr.post-jar.gradle
deleted file mode 100644
index c84930edff7..00000000000
--- a/gradle/ant-compat/solr.post-jar.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This adds a configuration and artifact to solr-core which exports
"post.jar" tool.
-// this should be a separate project instead (it is self-contained and classes
are reused
-// in many places).
-
-configure(project(":solr:core")) {
- plugins.withType(JavaPlugin) {
- configurations {
- postJar
- }
-
- task assemblePostJar(type: Jar) {
- dependsOn classes
-
- archiveFileName = "post.jar"
- destinationDirectory = file("${buildDir}/postJar")
-
- from(sourceSets.main.output, {
- include "org/apache/solr/util/CLIO.class"
- include "org/apache/solr/util/SimplePostTool*.class"
- include "org/apache/solr/util/RTimer*.class"
- })
-
- manifest {
- attributes("Main-Class": "org.apache.solr.util.SimplePostTool")
- }
- }
-
- artifacts {
- postJar assemblePostJar
- }
-
- assemble.dependsOn assemblePostJar
- }
-}
\ No newline at end of file
diff --git a/solr/.gitignore b/solr/.gitignore
index e6e2e7e442f..8d643687405 100644
--- a/solr/.gitignore
+++ b/solr/.gitignore
@@ -10,7 +10,6 @@
/example/solr/logs
/example/solr/zoo_data
/example/work/*
-/example/exampledocs/post.jar
/package
