Skip to content

Commit

Permalink
Merge pull request onlyliuxin#61 from miniyk2012/master
Browse files Browse the repository at this point in the history
项目改成maven管理
  • Loading branch information
Rong Huang authored Mar 23, 2017
2 parents 295b02e + c361477 commit 5f7ea1f
Show file tree
Hide file tree
Showing 35 changed files with 53 additions and 24 deletions.
7 changes: 4 additions & 3 deletions group02/812350401/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/bin/
/lib/
/src/java_training
target/
.idea/
src/main/java/train/
src/main/resources/
38 changes: 38 additions & 0 deletions group02/812350401/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>coding2017</groupId>
<artifactId>812350401</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<!-- https://mvnrepository.com/artifact/dom4j/dom4j -->
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
</dependencies>


</project>
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private int[] getFactors(int num) {
* 例如array= [3,8,9], seperator = "-"
* 则返回值为"3-8-9"
* @param array
* @param s
* @param seperator
* @return
*/
public String join(int[] array, String seperator){
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.github.miniyk2012.coding2017.basic.test;
package com.github.miniyk2012.coding2017.basic;

import org.junit.Before;
import com.github.miniyk2012.coding2017.basic.ArrayList;


public class ArrayListTest extends ListTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.miniyk2012.coding2017.basic.test;
package com.github.miniyk2012.coding2017.basic;

import static org.junit.Assert.assertEquals;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package com.github.miniyk2012.coding2017.basic.test;
package com.github.miniyk2012.coding2017.basic;

import static org.junit.Assert.*;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import com.github.miniyk2012.coding2017.basic.Iterator;
import com.github.miniyk2012.coding2017.basic.LinkedList;


public class LinkedListTest extends ListTest{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.miniyk2012.coding2017.basic.test;
package com.github.miniyk2012.coding2017.basic;

import static org.junit.Assert.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.miniyk2012.coding2017.basic.test;
package com.github.miniyk2012.coding2017.basic;

import static org.junit.Assert.*;
import org.junit.Before;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.miniyk2012.coding2017.basic.test;
package com.github.miniyk2012.coding2017.basic;

import static org.junit.Assert.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.miniyk2012.coding2017.coderising.array.test;
package com.github.miniyk2012.coding2017.coderising.array;

import static org.junit.Assert.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package test.com.github.miniyk2012.coding2017.coderising.download.impl;
package com.github.miniyk2012.coding2017.coderising.download;

import com.github.miniyk2012.coding2017.coderising.download.api.Connection;
import com.github.miniyk2012.coding2017.coderising.download.impl.ConnectionImpl;
import com.github.miniyk2012.coding2017.coderising.download.impl.ConnectionManagerImpl;
import org.junit.Test;
import org.junit.Before;
import org.junit.After;

import java.net.URL;
import org.junit.Before;
import org.junit.Test;

/**
* ConnectionImpl Tester.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
import org.junit.Test;





public class StrutsTest {

@Test
Expand Down

0 comments on commit 5f7ea1f

Please sign in to comment.