[#178] Removed atom-starter

pragmatic-objects · Jun 4, 2018 · 784217e · 784217e
1 parent 1fb79ca
commit 784217e
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 236 deletions.
diff --git a/README.md b/README.md
@@ -39,12 +39,21 @@ OO-atom project is designed on the following principles:
 
 ## Quick start with Maven
 
-Make your project parent from `atom-starter`.
+Add `atom-maven-plugin` to your project's pom file:
 
 ```
-    <parent>
-        <groupId>com.pragmaticobjects.oo.atom</groupId>
-        <artifactId>atom-starter</artifactId>
-        <version>x.y.z</version>
-    </parent>
+<plugin>
+    <groupId>com.pragmaticobjects.oo.atom</groupId>
+    <artifactId>atom-maven-plugin</artifactId>
+    <version>x.y.z</version>
+    <executions>
+        <execution>
+            <goals>
+                <goal>generate-annotations</goal>
+                <goal>instrument</goal>
+                <goal>instrument-tests</goal>
+            </goals>
+        </execution>
+    </executions>
+</plugin>
 ```
diff --git a/atom-it/pom.xml b/atom-it/pom.xml
@@ -3,9 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.pragmaticobjects.oo.atom</groupId>
-        <artifactId>atom-starter</artifactId>
+        <artifactId>oo-atom</artifactId>
         <version>0.0.0-SNAPSHOT</version>
-        <relativePath>../atom-starter</relativePath>
     </parent>
     <artifactId>atom-it</artifactId>
     <packaging>tabularasa</packaging>
@@ -67,6 +66,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.pragmaticobjects.oo.atom</groupId>
+                <artifactId>atom-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-annotations</goal>
+                            <goal>instrument</goal>
+                            <goal>instrument-tests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/atom-starter/pom.xml b/atom-starter/pom.xml
diff --git a/atomizer/pom.xml b/atomizer/pom.xml
diff --git a/atomizer/src/templates/bootstrap.sh b/atomizer/src/templates/bootstrap.sh
diff --git a/deploy.sh b/deploy.sh
@@ -8,10 +8,6 @@ fi
 
 git checkout $(git rev-parse HEAD)
 mvn versions:set "-DnewVersion=${TAG}"
-cd atom-starter
-mvn versions:set "-DnewVersion=${TAG}"
-mvn versions:set-property -Dproperty=atom.version "-DnewVersion=${TAG}"
-cd -
 mvn clean deploy -Pextras,ossrh
 git commit -am "[release] oo-atom-${TAG}"
 git tag -f ${TAG}

diff --git a/pom.xml b/pom.xml
@@ -343,6 +343,9 @@ SOFTWARE.
                         <executions>
                             <execution>
                                 <configuration>
+                                    <sourceDirectories>
+                                        <sourceDirectory>src/main/java</sourceDirectory>
+                                    </sourceDirectories>
                                     <logViolationsToConsole>true</logViolationsToConsole>
                                     <configLocation>checkstyle.xml</configLocation>
                                     <encoding>UTF-8</encoding>
@@ -390,7 +393,6 @@ SOFTWARE.
     </profiles>
     <modules>
         <module>atom-basis</module>
-        <module>atom-starter</module>
         <module>atom-maven-plugin</module>
         <module>atom-it</module>
         <!-- @todo #178 currently, atomizer is broken: really-executable-jar-maven-plugin doesn't support attaching external dependencies. Ustub the module after fixing or working around this issue.