Skip to content

Commit

Permalink
IDEX-2982. Change Che pom.xml parent values
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanNikitenko committed Oct 13, 2015
1 parent 3464966 commit 0736807
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions assembly-sdk-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<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>
<parent>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-ide-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<artifactId>assembly-sdk-war</artifactId>
<packaging>war</packaging>
<name>Che SDK :: Compiling GWT Application</name>
<name>Che :: Compiling GWT Application</name>
<properties>
<generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
<maven.compiler.source>1.7</maven.compiler.source>
Expand Down
18 changes: 9 additions & 9 deletions assembly-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<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>
<parent>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-ide-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<artifactId>assembly-sdk</artifactId>
<packaging>pom</packaging>
<name>Che SDK :: Assemblies Tomcat</name>
<name>Che :: Assemblies Tomcat</name>
<dependencies>
<dependency>
<groupId>com.codenvy.resources</groupId>
Expand Down Expand Up @@ -52,6 +52,12 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.che.ide</groupId>

This comment has been minimized.

Copy link
@benoitf

benoitf Oct 13, 2015

Contributor

assembly-sdk-war <- still SDK name

<artifactId>assembly-sdk-war</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-docker-recipes</artifactId>
Expand All @@ -65,12 +71,6 @@
<type>jar</type>
<classifier>jar-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>assembly-sdk-war</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion assembly-sdk/src/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<outputDirectory>webapps</outputDirectory>
<outputFileNameMapping>che.war</outputFileNameMapping>
<includes>
<include>org.eclipse.che.sdk:assembly-sdk-war</include>
<include>org.eclipse.che.ide:assembly-sdk-war</include>
</includes>
</dependencySet>
<dependencySet>
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<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>
<parent>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-ide-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.examples</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<groupId>org.eclipse.che.depmgt</groupId>
<version>3.13.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.sdk</groupId>
<artifactId>che-sdk-parent</artifactId>
<groupId>org.eclipse.che.ide</groupId>
<artifactId>che-ide-parent</artifactId>
<version>3.13.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che SDK :: Parent</name>
<name>Che :: Parent</name>
<modules>
<module>examples</module>
<module>assembly-sdk-war</module>
Expand Down

0 comments on commit 0736807

Please sign in to comment.