Skip to content

Commit

Permalink
Update javadoc, release config
Browse files Browse the repository at this point in the history
  • Loading branch information
@kingjan1999
kingjan1999 committed May 31, 2020
1 parent 8bad8a6 commit fa0672f
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 72 deletions.
133 changes: 71 additions & 62 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>me.kingjan1999.fhdw</groupId>
<artifactId>alphacamunda</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>

<name>${project.groupId}:${project.artifactId}</name>
<url>https://github.com/kingjan1999/alpha-camunda</url>
Expand All @@ -33,6 +33,11 @@
<maven.compiler.target>11</maven.compiler.target>
</properties>

<scm>
<connection>scm:git:https://github.com/kingjan1999/alpha-camunda.git</connection>
<url>https://github.com/kingjan1999/alpha-camunda</url>
</scm>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -73,77 +78,81 @@
</dependencies>

<build>
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
<pluginManagement>
<plugins>
<!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>deploy</phase>
<goals><goal>jar-no-fork</goal></goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>deploy</phase>
<goals><goal>jar</goal></goals>
</execution>
</executions>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<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://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.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-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<source>8</source> <!-- avoid module issue -->
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>bintray-kingjan1999-alpha-algorithm-camunda</id>
<name>kingjan1999-alpha-algorithm-camunda</name>
<url>https://api.bintray.com/maven/kingjan1999/alpha-algorithm-camunda/alpha-camunda/;publish=1</url>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>
16 changes: 8 additions & 8 deletions src/main/java/me/kingjan1999/fhdw/alphacamunda/BPMNCreator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public class BPMNCreator {
/**
* Creates a new layouted bpmn model based on the results
* of the passed {@link RelationBuilder}.
* @param algorithm
* @return
* @param algorithm Filled RelationBuilder
* @return Layouted generated BpmnModelInstance
*/
public static BpmnModelInstance createAndLayout(RelationBuilder algorithm) {
var creator = new BPMNCreator();
Expand All @@ -62,12 +62,12 @@ public static BpmnModelInstance createAndLayout(RelationBuilder algorithm) {
/**
* Creates a new bpmn model based on the passed results
* of the alpha algorithm so far
* @param act
* @param alternatives
* @param abstractions
* @param causalities
* @param noSuccession
* @return
* @param act Act Relation
* @param alternatives Alternatives Relation
* @param abstractions Abstractions Relation
* @param causalities Causalities Relation
* @param noSuccession NoSuccession Relation
* @return Generated BpmnModelInstance, without layout
*/
public BpmnModelInstance create(List<Activity> act,
List<Triple<Activity, Activity, Activity>> alternatives,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/kingjan1999/fhdw/alphacamunda/domain/Activity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public String toString() {
/**
* Attention: equals() is not transitive when the placeholder is compared!
* a = Placeholder \land b = PLaceholder, does not imply a = b!
* @param o
* @return
* @param o Object to compare to
* @return true if objects are equal or one of the compared objects is the placeholder; false otherwise
*/
@Override
public boolean equals(Object o) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/me/kingjan1999/fhdw/alphacamunda/layouter/Layouter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public interface Layouter {
/**
* Creates a diagramm layout for the given modelInstance
* Note: A new modelInstance is created and the old remains untouched.
* @param modelInstance ModelInstance to layout
* @return Layouted modelInstance
*/
BpmnModelInstance layout(BpmnModelInstance modelInstance);
Expand Down

0 comments on commit fa0672f

Please sign in to comment.