Skip to content

Commit

Permalink
change groupId to io.springside and fix some 3pp version problem
Browse files Browse the repository at this point in the history
  • Loading branch information
Calvin committed Dec 25, 2014
1 parent a01cd0b commit 6a788aa
Show file tree
Hide file tree
Showing 19 changed files with 82 additions and 49 deletions.
4 changes: 2 additions & 2 deletions README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
1. Quickstart -- a minimal CRUD Todo-List web application.
2. Showcase -- demonstrate many other interesting technologies.
3. BootService -- a Spring Boot based WebService application.
4. BootWeb -- a Spring Boot based Web application(TODO).
4. BootMore -- a Spring Boot based WebService application with more samle.

-------------------------------
Offical Site: http://springside.github.io
Offical Site: http://springside.io
Document: https://github.com/springside/springside4/wiki
6 changes: 3 additions & 3 deletions examples/boot-more/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.springside.examples</groupId>
<groupId>io.springside.examples</groupId>
<artifactId>boot-more</artifactId>
<version>4.3.0-SNAPSHOT</version>
<packaging>war</packaging>
Expand Down Expand Up @@ -56,7 +56,7 @@

<!-- springside -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-utils</artifactId>
<version>${springside.version}</version>
</dependency>
Expand Down Expand Up @@ -108,7 +108,7 @@
</dependency>

<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-utils</artifactId>
<version>${springside.version}</version>
<classifier>tests</classifier>
Expand Down
6 changes: 3 additions & 3 deletions examples/boot-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.springside.examples</groupId>
<groupId>io.springside.examples</groupId>
<artifactId>boot-service</artifactId>
<version>4.3.0-SNAPSHOT</version>
<packaging>war</packaging>
Expand Down Expand Up @@ -40,7 +40,7 @@

<!-- springside -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-utils</artifactId>
<version>${springside.version}</version>
</dependency>
Expand Down Expand Up @@ -80,7 +80,7 @@
</dependency>

<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-utils</artifactId>
<version>${springside.version}</version>
<classifier>tests</classifier>
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../modules/parent/</relativePath>
</parent>
<groupId>org.springside.examples</groupId>
<groupId>io.springside.examples</groupId>
<artifactId>springside-examples</artifactId>
<name>Springside :: Example</name>
<packaging>pom</packaging>
Expand Down
26 changes: 23 additions & 3 deletions examples/quickstart/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cn.org.springside.examples</groupId>
<groupId>io.springside.examples</groupId>
<artifactId>quickstart</artifactId>
<version>4.3.0-SNAPSHOT</version>
<packaging>war</packaging>
Expand Down Expand Up @@ -78,7 +78,7 @@
<dependencies>
<!-- SPRINGSIDE -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
<version>${springside.version}</version>
</dependency>
Expand Down Expand Up @@ -252,7 +252,7 @@

<!-- TEST begin -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
<version>${springside.version}</version>
<classifier>tests</classifier>
Expand Down Expand Up @@ -510,6 +510,26 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
</plugin>

<!--jetty插件-->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<systemProperties>
<systemProperty>
<name>spring.profiles.active</name>
<value>development</value>
</systemProperty>
</systemProperties>
<useTestClasspath>true</useTestClasspath>

<webAppConfig>
<contextPath>/${project.artifactId}</contextPath>
</webAppConfig>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
16 changes: 8 additions & 8 deletions examples/showcase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../modules/parent/</relativePath>
</parent>
<groupId>org.springside.examples</groupId>
<groupId>io.springside.examples</groupId>
<artifactId>showcase</artifactId>
<packaging>war</packaging>
<name>Springside :: Example :: Showcase</name>
Expand All @@ -24,19 +24,19 @@
<dependencies>
<!-- SPRINGSIDE begin -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-extension</artifactId>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-metrics</artifactId>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-redis</artifactId>
</dependency>
<!-- SPRINGSIDE end -->
Expand Down Expand Up @@ -366,15 +366,15 @@
</dependency>

