Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
li-xunhuan committed Jun 19, 2024
2 parents 037ab17 + f4edeca commit abd8f80
Show file tree
Hide file tree
Showing 6 changed files with 413 additions and 459 deletions.
20 changes: 20 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"baseBranches": [
"dev"
],
"packageRules": [
{
"matchPackagePatterns": [
"^com.alibaba:fastjson$",
"^net.dreamlu:mica-bom$",
"^org.springframework.boot:spring-boot-dependencies$",
"^org.springframework.boot:spring-boot-maven-plugin$"
],
"enabled": false
}
]
}
21 changes: 19 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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
#
# 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.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
6 changes: 3 additions & 3 deletions example/mica-mqtt-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</parent>

<properties>
<graalvm.version>23.1.1</graalvm.version>
<graalvm.version>24.0.1</graalvm.version>
<mainClass.server>net.dreamlu.iot.mqtt.server.MqttServerTest</mainClass.server>
<mainClass.client>net.dreamlu.iot.mqtt.client.MqttClientTest</mainClass.client>
</properties>
Expand Down Expand Up @@ -64,12 +64,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<version>3.7.1</version>
<configuration>
<archive>
<manifest>
Expand Down
Loading

0 comments on commit abd8f80

Please sign in to comment.