diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-10-06 13:54:35 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-06 13:54:35 -0700 |
commit | 479a90b4dd53423c1655d9f21eb321684f152fe8 (patch) | |
tree | 74eb2d7a3dd237a8377bfeab187af1e078fbd4a3 | |
parent | 78d040a18bc789caba1af5fb94f960c502d79ed3 (diff) | |
download | protobuf-479a90b4dd53423c1655d9f21eb321684f152fe8.tar.gz protobuf-479a90b4dd53423c1655d9f21eb321684f152fe8.tar.bz2 protobuf-479a90b4dd53423c1655d9f21eb321684f152fe8.zip |
Revert unwanted changes.
-rw-r--r-- | appveyor.yml | 64 | ||||
-rw-r--r-- | java/util/pom.xml | 6 |
2 files changed, 35 insertions, 35 deletions
diff --git a/appveyor.yml b/appveyor.yml index c84ecae2..3447602e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,32 +1,32 @@ -# Only test one combination: "Visual Studio 12 + Win64 + Debug + DLL". We can -# test more combinations but AppVeyor just takes too long to finish (each -# combination takes ~15mins). -platform: - - Win64 - -configuration: - - Debug - -environment: - matrix: - - language: cpp - BUILD_DLL: ON - - - language: csharp - -install: - - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip - - 7z x gmock-1.7.0.zip - - rename gmock-1.7.0 gmock - -before_build: - - if %platform%==Win32 set generator=Visual Studio 12 - - if %platform%==Win64 set generator=Visual Studio 12 Win64 - - if %platform%==Win32 set vcplatform=Win32 - - if %platform%==Win64 set vcplatform=x64 - -build_script: - - CALL appveyor.bat - -skip_commits: - message: /.*\[skip appveyor\].*/ +# Only test one combination: "Visual Studio 12 + Win64 + Debug + DLL". We can
+# test more combinations but AppVeyor just takes too long to finish (each
+# combination takes ~15mins).
+platform:
+ - Win64
+
+configuration:
+ - Debug
+
+environment:
+ matrix:
+ - language: cpp
+ BUILD_DLL: ON
+
+ - language: csharp
+
+install:
+ - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip
+ - 7z x gmock-1.7.0.zip
+ - rename gmock-1.7.0 gmock
+
+before_build:
+ - if %platform%==Win32 set generator=Visual Studio 12
+ - if %platform%==Win64 set generator=Visual Studio 12 Win64
+ - if %platform%==Win32 set vcplatform=Win32
+ - if %platform%==Win64 set vcplatform=x64
+
+build_script:
+ - CALL appveyor.bat
+
+skip_commits:
+ message: /.*\[skip appveyor\].*/
diff --git a/java/util/pom.xml b/java/util/pom.xml index 9416f380..44a5662d 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.0.0-alpha-4-pre</version> + <version>3.0.0-beta-1</version> <packaging>bundle</packaging> <name>Protocol Buffer Java API</name> <description> @@ -36,7 +36,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.0.0-alpha-4-pre</version> + <version>3.0.0-beta-1</version> <scope>compile</scope> </dependency> <dependency> @@ -123,7 +123,7 @@ <instructions> <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> - <Export-Package>com.google.protobuf.util;version=3.0.0-alpha-3</Export-Package> + <Export-Package>com.google.protobuf.util;version=3.0.0-beta-1</Export-Package> </instructions> </configuration> </plugin> |