Skip to content

Commit 7c1edcd

Browse files
authored
Fix build script (#218)
1 parent bbd0640 commit 7c1edcd

File tree

7 files changed

+25
-19
lines changed

7 files changed

+25
-19
lines changed

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ install:
2424
- cmd: echo %JAVA_HOME%
2525

2626
build_script:
27-
- cmd: mvn clean package -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B
2827
- ps: |
2928
$buildNumber = 0
3029
if($env:APPVEYOR_REPO_TAG -eq "true") {
@@ -74,9 +73,10 @@ after_build:
7473
$Env:FUNCTIONS_WORKER_RUNTIME = "java"
7574
$Env:AZURE_FUNCTIONS_ENVIRONMENT = "development"
7675
$Env:Path = $Env:Path+";c:\projects\azure-functions-java-worker\Azure.Functions.Cli"
77-
76+
77+
Write-Host "Building endtoendtests...."
7878
cd -Path c:\projects\azure-functions-java-worker\endtoendtests
79-
mvn clean package -q
79+
mvn clean package
8080
cd -Path c:\projects\azure-functions-java-worker
8181
8282
Write-Host "Copying EventHubs function.json as temporary workaround...."

endtoendtests/pom.xml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,26 @@
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717
<azure.functions.maven.plugin.version>1.0.0-beta-7</azure.functions.maven.plugin.version>
18-
<azure.functions.java.library.version>1.0.0-beta-6</azure.functions.java.library.version>
19-
<azure.functions.java.library.stagingrepo>commicrosoftazure-2669</azure.functions.java.library.stagingrepo>
18+
<azure.functions.java.library.version>1.0.0-beta-7-SNAPSHOT</azure.functions.java.library.version>
2019
<functionAppName>azure-functions-java-endtoendtests</functionAppName>
2120
<functionAppRegion>westus</functionAppRegion>
2221
<functionResourceGroup>java-functions-group</functionResourceGroup>
2322
<stagingDirectory>${project.build.directory}/azure-functions/${functionAppName}</stagingDirectory>
2423
</properties>
2524

2625
<repositories>
27-
<repository>
28-
<id>${azure.functions.java.library.stagingrepo}</id>
29-
<name>${azure.functions.java.library.stagingrepo}</name>
30-
<url>https://oss.sonatype.org/content/repositories/${azure.functions.java.library.stagingrepo}/</url>
31-
<releases>
32-
<enabled>true</enabled>
33-
</releases>
34-
<snapshots>
35-
<enabled>true</enabled>
36-
</snapshots>
37-
</repository>
38-
</repositories>
26+
<repository>
27+
<id>maven.snapshots</id>
28+
<name>Maven Central Snapshot Repository</name>
29+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
30+
<releases>
31+
<enabled>false</enabled>
32+
</releases>
33+
<snapshots>
34+
<enabled>true</enabled>
35+
</snapshots>
36+
</repository>
37+
</repositories>
3938

4039
<dependencyManagement>
4140
<dependencies>

mvnBuild.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mvn clean package -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -Dgpg.skip

mvnBuildSkipTests.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mvn clean package -Dmaven.javadoc.skip=true -Dmaven.test.skip -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B

package.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ function StopOnFailedExecution {
99
exit $LastExitCode
1010
}
1111
}
12+
Write-Host "Building azure-functions-java-worker"
13+
cmd.exe /c '.\mvnBuild.bat'
14+
StopOnFailedExecution
1215

16+
Write-Host "Creating nuget package Microsoft.Azure.Functions.JavaWorker"
1317
Write-Host "buildNumber: " $buildNumber
1418
Get-Command nuget
1519
StopOnFailedExecution

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.microsoft.azure.functions</groupId>
44
<artifactId>azure-functions-java-worker</artifactId>
5-
<version>1.1.1-beta04-SNAPSHOT</version>
5+
<version>1.2.0-beta01-SNAPSHOT</version>
66
<packaging>jar</packaging>
77
<parent>
88
<groupId>com.microsoft.maven</groupId>
@@ -64,6 +64,7 @@
6464
</snapshots>
6565
</repository>
6666
</repositories>
67+
6768
<dependencies>
6869
<dependency>
6970
<groupId>com.microsoft.azure.functions</groupId>

tools/AzureFunctionsJavaWorker.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>Microsoft.Azure.Functions.JavaWorker</id>
55
<title>Microsoft Azure Functions Java Worker</title>
66
<tags>java azure-functions azure</tags>
7-
<version>1.1.1-beta04-SNAPSHOT$version$</version>
7+
<version>1.2.0-beta01-SNAPSHOT$version$</version>
88
<authors>Microsoft</authors>
99
<owners>Microsoft</owners>
1010
<projectUrl>https://github.com/Azure/azure-functions-java-worker</projectUrl>

0 commit comments

Comments
 (0)