Skip to content

Commit

Permalink
try to fixed #42
Browse files Browse the repository at this point in the history
  • Loading branch information
@andot
andot committed Apr 20, 2018
1 parent b72d9d9 commit f94e105
Show file tree
Hide file tree
Showing 21 changed files with 141 additions and 90 deletions.
Binary file added dist/hprose_client_for_java_10.jar
View file
Binary file not shown.
Binary file modified dist/hprose_client_for_java_5.jar
View file
Binary file not shown.
Binary file modified dist/hprose_client_for_java_6.jar
View file
Binary file not shown.
Binary file modified dist/hprose_client_for_java_7.jar
View file
Binary file not shown.
Binary file modified dist/hprose_client_for_java_8.jar
View file
Binary file not shown.
Binary file modified dist/hprose_client_for_java_9.jar
View file
Binary file not shown.
Binary file added dist/hprose_for_java_10.jar
View file
Binary file not shown.
Binary file modified dist/hprose_for_java_5.jar
View file
Binary file not shown.
Binary file modified dist/hprose_for_java_6.jar
View file
Binary file not shown.
Binary file modified dist/hprose_for_java_7.jar
View file
Binary file not shown.
Binary file modified dist/hprose_for_java_8.jar
View file
Binary file not shown.
Binary file modified dist/hprose_for_java_9.jar
View file
Binary file not shown.
45 changes: 30 additions & 15 deletions make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,60 @@ rd /S/Q dist 1>NUL 2>NUL
mkdir build
mkdir dist

"C:\Program Files\Java\jdk1.8.0_152\bin\javac.exe" -source 5 -target 5 -bootclasspath "C:\Program Files\Java\jdk1.5.0_22\jre\lib\rt.jar;C:\Program Files\Java\jdk1.5.0_22\jre\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_for_java_5.jar -C build .
set JDK10_PATH=C:\Program Files\Java\jdk-10.0.1
set JDK9_PATH=C:\Program Files\Java\jdk-9.0.1
set JDK8_PATH=C:\Program Files\Java\jdk1.8.0_161
set JDK7_PATH=C:\Program Files\Java\jdk1.7.0_80
set JDK6_PATH=C:\Program Files\Java\jdk1.6.0_43
set JDK5_PATH=C:\Program Files\Java\jdk1.5.0_22

"%JDK8_PATH%\bin\javac.exe" -source 5 -target 5 -bootclasspath "%JDK5_PATH%\jre\lib\rt.jar;%JDK5_PATH%\jre\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_for_java_5.jar -C build .
del /Q build\hprose\server\*
rmdir build\hprose\server
del /Q build\hprose\common\HproseMethod.class
del /Q build\hprose\common\HproseMethods.class
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_client_for_java_5.jar -C build .

"%JDK8_PATH%\bin\javac.exe" -source 6 -target 6 -bootclasspath "%JDK6_PATH%\jre\lib\rt.jar;%JDK6_PATH%\jre\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_for_java_6.jar -C build .
del /Q build\hprose\server\*
rmdir build\hprose\server
del /Q build\hprose\common\HproseMethod.class
del /Q build\hprose\common\HproseMethods.class
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_client_for_java_5.jar -C build .
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_client_for_java_6.jar -C build .

"C:\Program Files\Java\jdk1.8.0_152\bin\javac.exe" -source 6 -target 6 -bootclasspath "C:\Program Files\Java\jre6\lib\rt.jar;C:\Program Files\Java\jre6\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_for_java_6.jar -C build .
"%JDK8_PATH%\bin\javac.exe" -source 7 -target 7 -bootclasspath "%JDK7_PATH%\jre\lib\rt.jar;%JDK7_PATH%\jre\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_for_java_7.jar -C build .
del /Q build\hprose\server\*
rmdir build\hprose\server
del /Q build\hprose\common\HproseMethod.class
del /Q build\hprose\common\HproseMethods.class
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_client_for_java_6.jar -C build .
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_client_for_java_7.jar -C build .

"C:\Program Files\Java\jdk1.8.0_152\bin\javac.exe" -source 7 -target 7 -bootclasspath "C:\Program Files\Java\jre7\lib\rt.jar;C:\Program Files\Java\jre7\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_for_java_7.jar -C build .
"%JDK8_PATH%\bin\javac.exe" -source 8 -target 8 -bootclasspath "%JDK8_PATH%\jre\lib\rt.jar;%JDK8_PATH%\jre\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/convert/java8/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/serialize/java8/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/io/unserialize/java8/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_for_java_8.jar -C build .
del /Q build\hprose\server\*
rmdir build\hprose\server
del /Q build\hprose\common\HproseMethod.class
del /Q build\hprose\common\HproseMethods.class
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_client_for_java_7.jar -C build .
"%JDK8_PATH%\bin\jar.exe" cf dist/hprose_client_for_java_8.jar -C build .

"C:\Program Files\Java\jdk1.8.0_152\bin\javac.exe" -source 8 -target 8 -bootclasspath "C:\Program Files\Java\jre1.8.0_152\lib\rt.jar;C:\Program Files\Java\jre1.8.0_152\lib\jsse.jar" -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/convert/java8/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/serialize/java8/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/io/unserialize/java8/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_for_java_8.jar -C build .
"%JDK9_PATH%\bin\javac.exe" --release 9 -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/convert/java8/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/serialize/java8/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/io/unserialize/java8/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"%JDK9_PATH%\bin\jar.exe" cf dist/hprose_for_java_9.jar -C build .
del /Q build\hprose\server\*
rmdir build\hprose\server
del /Q build\hprose\common\HproseMethod.class
del /Q build\hprose\common\HproseMethods.class
"C:\Program Files\Java\jdk1.8.0_152\bin\jar.exe" cf dist/hprose_client_for_java_8.jar -C build .
"%JDK9_PATH%\bin\jar.exe" cf dist/hprose_client_for_java_9.jar -C build .

