Skip to content

Commit

Permalink
Merge pull request #676 from kedzie/646
Browse files Browse the repository at this point in the history
#646 moved XpathAppendingTransformer to simp package
  • Loading branch information
mosabua committed Sep 22, 2015
2 parents 44a5951 + 2b1db99 commit b2b2607
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jayway.maven.plugins.android.resource;
package com.simpligility.maven.plugins.android.resource;

import org.apache.maven.plugins.shade.relocation.Relocator;
import org.apache.maven.plugins.shade.resource.ResourceTransformer;
Expand Down Expand Up @@ -153,4 +153,4 @@ public void modifyOutputStream( JarOutputStream jos )

doc = null;
}
}
}
12 changes: 6 additions & 6 deletions src/test/projects/duplicates/duplicates-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand All @@ -19,17 +19,17 @@

<dependencies>
<dependency>
<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-lib-a</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-lib-b</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-lib-c</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down Expand Up @@ -61,10 +61,10 @@
</apk>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="com.jayway.maven.plugins.android.resource.XpathAppendingTransformer">
<transformer implementation="com.simpligility.maven.plugins.android.resource.XpathAppendingTransformer">
<resource>META-INF/kmodule.xml</resource>
</transformer>
<transformer implementation="com.jayway.maven.plugins.android.resource.XpathAppendingTransformer">
<transformer implementation="com.simpligility.maven.plugins.android.resource.XpathAppendingTransformer">
<resource>kmodule.info</resource>
<elements>
<element>/org.drools.core.rule.KieModuleMetaInfo/typeMetaInfos</element>
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/duplicates/duplicates-lib-a/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/duplicates/duplicates-lib-b/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/duplicates/duplicates-lib-c/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/duplicates/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.jayway.maven.plugins.android.tests</groupId>
<groupId>com.simpligility.maven.plugins.android.tests</groupId>
<artifactId>duplicates-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down

0 comments on commit b2b2607

Please sign in to comment.