Skip to content

Commit

Permalink
[Guvnor 3016] New KieTakari Plugin (kiegroup#1030)
Browse files Browse the repository at this point in the history
* New Kie Maven plugin Takari

* comments

* Fix plugin name

* changed module name

* fix pom deps

* fix pom test deps

* enabled kie-maven-takari-plugin in tests, fixed components.xml, Mojos from kie maven plugin and tests

* Added same deps of kie maven plugin

* kie-maven-takari-plugin become kie-takari-plugin

* kie-maven-takari-plugin become kie-takari-plugin

* re-enabled all maven versions in tests

* tmp commit to fix tests

* removed unused dependencies

* version instead of placeholder

* Removed maven 3.2.5 because the latest takari version 1.12.5 needs maven 3.3.9  as requirement

* restored placeholder in test's projects

* moved takari version to the kie-parent enabled log and removed System.out from tests

* log configuration

* removed duplicated and unused deps

* Moved kie-maven-plugin and kie-takari tests to the kie-plugins-testing

* automatic reformat code

* cleaned .idea files, added skip .idea in .gitignore

* changes requested by QA

* removed the takari version from the build plugin

* moved tests of kie-maven-plugin and kie-takari-plugin into kie-plugins-testing

* cleaned comments and unused parts

* cleaned comments

* version bump
  • Loading branch information
desmax74 authored and porcelli committed Jul 18, 2017
1 parent c9270ef commit 4539aad
Show file tree
Hide file tree
Showing 143 changed files with 2,692 additions and 1,092 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
.classpath
.project
.settings
.idea
target

# Repository wide ignore mac DS_Store files
Expand Down
30 changes: 15 additions & 15 deletions kie-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
<plugin>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>takari-lifecycle-plugin</artifactId>
<version>1.12.4</version>
<extensions>true</extensions>
<configuration>
<proc>none</proc>
</configuration>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -185,15 +187,14 @@
<artifactId>kie-dmn-core</artifactId>
<scope>runtime</scope>
</dependency>

<!-- Was added to support log on Maven 3.0.5 but now old; if this dep is missing, when running takari for maven 3.0.5 the log might be missing some lines from the internal classes logging.
Also could be handy for temporarily turn on debug output of the inner classes while performing tests using the takari framework.
But in conclusion, not a good practice to depend on logging implementation.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>runtime</scope>
</dependency> -->
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
</dependency>

<!-- Testing deps -->
<dependency>
Expand All @@ -212,16 +213,15 @@
<artifactId>takari-plugin-testing</artifactId>
<scope>test</scope>
</dependency>
<!--Logs-->
<dependency>
<groupId>io.takari.maven.plugins</groupId>
<artifactId>takari-plugin-integration-testing</artifactId>
<type>pom</type>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
public abstract class AbstractKieMojo extends AbstractMojo {

protected void setSystemProperties(Map<String, String> properties) {

if (properties != null) {
getLog().debug("Additional system properties: " + properties);
for (Map.Entry<String, String> property : properties.entrySet()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,19 @@ private void shareKieObjectsWithMap(InternalKieModule kModule) {
KieMetaInfoBuilder builder = new KieMetaInfoBuilder(kModule);
KieModuleMetaInfo modelMetaInfo = builder.getKieModuleMetaInfo();

/*Standard for the kieMap keys -> compilationID + dot + class name with first lowercase*/
/*Standard for the kieMap keys -> compilationID + dot + class name */
StringBuilder sbModelMetaInfo = new StringBuilder(compilationID).append(".").append(KieModuleMetaInfo.class.getName());
StringBuilder sbkModule = new StringBuilder(compilationID).append(".").append(FileKieModule.class.getName());

if (modelMetaInfo != null) {
optionalKieMap.get().put(sbModelMetaInfo.toString(),
modelMetaInfo);
getLog().info("KieModelMetaInfo available in the map shared with the Maven Embedded");
getLog().info("KieModelMetaInfo available in the map shared with the Maven Embedder");
}
if (kModule != null) {
optionalKieMap.get().put(sbkModule.toString(),
kModule);
getLog().info("KieModule available in the map shared with the Maven Embedded");
getLog().info("KieModule available in the map shared with the Maven Embedder");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.kie.maven.plugin;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down

This file was deleted.

Loading

0 comments on commit 4539aad

Please sign in to comment.