| Revisión | bd0d19343adec13d56fde3353a838f570b1dc534 (tree) |
|---|---|
| Tiempo | 2014-06-02 02:35:52 |
| Autor | Masahiko, SAWAI <say@user...> |
| Commiter | Masahiko, SAWAI |
Changed project structure
simple-battery-logger/pom.xml (diff) simple-battery-logger/simple-battery-logger-app/pom.xml (diff) simple-battery-logger/simple-battery-logger-dropbox/pom.xml (diff)| @@ -17,121 +17,4 @@ | ||
| 17 | 17 | <module>simple-battery-logger-dropbox</module> |
| 18 | 18 | </modules> |
| 19 | 19 | |
| 20 | - <dependencyManagement> | |
| 21 | - <dependencies> | |
| 22 | - <dependency> | |
| 23 | - <groupId>junit</groupId> | |
| 24 | - <artifactId>junit</artifactId> | |
| 25 | - <version>3.8.1</version> | |
| 26 | - <scope>test</scope> | |
| 27 | - </dependency> | |
| 28 | - </dependencies> | |
| 29 | - </dependencyManagement> | |
| 30 | - | |
| 31 | - <build> | |
| 32 | - <pluginManagement> | |
| 33 | - <plugins> | |
| 34 | - <plugin> | |
| 35 | - <groupId>com.jayway.maven.plugins.android.generation2</groupId> | |
| 36 | - <artifactId>android-maven-plugin</artifactId> | |
| 37 | - <version>3.8.2</version> | |
| 38 | - </plugin> | |
| 39 | - | |
| 40 | - <!-- mvn compile --> | |
| 41 | - <plugin> | |
| 42 | - <groupId>org.apache.maven.plugins</groupId> | |
| 43 | - <artifactId>maven-compiler-plugin</artifactId> | |
| 44 | - <version>3.1</version> | |
| 45 | - | |
| 46 | - <configuration> | |
| 47 | - <source>1.5</source> | |
| 48 | - <target>1.5</target> | |
| 49 | - <encoding>UTF-8</encoding> | |
| 50 | - </configuration> | |
| 51 | - </plugin> | |
| 52 | - | |
| 53 | - <!-- mvn resources:resources --> | |
| 54 | - <plugin> | |
| 55 | - <groupId>org.apache.maven.plugins</groupId> | |
| 56 | - <artifactId>maven-resources-plugin</artifactId> | |
| 57 | - <version>2.6</version> | |
| 58 | - | |
| 59 | - <configuration> | |
| 60 | - <encoding>UTF-8</encoding> | |
| 61 | - </configuration> | |
| 62 | - </plugin> | |
| 63 | - | |
| 64 | - <!-- mvn assembly:assembly --> | |
| 65 | - <plugin> | |
| 66 | - <groupId>org.apache.maven.plugins</groupId> | |
| 67 | - <artifactId>maven-assembly-plugin</artifactId> | |
| 68 | - <version>2.4</version> | |
| 69 | - | |
| 70 | - <configuration> | |
| 71 | - <descriptorRefs> | |
| 72 | - <!-- | |
| 73 | - <descriptorRef>jar-with-dependencies</descriptorRef> | |
| 74 | - <descriptorRef>bin</descriptorRef> | |
| 75 | - <descriptorRef>src</descriptorRef> | |
| 76 | - --> | |
| 77 | - <descriptorRef>project</descriptorRef> | |
| 78 | - </descriptorRefs> | |
| 79 | - </configuration> | |
| 80 | - </plugin> | |
| 81 | - | |
| 82 | - <!-- sign for release --> | |
| 83 | - <plugin> | |
| 84 | - <groupId>org.apache.maven.plugins</groupId> | |
| 85 | - <artifactId>maven-jarsigner-plugin</artifactId> | |
| 86 | - <version>1.3.2</version> | |
| 87 | - </plugin> | |
| 88 | - | |
| 89 | - <!-- mvn site --> | |
| 90 | - <plugin> | |
| 91 | - <groupId>org.apache.maven.plugins</groupId> | |
| 92 | - <artifactId>maven-site-plugin</artifactId> | |
| 93 | - <version>3.3</version> | |
| 94 | - | |
| 95 | - <configuration> | |
| 96 | - <locales>en</locales> | |
| 97 | - <inputEncoding>UTF-8</inputEncoding> | |
| 98 | - <outputEncoding>UTF-8</outputEncoding> | |
| 99 | - | |
| 100 | - <!-- | |
| 101 | - <reportPlugins> | |
| 102 | - <plugin> | |
| 103 | - <groupId>org.apache.maven.plugins</groupId> | |
| 104 | - <artifactId>maven-project-info-reports-plugin</artifactId> | |
| 105 | - </plugin> | |
| 106 | - </reportPlugins> | |
| 107 | - --> | |
| 108 | - </configuration> | |
| 109 | - </plugin> | |
| 110 | - | |
| 111 | - <plugin> | |
| 112 | - <groupId>org.apache.maven.plugins</groupId> | |
| 113 | - <artifactId>maven-project-info-reports-plugin</artifactId> | |
| 114 | - <version>2.7</version> | |
| 115 | - </plugin> | |
| 116 | - | |
| 117 | - <plugin> | |
| 118 | - <groupId>org.apache.maven.plugins</groupId> | |
| 119 | - <artifactId>maven-javadoc-plugin</artifactId> | |
| 120 | - <version>2.9.1</version> | |
| 121 | - | |
| 122 | - <configuration> | |
| 123 | - <locale>en</locale> | |
| 124 | - <author>true</author> | |
| 125 | - <source>1.5</source> | |
| 126 | - <show>public</show> | |
| 127 | - <charset>UTF-8</charset> | |
| 128 | - <encoding>UTF-8</encoding> | |
| 129 | - <docencoding>UTF-8</docencoding> | |
| 130 | - </configuration> | |
| 131 | - </plugin> | |
| 132 | - | |
| 133 | - </plugins> | |
| 134 | - </pluginManagement> | |
| 135 | - </build> | |
| 136 | - | |
| 137 | 20 | </project> |
| @@ -10,12 +10,7 @@ | ||
| 10 | 10 | <packaging>apk</packaging> |
| 11 | 11 | <version>1.2.01</version> |
| 12 | 12 | <name>Simple Battery Logger - App</name> |
| 13 | - | |
| 14 | - <parent> | |
| 15 | - <groupId>org.routine_work.simple_battery_logger</groupId> | |
| 16 | - <artifactId>simple-battery-logger-project</artifactId> | |
| 17 | - <version>1.2.01</version> | |
| 18 | - </parent> | |
| 13 | + <url>http://sourceforge.jp/users/say/pf/android_battery_logger/wiki/FrontPage</url> | |
| 19 | 14 | |
| 20 | 15 | <dependencies> |
| 21 | 16 |
| @@ -29,6 +24,7 @@ | ||
| 29 | 24 | <dependency> |
| 30 | 25 | <groupId>junit</groupId> |
| 31 | 26 | <artifactId>junit</artifactId> |
| 27 | + <version>3.8.1</version> | |
| 32 | 28 | <scope>test</scope> |
| 33 | 29 | </dependency> |
| 34 | 30 |
| @@ -37,6 +33,110 @@ | ||
| 37 | 33 | <build> |
| 38 | 34 | <sourceDirectory>src</sourceDirectory> |
| 39 | 35 | |
| 36 | + <pluginManagement> | |
| 37 | + <plugins> | |
| 38 | + <plugin> | |
| 39 | + <groupId>com.jayway.maven.plugins.android.generation2</groupId> | |
| 40 | + <artifactId>android-maven-plugin</artifactId> | |
| 41 | + <version>3.8.2</version> | |
| 42 | + </plugin> | |
| 43 | + | |
| 44 | + <!-- mvn compile --> | |
| 45 | + <plugin> | |
| 46 | + <groupId>org.apache.maven.plugins</groupId> | |
| 47 | + <artifactId>maven-compiler-plugin</artifactId> | |
| 48 | + <version>3.1</version> | |
| 49 | + | |
| 50 | + <configuration> | |
| 51 | + <source>1.5</source> | |
| 52 | + <target>1.5</target> | |
| 53 | + <encoding>UTF-8</encoding> | |
| 54 | + </configuration> | |
| 55 | + </plugin> | |
| 56 | + | |
| 57 | + <!-- mvn resources:resources --> | |
| 58 | + <plugin> | |
| 59 | + <groupId>org.apache.maven.plugins</groupId> | |
| 60 | + <artifactId>maven-resources-plugin</artifactId> | |
| 61 | + <version>2.6</version> | |
| 62 | + | |
| 63 | + <configuration> | |
| 64 | + <encoding>UTF-8</encoding> | |
| 65 | + </configuration> | |
| 66 | + </plugin> | |
| 67 | + | |
| 68 | + <!-- mvn assembly:assembly --> | |
| 69 | + <plugin> | |
| 70 | + <groupId>org.apache.maven.plugins</groupId> | |
| 71 | + <artifactId>maven-assembly-plugin</artifactId> | |
| 72 | + <version>2.4</version> | |
| 73 | + | |
| 74 | + <configuration> | |
| 75 | + <descriptorRefs> | |
| 76 | + <!-- | |
| 77 | + <descriptorRef>jar-with-dependencies</descriptorRef> | |
| 78 | + <descriptorRef>bin</descriptorRef> | |
| 79 | + <descriptorRef>src</descriptorRef> | |
| 80 | + --> | |
| 81 | + <descriptorRef>project</descriptorRef> | |
| 82 | + </descriptorRefs> | |
| 83 | + </configuration> | |
| 84 | + </plugin> | |
| 85 | + | |
| 86 | + <!-- sign for release --> | |
| 87 | + <plugin> | |
| 88 | + <groupId>org.apache.maven.plugins</groupId> | |
| 89 | + <artifactId>maven-jarsigner-plugin</artifactId> | |
| 90 | + <version>1.3.2</version> | |
| 91 | + </plugin> | |
| 92 | + | |
| 93 | + <!-- mvn site --> | |
| 94 | + <plugin> | |
| 95 | + <groupId>org.apache.maven.plugins</groupId> | |
| 96 | + <artifactId>maven-site-plugin</artifactId> | |
| 97 | + <version>3.3</version> | |
| 98 | + | |
| 99 | + <configuration> | |
| 100 | + <locales>en</locales> | |
| 101 | + <inputEncoding>UTF-8</inputEncoding> | |
| 102 | + <outputEncoding>UTF-8</outputEncoding> | |
| 103 | + | |
| 104 | + <!-- | |
| 105 | + <reportPlugins> | |
| 106 | + <plugin> | |
| 107 | + <groupId>org.apache.maven.plugins</groupId> | |
| 108 | + <artifactId>maven-project-info-reports-plugin</artifactId> | |
| 109 | + </plugin> | |
| 110 | + </reportPlugins> | |
| 111 | + --> | |
| 112 | + </configuration> | |
| 113 | + </plugin> | |
| 114 | + | |
| 115 | + <plugin> | |
| 116 | + <groupId>org.apache.maven.plugins</groupId> | |
| 117 | + <artifactId>maven-project-info-reports-plugin</artifactId> | |
| 118 | + <version>2.7</version> | |
| 119 | + </plugin> | |
| 120 | + | |
| 121 | + <plugin> | |
| 122 | + <groupId>org.apache.maven.plugins</groupId> | |
| 123 | + <artifactId>maven-javadoc-plugin</artifactId> | |
| 124 | + <version>2.9.1</version> | |
| 125 | + | |
| 126 | + <configuration> | |
| 127 | + <locale>en</locale> | |
| 128 | + <author>true</author> | |
| 129 | + <source>1.5</source> | |
| 130 | + <show>public</show> | |
| 131 | + <charset>UTF-8</charset> | |
| 132 | + <encoding>UTF-8</encoding> | |
| 133 | + <docencoding>UTF-8</docencoding> | |
| 134 | + </configuration> | |
| 135 | + </plugin> | |
| 136 | + | |
| 137 | + </plugins> | |
| 138 | + </pluginManagement> | |
| 139 | + | |
| 40 | 140 | <plugins> |
| 41 | 141 | <plugin> |
| 42 | 142 | <groupId>com.jayway.maven.plugins.android.generation2</groupId> |
| @@ -10,12 +10,7 @@ | ||
| 10 | 10 | <packaging>apk</packaging> |
| 11 | 11 | <version>1.2.01</version> |
| 12 | 12 | <name>Simple Battery Logger - Dropbox Uploader</name> |
| 13 | - | |
| 14 | - <parent> | |
| 15 | - <groupId>org.routine_work.simple_battery_logger</groupId> | |
| 16 | - <artifactId>simple-battery-logger-project</artifactId> | |
| 17 | - <version>1.2.01</version> | |
| 18 | - </parent> | |
| 13 | + <url>http://sourceforge.jp/users/say/pf/android_battery_logger/wiki/FrontPage</url> | |
| 19 | 14 | |
| 20 | 15 | <dependencies> |
| 21 | 16 |
| @@ -36,6 +31,7 @@ | ||
| 36 | 31 | <dependency> |
| 37 | 32 | <groupId>junit</groupId> |
| 38 | 33 | <artifactId>junit</artifactId> |
| 34 | + <version>3.8.1</version> | |
| 39 | 35 | <scope>test</scope> |
| 40 | 36 | </dependency> |
| 41 | 37 |
| @@ -43,6 +39,109 @@ | ||
| 43 | 39 | |
| 44 | 40 | <build> |
| 45 | 41 | <sourceDirectory>src</sourceDirectory> |
| 42 | + <pluginManagement> | |
| 43 | + <plugins> | |
| 44 | + <plugin> | |
| 45 | + <groupId>com.jayway.maven.plugins.android.generation2</groupId> | |
| 46 | + <artifactId>android-maven-plugin</artifactId> | |
| 47 | + <version>3.8.2</version> | |
| 48 | + </plugin> | |
| 49 | + | |
| 50 | + <!-- mvn compile --> | |
| 51 | + <plugin> | |
| 52 | + <groupId>org.apache.maven.plugins</groupId> | |
| 53 | + <artifactId>maven-compiler-plugin</artifactId> | |
| 54 | + <version>3.1</version> | |
| 55 | + | |
| 56 | + <configuration> | |
| 57 | + <source>1.5</source> | |
| 58 | + <target>1.5</target> | |
| 59 | + <encoding>UTF-8</encoding> | |
| 60 | + </configuration> | |
| 61 | + </plugin> | |
| 62 | + | |
| 63 | + <!-- mvn resources:resources --> | |
| 64 | + <plugin> | |
| 65 | + <groupId>org.apache.maven.plugins</groupId> | |
| 66 | + <artifactId>maven-resources-plugin</artifactId> | |
| 67 | + <version>2.6</version> | |
| 68 | + | |
| 69 | + <configuration> | |
| 70 | + <encoding>UTF-8</encoding> | |
| 71 | + </configuration> | |
| 72 | + </plugin> | |
| 73 | + | |
| 74 | + <!-- mvn assembly:assembly --> | |
| 75 | + <plugin> | |
| 76 | + <groupId>org.apache.maven.plugins</groupId> | |
| 77 | + <artifactId>maven-assembly-plugin</artifactId> | |
| 78 | + <version>2.4</version> | |
| 79 | + | |
| 80 | + <configuration> | |
| 81 | + <descriptorRefs> | |
| 82 | + <!-- | |
| 83 | + <descriptorRef>jar-with-dependencies</descriptorRef> | |
| 84 | + <descriptorRef>bin</descriptorRef> | |
| 85 | + <descriptorRef>src</descriptorRef> | |
| 86 | + --> | |
| 87 | + <descriptorRef>project</descriptorRef> | |
| 88 | + </descriptorRefs> | |
| 89 | + </configuration> | |
| 90 | + </plugin> | |
| 91 | + | |
| 92 | + <!-- sign for release --> | |
| 93 | + <plugin> | |
| 94 | + <groupId>org.apache.maven.plugins</groupId> | |
| 95 | + <artifactId>maven-jarsigner-plugin</artifactId> | |
| 96 | + <version>1.3.2</version> | |
| 97 | + </plugin> | |
| 98 | + | |
| 99 | + <!-- mvn site --> | |
| 100 | + <plugin> | |
| 101 | + <groupId>org.apache.maven.plugins</groupId> | |
| 102 | + <artifactId>maven-site-plugin</artifactId> | |
| 103 | + <version>3.3</version> | |
| 104 | + | |
| 105 | + <configuration> | |
| 106 | + <locales>en</locales> | |
| 107 | + <inputEncoding>UTF-8</inputEncoding> | |
| 108 | + <outputEncoding>UTF-8</outputEncoding> | |
| 109 | + | |
| 110 | + <!-- | |
| 111 | + <reportPlugins> | |
| 112 | + <plugin> | |
| 113 | + <groupId>org.apache.maven.plugins</groupId> | |
| 114 | + <artifactId>maven-project-info-reports-plugin</artifactId> | |
| 115 | + </plugin> | |
| 116 | + </reportPlugins> | |
| 117 | + --> | |
| 118 | + </configuration> | |
| 119 | + </plugin> | |
| 120 | + | |
| 121 | + <plugin> | |
| 122 | + <groupId>org.apache.maven.plugins</groupId> | |
| 123 | + <artifactId>maven-project-info-reports-plugin</artifactId> | |
| 124 | + <version>2.7</version> | |
| 125 | + </plugin> | |
| 126 | + | |
| 127 | + <plugin> | |
| 128 | + <groupId>org.apache.maven.plugins</groupId> | |
| 129 | + <artifactId>maven-javadoc-plugin</artifactId> | |
| 130 | + <version>2.9.1</version> | |
| 131 | + | |
| 132 | + <configuration> | |
| 133 | + <locale>en</locale> | |
| 134 | + <author>true</author> | |
| 135 | + <source>1.5</source> | |
| 136 | + <show>public</show> | |
| 137 | + <charset>UTF-8</charset> | |
| 138 | + <encoding>UTF-8</encoding> | |
| 139 | + <docencoding>UTF-8</docencoding> | |
| 140 | + </configuration> | |
| 141 | + </plugin> | |
| 142 | + | |
| 143 | + </plugins> | |
| 144 | + </pluginManagement> | |
| 46 | 145 | |
| 47 | 146 | <plugins> |
| 48 | 147 | <plugin> |
Fork