Merge branch 'tw_maven_release' into 'master'

support release to maven central repository

See merge request g226002120/AmazingProject!2

.gitignore

@@ -2,4 +2,5 @@
 .DS_Store
 target
 first schema.json
-out/
\ No newline at end of file
+out/
+*.iml
\ No newline at end of file

.gitlab-ci.yml

+image: maven:3.6.3-jdk-11
+
+stages:
+  - build
+  - test
+
+maven-build:
+  stage: build
+  script:
+    - mvn package
+    - cat target/site/jacoco/index.html
+  artifacts:
+    expose_as: 'code coverage'
+    paths:
+      - target/surefire-reports/
+      - target/site/jacoco/index.html
+    reports:
+      junit:
+        - target/surefire-reports/TEST-*.xml

pom.xml

@@ -4,37 +4,114 @@
          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>
 
-    <groupId>ic.er</groupId>
-    <artifactId>AmazingProject</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>wendi</name>
-    <description>Database connection</description>
+    <groupId>io.github.MigadaTang</groupId>
+    <artifactId>amazing-er</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>amazing-er</name>
+    <description>this project contains java classes with which users could create their own ER schema and export to JSON
+        format files.
+    </description>
+    <url>https://github.com/MigadaTang/AmazingER</url>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.7</version>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>11</source>
                     <target>11</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <version>2.1.214</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.13.3</version>
+        </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
@@ -52,23 +129,12 @@
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.10</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.24</version>
             <scope>compile</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.5</version>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>

src/main/java/com/ic/er/Attribute.java → src/main/java/io/github/MigadaTang/Attribute.java

-package com.ic.er;
+package io.github.MigadaTang;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.ic.er.common.DataType;
-import com.ic.er.common.RelatedObjType;
-import com.ic.er.entity.AttributeDO;
-import com.ic.er.exception.ERException;
+import io.github.MigadaTang.common.DataType;
+import io.github.MigadaTang.common.RelatedObjType;
+import io.github.MigadaTang.entity.AttributeDO;
+import io.github.MigadaTang.exception.ERException;
 import lombok.Getter;
 import org.apache.ibatis.exceptions.PersistenceException;
 

src/main/java/com/ic/er/ER.java → src/main/java/io/github/MigadaTang/ER.java

-package com.ic.er;
+package io.github.MigadaTang;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ic.er.dao.*;
-import com.ic.er.exception.ERException;
+import io.github.MigadaTang.dao.*;
+import io.github.MigadaTang.exception.ERException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;

src/main/java/com/ic/er/Entity.java → src/main/java/io/github/MigadaTang/Entity.java

-package com.ic.er;
+package io.github.MigadaTang;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.ic.er.common.DataType;
-import com.ic.er.common.RelatedObjType;
-import com.ic.er.entity.AttributeDO;
-import com.ic.er.entity.EntityDO;
-import com.ic.er.exception.ERException;
+import io.github.MigadaTang.common.DataType;
+import io.github.MigadaTang.common.RelatedObjType;
+import io.github.MigadaTang.entity.AttributeDO;
+import io.github.MigadaTang.entity.EntityDO;
+import io.github.MigadaTang.exception.ERException;
 import lombok.Getter;
 import org.apache.ibatis.exceptions.PersistenceException;
 

src/main/java/com/ic/er/LayoutInfo.java → src/main/java/io/github/MigadaTang/LayoutInfo.java

-package com.ic.er;
+package io.github.MigadaTang;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.ic.er.common.RelatedObjType;
-import com.ic.er.entity.LayoutInfoDO;
-import com.ic.er.exception.ERException;
+import io.github.MigadaTang.common.RelatedObjType;
+import io.github.MigadaTang.entity.LayoutInfoDO;
+import io.github.MigadaTang.exception.ERException;
 import lombok.Getter;
 import org.apache.ibatis.exceptions.PersistenceException;
 

src/main/java/com/ic/er/Relationship.java → src/main/java/io/github/MigadaTang/Relationship.java

