Skip to content

Commit

Permalink
Update to takari 12
Browse files Browse the repository at this point in the history
Remove all snapshot repos
Update reference to facade to the right coordinates
Update manifest references to updated version
  • Loading branch information
Jason van Zyl committed Sep 12, 2014
1 parent 1fd29cb commit 56358ad
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.project
.classpath
target/
update.sh
9 changes: 1 addition & 8 deletions org.sonatype.m2e.discovery.publisher.maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.takari.m2e.discovery.publisher</groupId>
<artifactId>org.sonatype.m2e.discovery.publisher.parent</artifactId>
<version>0.1.0</version>
<version>0.4.0</version>
</parent>

<artifactId>org.sonatype.m2e.discovery.publisher.maven-plugin</artifactId>
Expand Down Expand Up @@ -127,11 +127,4 @@
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>rso-snapshots</id>
<url>https://repository.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
public class P2RuntimeMetadata
implements TychoP2RuntimeMetadata
{
private static final String DEFAULT_VERSION = "0.0.1-SNAPSHOT";
private static final String DEFAULT_VERSION = "0.4.0";

private static final List<Dependency> ARTIFACTS;

Expand All @@ -30,9 +30,9 @@ public class P2RuntimeMetadata

String p2Version = getVersion();

ARTIFACTS.add( newDependency( "org.sonatype.m2e.discovery.publisher",
ARTIFACTS.add( newDependency( "io.takari.m2e.discovery.publisher",
"org.sonatype.m2e.discovery.publisher.p2.facade", p2Version, "jar" ) );
ARTIFACTS.add( newDependency( "org.sonatype.m2e.discovery.publisher",
ARTIFACTS.add( newDependency( "io.takari.m2e.discovery.publisher",
"org.sonatype.m2e.discovery.publisher.p2.impl", p2Version, "jar" ) );
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: M2E Discovery Publisher P2 Facade
Bundle-SymbolicName: org.sonatype.m2e.discovery.publisher.p2.facade;singleton:=true
Bundle-Version: 0.1.0
Bundle-Version: 0.4.0
Bundle-Vendor: Sonatype
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Expand Down
2 changes: 1 addition & 1 deletion org.sonatype.m2e.discovery.publisher.p2.facade/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.takari.m2e.discovery.publisher</groupId>
<artifactId>org.sonatype.m2e.discovery.publisher.parent</artifactId>
<version>0.1.0</version>
<version>0.4.0</version>
</parent>

<artifactId>org.sonatype.m2e.discovery.publisher.p2.facade</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: M2E Discovery Publisher P2 Facade Implementation
Bundle-SymbolicName: org.sonatype.m2e.discovery.publisher.p2.impl;singleton:=true
Bundle-Version: 0.1.0
Bundle-Version: 0.4.0
Bundle-Vendor: Sonatype
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Expand Down
2 changes: 1 addition & 1 deletion org.sonatype.m2e.discovery.publisher.p2.impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.takari.m2e.discovery.publisher</groupId>
<artifactId>org.sonatype.m2e.discovery.publisher.parent</artifactId>
<version>0.1.0</version>
<version>0.4.0</version>
</parent>

<artifactId>org.sonatype.m2e.discovery.publisher.p2.impl</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>io.takari</groupId>
<artifactId>takari</artifactId>
<version>9</version>
<version>12</version>
</parent>

<groupId>io.takari.m2e.discovery.publisher</groupId>
<artifactId>org.sonatype.m2e.discovery.publisher.parent</artifactId>
<version>0.1.0</version>
<version>0.4.0</version>

<packaging>pom</packaging>

Expand Down

0 comments on commit 56358ad

Please sign in to comment.