This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.7.x by this push:
new e04a87991eb CAMEL-20814: Revert due to build-info causes to not be
able to do Camel releases (#14749)
e04a87991eb is described below
commit e04a87991eb9e99936bbfd21aabbfcba025c6b33
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Jul 7 08:08:30 2024 +0200
CAMEL-20814: Revert due to build-info causes to not be able to do Camel
releases (#14749)
* Revert "CAMEL-20814: only generate the buildinfo files during the release
build"
This reverts commit 1e3d1e9fe84f03e04e3160b692663859ffe1431b.
* Revert "CAMEL-20814: generate buildinfo files only when necessary"
This reverts commit 6e9787b2c0781d9b9768b598f3c88b6968b205d3.
* Revert "CAMEL-20814: Publish buildinfo and provide a build container to
improve release reproducibility. (#14275)"
This reverts commit 9dc1e2dbfa1f2d36c36e3e45afd16e8b485d6215.
---
Dockerfile | 29 -----------------------------
builder | 34 ----------------------------------
pom.xml | 25 -------------------------
3 files changed, 88 deletions(-)
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 39c1ef97aae..00000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,29 +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 has a JDK and Maven we can use.
-FROM registry.access.redhat.com/ubi9/openjdk-21
-USER root
-
-#
-# the builder script will run this container under as your uid:guid so that
the files it creates
-# in the host env are owned by you, lets make sure there is uid:guid to match
in the container.
-RUN for i in $(seq 50 184); do echo
"default$i:x:$i:$i:default:/home/default:/bin/bash" >> /etc/passwd; done;
-RUN for i in $(seq 186 2000); do echo
"default$i:x:$i:$i:default:/home/default:/bin/bash" >> /etc/passwd; done
-
-CMD ["/bin/bash"]
-WORKDIR /src
\ No newline at end of file
diff --git a/builder b/builder
deleted file mode 100755
index 4cecc1767a1..00000000000
--- a/builder
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# 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.
-# ----------------------------------------------------------------------------
-set -e
-
-# This script gives you a reproducible build enviroment, since the enviroment
is containerizedL
-# Example usage: ./builder mvn clean install -Dquickly
-
-docker build . -t apache-camel-builder
-
-# Run the builder container as the current user, and mount his home dirs
-# so that host .m2 repos can be reused and provide access to release gpg keys
and such.
-docker run --rm -it \
- --user "`id -u`:`id -g`" \
- -v "`pwd`:/src" \
- -v "${HOME}:/home/default" \
- -v "${HOME}:${HOME}" \
- apache-camel-builder $*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 471a294cfd3..0c5ed6d51d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,10 +134,8 @@
<maven-remote-resources-plugin-version>3.2.0</maven-remote-resources-plugin-version>
<maven-surefire-plugin-version>3.3.0</maven-surefire-plugin-version>
<versions-maven-plugin-version>2.16.2</versions-maven-plugin-version>
- <maven-artifact-plugin-version>3.5.1</maven-artifact-plugin-version>
<camel.javadoc.offline>false</camel.javadoc.offline>
-
<invoker.skip>${skipTests}</invoker.skip>
</properties>
@@ -328,8 +326,6 @@
<exclude>camel-sbom/*.xml</exclude>
<exclude>doap.rdf</exclude>
<exclude>mvnw*</exclude>
- <exclude>Dockerfile</exclude>
- <exclude>builder*</exclude>
<exclude>**/FileSplitXPathCharsetTest-input.xml</exclude>
</excludes>
</licenseSet>
@@ -591,23 +587,6 @@
<showVersion>true</showVersion>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-artifact-plugin</artifactId>
- <version>${maven-artifact-plugin-version}</version>
- <executions>
- <execution>
- <id>buildinfo</id>
- <phase>verify</phase>
- <goals>
- <goal>buildinfo</goal>
- </goals>
- <configuration>
- <attach>true</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
@@ -804,10 +783,6 @@
<outputName>${project.artifactId}-${project.version}-sbom</outputName>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-artifact-plugin</artifactId>
- </plugin>
</plugins>
</build>
