Skip to content

Commit

Permalink
! update cola-components/archetypes after cola-components structural …
Browse files Browse the repository at this point in the history
…change
  • Loading branch information
oldratlee committed Jan 10, 2021
1 parent 088fc49 commit b8bfb2f
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 88 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.alibaba.cola</groupId>
<artifactId>cola-normal-component-archetype</artifactId>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>cola-normal-component-archetype</name>
<description>COLA normal component archetype</description>
Expand All @@ -18,7 +18,6 @@
</extension>
</extensions>


<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor
xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd"
name="dto"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd"
name="dto"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet>
<directory></directory>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,34 +1,53 @@
<?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>
<parent>
<groupId>${groupId}</groupId>
<artifactId>cola-components-parent</artifactId>
<version>${version}</version>
</parent>

<name>${artifactId}</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>${project.artifactId}</description>
<url>https://github.com/alibaba/COLA</url>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<licenses>
<license>
<name>GNU Lesser General Public License v2.1</name>
<url>https://github.com/alibaba/COLA/blob/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/alibaba/COLA.git</connection>
<developerConnection>scm:git:https://github.com/alibaba/COLA.git</developerConnection>
<url>https://github.com/alibaba/COLA</url>
</scm>
<issueManagement>
<url>https://github.com/alibaba/COLA/issues</url>
<system>GitHub Issues</system>
</issueManagement>
<developers>
<developer>
<id>significantfrank</id>
<name>Frank Zhang</name>
<email>[email protected]</email>
<roles>
<role>Developer</role>
<role>Architect</role>
</roles>
<timezone>+8</timezone>
<url>https://github.com/significantfrank</url>
</developer>
</developers>

<dependencies>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.9</version>
<scope>provided</scope>
</dependency>

</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.alibaba.cola</groupId>
<artifactId>cola-starter-component-archetype</artifactId>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>cola-starter-component-archetype</name>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="catch-log-starter"
<archetype-descriptor
xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd"
name="catch-log-starter"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet>
<directory></directory>
<includes>
<include>gitignore.txt</include>
<include>README.md</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.factories</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/test/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</fileSet>
</fileSets>
<fileSets>
<fileSet>
<directory></directory>
<includes>
<include>gitignore.txt</include>
<include>README.md</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.factories</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/test/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</fileSet>
</fileSets>
</archetype-descriptor>
Original file line number Diff line number Diff line change
@@ -1,19 +1,47 @@
<?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>
<parent>
<groupId>${groupId}</groupId>
<artifactId>cola-components-parent</artifactId>
<version>${version}</version>
</parent>

<name>${artifactId}</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>${project.artifactId}</description>
<url>https://github.com/alibaba/COLA</url>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>2.2.6.RELEASE</spring.boot.version>
</properties>
<licenses>
<license>
<name>GNU Lesser General Public License v2.1</name>
<url>https://github.com/alibaba/COLA/blob/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/alibaba/COLA.git</connection>
<developerConnection>scm:git:https://github.com/alibaba/COLA.git</developerConnection>
<url>https://github.com/alibaba/COLA</url>
</scm>
<issueManagement>
<url>https://github.com/alibaba/COLA/issues</url>
<system>GitHub Issues</system>
</issueManagement>
<developers>
<developer>
<id>significantfrank</id>
<name>Frank Zhang</name>
<email>[email protected]</email>
<roles>
<role>Developer</role>
<role>Architect</role>
</roles>
<timezone>+8</timezone>
<url>https://github.com/significantfrank</url>
</developer>
</developers>

<dependencies>
<dependency>
Expand All @@ -39,35 +67,26 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.10</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.60</version>
<scope>provided</scope>
</dependency>

<!-- 日志包 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- 测试包 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.9</version>
</dependency>
</dependencies>

</project>
1 change: 0 additions & 1 deletion cola-components/cola-component-catchlog-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,5 @@
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>

</dependencies>
</project>
1 change: 0 additions & 1 deletion cola-components/cola-component-domain-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,5 @@
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>

</dependencies>
</project>
1 change: 1 addition & 0 deletions cola-components/cola-component-extension-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<scope>provided</scope>
</dependency>

<!-- 日志包 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down

0 comments on commit b8bfb2f

Please sign in to comment.