Skip to content

Commit

Permalink
Merge branch 'main' into bundle-lifecycle
Browse files Browse the repository at this point in the history
  • Loading branch information
AidanDelaney authored Jun 23, 2023
2 parents 5c0a2fd + 332993d commit d4b938b
Show file tree
Hide file tree
Showing 7 changed files with 338 additions and 390 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ workflows:
main:
jobs:
- pack/build:
executor-image: ubuntu-2204:2023.04.2
working-directory: apps/java-maven
image-name: cnbs/circleci-sample
builder: 'cnbs/sample-builder:jammy'
version: '0.29.0'
- test:
requires:
- pack/build
Expand Down
114 changes: 0 additions & 114 deletions apps/java-maven/.mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file modified apps/java-maven/.mvn/wrapper/maven-wrapper.jar
100755 → 100644
Binary file not shown.
19 changes: 18 additions & 1 deletion apps/java-maven/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
# 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.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
Loading

0 comments on commit d4b938b

Please sign in to comment.