javac --release 9 -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/convert/java8/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/serialize/java8/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/io/unserialize/java8/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
jar cf dist/hprose_for_java_9.jar -C build .
"%JDK10_PATH%\bin\javac.exe" --release 10 -Xlint:unchecked,-options -cp lib\javax.servlet-api-3.1.0.jar;lib\javax.websocket-api-1.1.jar -d build src/main/java/hprose/common/*.java src/main/java/hprose/util/*.java src/main/java/hprose/util/concurrent/*.java src/main/java/hprose/client/*.java src/main/java/hprose/io/*.java src/main/java/hprose/io/access/*.java src/main/java/hprose/io/convert/*.java src/main/java/hprose/io/convert/java8/*.java src/main/java/hprose/io/serialize/*.java src/main/java/hprose/io/serialize/java8/*.java src/main/java/hprose/io/unserialize/*.java src/main/java/hprose/io/unserialize/java8/*.java src/main/java/hprose/net/*.java src/main/java/hprose/server/*.java
"%JDK10_PATH%\bin\jar.exe" cf dist/hprose_for_java_10.jar -C build .
del /Q build\hprose\server\*
rmdir build\hprose\server
del /Q build\hprose\common\HproseMethod.class
del /Q build\hprose\common\HproseMethods.class
jar cf dist/hprose_client_for_java_9.jar -C build .
"%JDK10_PATH%\bin\jar.exe" cf dist/hprose_client_for_java_10.jar -C build .

del /F/S/Q build 1>NUL
rd /S/Q build 1>NUL
95 changes: 62 additions & 33 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hprose</groupId>
<artifactId>hprose-java</artifactId>
<version>2.0.36</version>
<version>2.0.37-SNAPSHOT</version>
<name>Hprose for Java</name>
<description>Hprose is a High Performance Remote Object Service Engine.

Expand Down Expand Up @@ -49,7 +49,7 @@
<connection>scm:git:https://github.com/hprose/hprose-java.git</connection>
<developerConnection>scm:git:https://github.com/hprose/hprose-java.git</developerConnection>
<url>https://github.com/hprose/hprose-java</url>
<tag>v2.0.36</tag>
<tag>v2.0.37</tag>
</scm>
<developers>
<developer>
Expand All @@ -69,8 +69,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

<dependencies>
Expand Down Expand Up @@ -116,8 +116,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>7</source>
<target>7</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -164,9 +164,9 @@
</build>
</profile>
<profile>
<id>jdk15</id>
<id>jdk5</id>
<activation>
<jdk>1.5</jdk>
<jdk>5</jdk>
</activation>
<build>
<plugins>
Expand All @@ -180,22 +180,22 @@
<goal>jar</goal>
</goals>
<configuration>
<classifier>jdk15</classifier>
<classifier>jdk5</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<jar.source>1.5</jar.source>
<jar.target>1.5</jar.target>
<jar.source>5</jar.source>
<jar.target>5</jar.target>
</properties>
</profile>
<profile>
<id>jdk16</id>
<id>jdk6</id>
<activation>
<jdk>1.6</jdk>
<jdk>6</jdk>
</activation>
<build>
<plugins>
Expand All @@ -209,22 +209,22 @@
<goal>jar</goal>
</goals>
<configuration>
<classifier>jdk16</classifier>
<classifier>jdk6</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<jar.source>1.6</jar.source>
<jar.target>1.6</jar.target>
<jar.source>6</jar.source>
<jar.target>6</jar.target>
</properties>
</profile>
<profile>
<id>jdk17</id>
<id>jdk7</id>
<activation>
<jdk>1.7</jdk>
<jdk>7</jdk>
</activation>
<build>
<plugins>
Expand All @@ -238,22 +238,22 @@
<goal>jar</goal>
</goals>
<configuration>
<classifier>jdk17</classifier>
<classifier>jdk7</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<jar.source>1.7</jar.source>
<jar.target>1.7</jar.target>
<jar.source>7</jar.source>
<jar.target>7</jar.target>
</properties>
</profile>
<profile>
<id>jdk18</id>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
<jdk>8</jdk>
</activation>
<build>
<plugins>
Expand All @@ -267,22 +267,22 @@
<goal>jar</goal>
</goals>
<configuration>
<classifier>jdk18</classifier>
<classifier>jdk8</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<jar.source>1.8</jar.source>
<jar.target>1.8</jar.target>
<jar.source>8</jar.source>
<jar.target>8</jar.target>
</properties>
</profile>
<profile>
<id>jdk19</id>
<id>jdk9</id>
<activation>
<jdk>1.9</jdk>
<jdk>9</jdk>
</activation>
<build>
<plugins>
Expand All @@ -296,17 +296,46 @@
<goal>jar</goal>
</goals>
<configuration>
<classifier>jdk19</classifier>
<classifier>jdk9</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<jar.source>1.9</jar.source>
<jar.target>1.9</jar.target>
<jar.source>9</jar.source>
<jar.target>9</jar.target>
</properties>
</profile>
</profiles>
</profile>
<profile>
<id>jdk10</id>
<activation>
<jdk>10</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>jdk10</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<jar.source>10</jar.source>
<jar.target>10</jar.target>
</properties>
</profile>
</profiles>
</project>
Loading

0 comments on commit f94e105

Please sign in to comment.