Skip to content

Commit

Permalink
Merge pull request #5284 from bjhargrave/maven-updates
Browse files Browse the repository at this point in the history 
Maven updates
  • Loading branch information
@bjhargrave
bjhargrave committed Jun 15, 2022
2 parents 6730d70 + ada26a8 commit 83c3b50
Show file tree
Hide file tree
Showing 14 changed files with 94 additions and 109 deletions.
Binary file modified .mvn/wrapper/maven-wrapper.jar
View file
Binary file not shown.
20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
@@ -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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 83c3b50

Please sign in to comment.