Skip to content
Open
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
8 changes: 6 additions & 2 deletions .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,13 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Install Dependencies Local
run: mvn install -P lib
run: |
chmod +x ./mvnw
./mvnw install -P lib
- name: Build Maven Site
run: mvn site
run: |
chmod +x ./mvnw
./mvnw site
- name: Move site to pages artifact dir
run: |
mv ./micro-common/target/site ./temp_site/micro-common
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/mvn-deploy-central-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- name: Publish to Apache Maven Central
run: mvn deploy -P central,lib
run: |
chmod +x ./mvnw
./mvnw deploy -P central,lib
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/mvn-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- name: Test with Maven
run: mvn test
run: |
chmod +x ./mvnw
./mvnw test
- name: Publish to Apache Maven Central
run: mvn deploy -P central,lib
run: |
chmod +x ./mvnw
./mvnw deploy -P central,lib
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/mvn-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Test with Maven
run: mvn test
run: |
chmod +x ./mvnw
./mvnw test
- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
Expand All @@ -59,4 +61,6 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Package with Maven
run: mvn package -Dmaven.test.skip=true
run: |
chmod +x ./mvnw
./mvnw package -Dmaven.test.skip=true
20 changes: 2 additions & 18 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
# 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
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-4/apache-maven-4.0.0-rc-4-bin.zip
12 changes: 4 additions & 8 deletions demo-backend/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>demo-backend</artifactId>
<name>demo-backend</name>
<description>demo-backend</description>
Expand Down
12 changes: 4 additions & 8 deletions demo-reactive/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>demo-reactive</artifactId>
<name>demo-reactive</name>
<description>demo-reactive</description>
Expand Down
12 changes: 4 additions & 8 deletions micro-auth-oidc/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>micro-auth-oidc</artifactId>
<name>micro-auth-oidc</name>
<description>micro-auth-oidc</description>
Expand Down
12 changes: 4 additions & 8 deletions micro-auth-wechat/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>micro-auth-wechat</artifactId>
<name>micro-auth-wechat</name>
<description>micro-auth-wechat</description>
Expand Down
12 changes: 4 additions & 8 deletions micro-auth/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>micro-auth</artifactId>
<name>micro-auth</name>
<description>auth-server</description>
Expand Down
12 changes: 4 additions & 8 deletions micro-common/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>micro-common</artifactId>
<name>micro-common</name>
<description>micro-common</description>
Expand Down
95 changes: 16 additions & 79 deletions micro-dependencies/pom.xml
Original file line number Diff line number Diff line change
@@ -1,134 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 http://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>

<groupId>com.jiangtj.micro</groupId>
<parent/>
<artifactId>micro-dependencies</artifactId>
<packaging>pom</packaging>
<version>0.2.3</version>
<url>https://github.com/jiangtj/jmicro</url>
<packaging>bom</packaging>
<name>micro-dependencies</name>
<description>JMicro dependencies pom</description>

<licenses>
<license>
<name>GNU Lesser General Public License v2.1</name>
<url>https://raw.githubusercontent.com/jiangtj/jmicro/master/LICENSE</url>
</license>
</licenses>

<developers>
<developer>
<name>Mr.J</name>
<email>116749895@qq.com</email>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/jiangtj/jmicro.git</connection>
<developerConnection>scm:git:ssh://github.com:jiangtj/jmicro.git</developerConnection>
<url>https://github.com/jiangtj/jmicro/tree/master</url>
</scm>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-auth</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-auth-wechat</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-auth-oidc</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-common</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-web</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-spring-boot-starter</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-sql-jooq</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-test</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-pic-upload-starter</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-flyway-starter</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jiangtj.micro</groupId>
<artifactId>micro-payment</artifactId>
<version>0.2.3</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<profiles>
<profile>
<id>central</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.8</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<!-- Prevent gpg from using pinentry programs -->
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
12 changes: 4 additions & 8 deletions micro-flyway-starter/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>micro-flyway-starter</artifactId>
<name>micro-flyway-starter</name>
<description>micro-flyway-starter</description>
Expand Down
12 changes: 4 additions & 8 deletions micro-payment/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>micro-payment</artifactId>
<name>micro-payment</name>
<description>Payment module for JMicro framework, supporting balance, WeChat and Alipay payments</description>
Expand Down
12 changes: 4 additions & 8 deletions micro-pic-upload-starter/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.jiangtj.micro</groupId>
<artifactId>jmicro-aggregator</artifactId>
<version>0.2.3</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
<modelVersion>4.1.0</modelVersion>
<parent/>
<artifactId>micro-pic-upload-starter</artifactId>
<name>micro-pic-upload-starter</name>
<description>Make it easy to upload picture into oss</description>
Expand Down
Loading