Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maven updates #5284

Merged
merged 4 commits into from Jun 15, 2022
Merged

Maven updates #5284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1560f09
mvnw: Update wrapper to 3.1.1
bjhargrave Jun 15, 2022
f81674e
mvn: Update to use 3.8.6
bjhargrave Jun 15, 2022
9ef59e1
maven: avoid hard coding groupId in poms
bjhargrave Jun 15, 2022
ada26a8
maven: Remove bad configuration item in it test
bjhargrave Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified .mvn/wrapper/maven-wrapper.jar
View file
Open in desktop
Binary file not shown.
20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
# 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
#
# https://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.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
2 changes: 1 addition & 1 deletion maven/bnd-baseline-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions maven/bnd-export-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -42,27 +42,27 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.maven</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.resolve</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.repository</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions maven/bnd-indexer-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -48,15 +48,15 @@
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.maven</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.repository</artifactId>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions maven/bnd-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -56,11 +56,11 @@
</dependency>

<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.maven</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
</dependencies>
Expand Down
14 changes: 7 additions & 7 deletions maven/bnd-plugin-parent/pom.xml
View file
Open in desktop
Expand Up @@ -140,37 +140,37 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.maven</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.resolve</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.repository</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.reporter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions maven/bnd-reporter-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -53,11 +53,11 @@
</dependency>

<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.reporter</artifactId>
</dependency>

Expand Down
12 changes: 6 additions & 6 deletions maven/bnd-resolver-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -42,27 +42,27 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.maven</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.resolve</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.repository</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/pom.xml
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
<configuration>
<bundlesOnly>true</bundlesOnly>
<bundles>
<bundle>${project.basedir}/bundles/org.apache.felix.eventadmin-1.4.8.jar</bundle>
<bundle>${project.basedir}/bundles/org.apache.felix.framework-5.4.0.jar</bundle>
Expand Down
12 changes: 6 additions & 6 deletions maven/bnd-run-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -42,27 +42,27 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.maven</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.resolve</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.repository</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions maven/bnd-testing-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -42,27 +42,27 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.maven</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.resolve</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.repository</artifactId>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
</dependency>
</dependencies>
Expand Down