<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
<classifier>tests</classifier>
<!-- for xxxDemo class -->
<scope>compile</scope>
</dependency>

<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-extension</artifactId>
<classifier>tests</classifier>
<!-- for xxxDemo class -->
Expand Down
2 changes: 1 addition & 1 deletion generate-project.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ echo [INFO] Generating project in ./generated-projects

if not exist generated-projects mkdir generated-projects
cd generated-projects
call mvn archetype:generate -DarchetypeGroupId=org.springside.examples -DarchetypeArtifactId=quickstart-archetype -DarchetypeVersion=4.2.3-GA
call mvn archetype:generate -DarchetypeGroupId=io.springside.examples -DarchetypeArtifactId=quickstart-archetype -DarchetypeVersion=4.3.0-SNAPSHOT

pause

Expand Down
2 changes: 1 addition & 1 deletion generate-project.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ fi

cd generated-projects

mvn archetype:generate -DarchetypeGroupId=org.springside.examples -DarchetypeArtifactId=quickstart-archetype -DarchetypeVersion=4.2.3-GA
mvn archetype:generate -DarchetypeGroupId=io.springside.examples -DarchetypeArtifactId=quickstart-archetype -DarchetypeVersion=4.3.0-SNAPSHOT
4 changes: 2 additions & 2 deletions modules/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../parent/</relativePath>
Expand All @@ -14,7 +14,7 @@

<dependencies>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-utils</artifactId>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions modules/extension/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../parent/</relativePath>
Expand All @@ -15,7 +15,7 @@
<dependencies>
<!-- SPRINGSIDE -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
</dependency>
<!-- SPRING -->
Expand Down Expand Up @@ -78,7 +78,7 @@
</dependency>

<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
<classifier>tests</classifier>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion modules/metrics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../parent/</relativePath>
Expand Down
34 changes: 24 additions & 10 deletions modules/parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<name>Springside :: Module :: Parent</name>
Expand Down Expand Up @@ -44,9 +44,9 @@
<dozer.version>5.5.1</dozer.version>
<freemarker.version>2.3.21</freemarker.version>
<aspectj.version>1.8.4</aspectj.version>
<junit.version>4.12</junit.version>
<junit.version>4.11</junit.version>
<assertj.version>1.7.0</assertj.version>
<mockito.version>1.10.16</mockito.version>
<mockito.version>1.10.8</mockito.version>
<powermock.version>1.6.0</powermock.version>
<selenium.version>2.42.2</selenium.version>
<nosqlunit.version>0.8.0</nosqlunit.version>
Expand Down Expand Up @@ -88,30 +88,30 @@
<dependencies>
<!-- SPRINGSIDE MODULES begin -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-utils</artifactId>
<version>${springside.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
<version>${springside.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-extension</artifactId>
<version>${springside.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-metrics</artifactId>
<version>${springside.version}</version>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-redis</artifactId>
<version>${springside.version}</version>
</dependency>
Expand Down Expand Up @@ -686,14 +686,14 @@

<!-- springside -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-core</artifactId>
<version>${springside.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-extension</artifactId>
<version>${springside.version}</version>
<classifier>tests</classifier>
Expand Down Expand Up @@ -972,6 +972,20 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
</plugin>

<!-- jetty -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
</plugin>

<!-- tomcat -->
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
2 changes: 1 addition & 1 deletion modules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../modules/parent/</relativePath>
Expand Down
4 changes: 2 additions & 2 deletions modules/redis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../parent/</relativePath>
Expand All @@ -15,7 +15,7 @@
<dependencies>
<!-- SPRINGSIDE -->
<dependency>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-utils</artifactId>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion modules/utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.org.springside</groupId>
<groupId>io.springside</groupId>
<artifactId>springside-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../parent/</relativePath>
Expand Down
Loading

0 comments on commit 6a788aa

Please sign in to comment.