-package com.ic.er;
+package io.github.MigadaTang;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.ic.er.common.Cardinality;
-import com.ic.er.common.RelatedObjType;
-import com.ic.er.common.RelationshipSerializer;
-import com.ic.er.entity.RelationshipDO;
-import com.ic.er.exception.ERException;
+import io.github.MigadaTang.common.Cardinality;
+import io.github.MigadaTang.common.RelatedObjType;
+import io.github.MigadaTang.common.RelationshipSerializer;
+import io.github.MigadaTang.entity.RelationshipDO;
+import io.github.MigadaTang.exception.ERException;
 import lombok.Getter;
 import org.apache.ibatis.exceptions.PersistenceException;
 

src/main/java/com/ic/er/Schema.java → src/main/java/io/github/MigadaTang/Schema.java

-package com.ic.er;
+package io.github.MigadaTang;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.ic.er.common.Cardinality;
-import com.ic.er.common.SchemaDeserializer;
-import com.ic.er.entity.EntityDO;
-import com.ic.er.entity.RelationshipDO;
-import com.ic.er.entity.SchemaDO;
-import com.ic.er.exception.ERException;
+import io.github.MigadaTang.common.Cardinality;
+import io.github.MigadaTang.common.SchemaDeserializer;
+import io.github.MigadaTang.entity.EntityDO;
+import io.github.MigadaTang.entity.RelationshipDO;
+import io.github.MigadaTang.entity.SchemaDO;
+import io.github.MigadaTang.exception.ERException;
 import lombok.Getter;
 import org.apache.ibatis.exceptions.PersistenceException;
 

src/main/java/com/ic/er/Trans.java → src/main/java/io/github/MigadaTang/Trans.java

-package com.ic.er;
+package io.github.MigadaTang;
 
-import com.ic.er.common.RelatedObjType;
-import com.ic.er.entity.*;
+import io.github.MigadaTang.common.RelatedObjType;
+import io.github.MigadaTang.entity.*;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/ic/er/common/Cardinality.java → src/main/java/io/github/MigadaTang/common/Cardinality.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/ic/er/common/CardinalityEnumTypeHandler.java → src/main/java/io/github/MigadaTang/common/CardinalityEnumTypeHandler.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-
 public class CardinalityEnumTypeHandler extends BaseTypeHandler<Cardinality> {
 
     @Override

src/main/java/com/ic/er/common/DataType.java → src/main/java/io/github/MigadaTang/common/DataType.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
 
 public enum DataType {
     UNKNOWN,

src/main/java/com/ic/er/common/RelatedObjType.java → src/main/java/io/github/MigadaTang/common/RelatedObjType.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/ic/er/common/RelationshipSerializer.java → src/main/java/io/github/MigadaTang/common/RelationshipSerializer.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.ic.er.Relationship;
+import io.github.MigadaTang.Relationship;
 
 import java.io.IOException;
 

src/main/java/com/ic/er/common/ResultState.java → src/main/java/io/github/MigadaTang/common/ResultState.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/ic/er/common/ResultStateCode.java → src/main/java/io/github/MigadaTang/common/ResultStateCode.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
 
 public class ResultStateCode {
     public static Integer Success = 0;

src/main/java/com/ic/er/common/SchemaDeserializer.java → src/main/java/io/github/MigadaTang/common/SchemaDeserializer.java

-package com.ic.er.common;
+package io.github.MigadaTang.common;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.ic.er.ER;
-import com.ic.er.Entity;
-import com.ic.er.Relationship;
-import com.ic.er.Schema;
+import io.github.MigadaTang.ER;
+import io.github.MigadaTang.Entity;
+import io.github.MigadaTang.Relationship;
+import io.github.MigadaTang.Schema;
 
 import java.io.IOException;
 import java.util.HashMap;

src/main/java/com/ic/er/dao/AttributeMapper.java → src/main/java/io/github/MigadaTang/dao/AttributeMapper.java

-package com.ic.er.dao;
+package io.github.MigadaTang.dao;
 
-import com.ic.er.entity.AttributeDO;
+import io.github.MigadaTang.entity.AttributeDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/ic/er/dao/EntityMapper.java → src/main/java/io/github/MigadaTang/dao/EntityMapper.java

-package com.ic.er.dao;
+package io.github.MigadaTang.dao;
 
-import com.ic.er.entity.EntityDO;
+import io.github.MigadaTang.entity.EntityDO;
 
 import java.util.List;