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.

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

Update web-commons-bom to 29 #42

Merged
merged 4 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#
# Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
#
# Licensed 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.
#

name: build on maven

on:
watch:
types: [started]
pull_request:
types: [opened, reopened, edited, synchronize, ready_for_review]
push:
branches:
- master
- 1.x

workflow_dispatch:

jobs:
build:
name: Build with maven
runs-on: ubuntu-latest
env:
MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"
steps:
- uses: actions/checkout@v4

- name: Set up JDK 11 for x64
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
architecture: x64

- uses: s4u/[email protected]
with:
sonatypeSnapshots: true

- name: Build the Maven verify phase
run: mvn -B -V clean verify -Prun-its -Pci


- uses: s4u/[email protected]
if: ${{ github.event_name == 'push' }}
with:
servers: |
[{
"id": "sonatype-nexus-snapshots",
"username": "${{ secrets.SONATYPE_BOT_USERNAME }}",
"password": "${{ secrets.SONATYPE_BOT_TOKEN }}"
}]

- name: Deploy the artifact
if: ${{ github.event_name == 'push' }}
run: mvn help:effective-settings -B -V clean deploy -e
File renamed without changes.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,8 +29,8 @@
<version>1.5.2-SNAPSHOT</version>

<name>http-testserver</name>
<inceptionYear>2015-2022</inceptionYear>
<inceptionYear>2011-2024</inceptionYear>

<scm>
<connection>scm:git:https://github.com/Commonjava/http-testserver.git</connection>
<developerConnection>scm:git:[email protected]:Commonjava/http-testserver.git</developerConnection>
Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>org.commonjava.boms</groupId>
<artifactId>web-commons-bom</artifactId>
<version>26</version>
<version>29</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/commonjava/test/http/TestHttpServer.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/commonjava/test/http/util/UrlUtils.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2022 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
* Copyright (C) 2011-2024 Red Hat, Inc. (http://github.com/Commonjava/http-testserver)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading