Skip to content

Commit 88a9c34

Browse files
xinyuwen2xinyuwen2
authored
Merge pull request #226 from BingAds/v13.0.25
v13.0.25
2 parents 010eb16 + 1f92ebc commit 88a9c34

File tree

233 files changed

+9066
-2560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+9066
-2560
lines changed

‎.artifactignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
!**/*.asc
44
!**/*.sha1
55
!**/*.md5
6-
!**/*.jar
6+
!**/*.jar
7+
!_manifest/**

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The Bing Ads Java SDK includes and depends on the microsoft.bingads Maven artifa
1616
<dependency>
1717
<groupId>com.microsoft.bingads</groupId>
1818
<artifactId>microsoft.bingads</artifactId>
19-
<version>13.0.24.3</version>
19+
<version>13.0.25</version>
2020
</dependency>
2121
```
2222
If you are not using a Maven project, you must include the correct version of each dependency. You can review the complete list of Bing Ads Java SDK dependencies at the [Maven Repository](http://mvnrepository.com/artifact/com.microsoft.bingads/microsoft.bingads/).

‎azure-pipelines.yml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,13 @@ resources:
1515
type: git
1616
name: Engineering Fundamentals/WebXT.Pipeline.Templates
1717
ref: refs/heads/main
18-
- repository: AdsAppsYamlTemplate
19-
type: git
20-
name: Bing_Ads/AdsApps_Yaml_Template
21-
ref: refs/heads/master
2218
extends:
2319
template: v1/[email protected]
2420
parameters:
2521
pool:
2622
name: Azure-Pipelines-1ESPT-ExDShared
2723
image: windows-latest
2824
os: windows
29-
sdl:
30-
sourceAnalysisPool:
31-
name: Azure-Pipelines-1ESPT-ExDShared
32-
image: windows-latest
33-
os: windows
3425
stages:
3526
- stage: stage
3627
jobs:
@@ -59,10 +50,15 @@ extends:
5950
inputs:
6051
SourceFolder: '$(Pipeline.Workspace)/s'
6152
Contents: '**/.artifactignore'
62-
TargetFolder: 'target'
53+
TargetFolder: $(Build.ArtifactStagingDirectory)/maven_artifacts
54+
- task: CopyFiles@2
55+
inputs:
56+
SourceFolder: 'target'
57+
Contents: '**/*'
58+
TargetFolder: $(Build.ArtifactStagingDirectory)/maven_artifacts
6359
templateContext:
6460
outputs:
6561
- output: pipelineArtifact
6662
displayName: 'Publish Maven Artifacts'
67-
targetPath: target
68-
artifactName: maven_artifacts
63+
targetPath: $(Build.ArtifactStagingDirectory)/maven_artifacts
64+
artifactName: maven_artifacts

‎pom.xml‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.microsoft.bingads</groupId>
4-
<version>13.0.24.3</version>
4+
<version>13.0.25</version>
55
<name>Bing Ads Java SDK</name>
66
<description>The Bing Ads Java SDK is a library improving developer experience when working with the Bing Ads services by providing high-level access to features such as Bulk API, OAuth Authorization and SOAP API.</description>
77
<url>https://github.com/BingAds/BingAds-Java-SDK</url>
@@ -144,26 +144,6 @@
144144
<version>5.1.0</version>
145145
<scope>test</scope>
146146
</dependency>
147-
<dependency>
148-
<groupId>jakarta.jws</groupId>
149-
<artifactId>jakarta.jws-api</artifactId>
150-
<version>3.0.0</version>
151-
</dependency>
152-
<dependency>
153-
<groupId>jakarta.xml.ws</groupId>
154-
<artifactId>jakarta.xml.ws-api</artifactId>
155-
<version>3.0.0</version>
156-
</dependency>
157-
<dependency>
158-
<groupId>com.sun.xml.messaging.saaj</groupId>
159-
<artifactId>saaj-impl</artifactId>
160-
<version>2.0.0</version>
161-
</dependency>
162-
<dependency>
163-
<groupId>org.apache.cxf</groupId>
164-
<artifactId>cxf-rt-frontend-jaxws</artifactId>
165-
<version>${cxf.version}</version>
166-
</dependency>
167147
<dependency>
168148
<groupId>org.apache.cxf</groupId>
169149
<artifactId>cxf-rt-transports-http</artifactId>

‎proxies/com/microsoft/bingads/v13/bulk/DownloadEntity.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@
205205
* <enumeration value="AccountPlacementInclusionList"/>
206206
* <enumeration value="AccountPlacementInclusionListItem"/>
207207
* <enumeration value="CampaignAccountPlacementInclusionListAssociation"/>
208+
* <enumeration value="Topic"/>
209+
* <enumeration value="ContentPlacement"/>
210+
* <enumeration value="BrandKit"/>
208211
* </restriction>
209212
* </simpleType>
210213
* }</pre>
@@ -597,7 +600,13 @@ public enum DownloadEntity {
597600
@XmlEnumValue("AccountPlacementInclusionListItem")
598601
ACCOUNT_PLACEMENT_INCLUSION_LIST_ITEM("AccountPlacementInclusionListItem"),
599602
@XmlEnumValue("CampaignAccountPlacementInclusionListAssociation")
600-
CAMPAIGN_ACCOUNT_PLACEMENT_INCLUSION_LIST_ASSOCIATION("CampaignAccountPlacementInclusionListAssociation");
603+
CAMPAIGN_ACCOUNT_PLACEMENT_INCLUSION_LIST_ASSOCIATION("CampaignAccountPlacementInclusionListAssociation"),
604+
@XmlEnumValue("Topic")
605+
TOPIC("Topic"),
606+
@XmlEnumValue("ContentPlacement")
607+
CONTENT_PLACEMENT("ContentPlacement"),
608+
@XmlEnumValue("BrandKit")
609+
BRAND_KIT("BrandKit");
601610
private final String value;
602611

603612
DownloadEntity(String v) {

‎proxies/com/microsoft/bingads/v13/campaignmanagement/AdGroupAdditionalField.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public enum AdGroupAdditionalField {
1515
MCPA_BID("McpaBid"),
1616
USE_OPTIMIZED_TARGETING("UseOptimizedTargeting"),
1717
FREQUENCY_CAP_SETTINGS("FrequencyCapSettings"),
18-
USE_PREDICTIVE_TARGETING("UsePredictiveTargeting");
18+
USE_PREDICTIVE_TARGETING("UsePredictiveTargeting"),
19+
MAX_CONVERSION_VALUE_WITH_MAX_CPC("MaxConversionValueWithMaxCpc");
1920

2021
private final String value;
2122

‎proxies/com/microsoft/bingads/v13/campaignmanagement/AdGroupCriterionType.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public enum AdGroupCriterionType {
3434
GENRE("Genre"),
3535
CUSTOMER_LIST("CustomerList"),
3636
IMPRESSION_BASED_REMARKETING_LIST("ImpressionBasedRemarketingList"),
37-
PLACEMENT("Placement");
37+
PLACEMENT("Placement"),
38+
TOPIC("Topic");
3839

3940
private final String value;
4041

‎proxies/com/microsoft/bingads/v13/campaignmanagement/AdRecommendationJobInfo.java‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
2+
package com.microsoft.bingads.v13.campaignmanagement;
3+
4+
import jakarta.xml.bind.annotation.XmlAccessType;
5+
import jakarta.xml.bind.annotation.XmlAccessorType;
6+
import jakarta.xml.bind.annotation.XmlElement;
7+
import jakarta.xml.bind.annotation.XmlType;
8+
9+
10+
/**
11+
* <p>Java class for AdRecommendationJobInfo complex type.
12+
*
13+
* <p>The following schema fragment specifies the expected content contained within this class.
14+
*
15+
* <pre>{@code
16+
* <complexType name="AdRecommendationJobInfo">
17+
* <complexContent>
18+
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
19+
* <sequence>
20+
* <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
21+
* <element name="ErrorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
22+
* <element name="JobId" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
23+
* <element name="JobStatus" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
24+
* </sequence>
25+
* </restriction>
26+
* </complexContent>
27+
* </complexType>
28+
* }</pre>
29+
*
30+
*
31+
*/
32+
@XmlAccessorType(XmlAccessType.FIELD)
33+
@XmlType(name = "AdRecommendationJobInfo", propOrder = {
34+
"errorCode",
35+
"errorMessage",
36+
"jobId",
37+
"jobStatus"
38+
})
39+
public class AdRecommendationJobInfo {
40+
41+
@XmlElement(name = "ErrorCode", nillable = true)
42+
protected String errorCode;
43+
@XmlElement(name = "ErrorMessage", nillable = true)
44+
protected String errorMessage;
45+
@XmlElement(name = "JobId")
46+
protected Long jobId;
47+
@XmlElement(name = "JobStatus", nillable = true)
48+
protected String jobStatus;
49+
50+
/**
51+
* Gets the value of the errorCode property.
52+
*
53+
* @return
54+
* possible object is
55+
* {@link String }
56+
*
57+
*/
58+
public String getErrorCode() {
59+
return errorCode;
60+
}
61+
62+
/**
63+
* Sets the value of the errorCode property.
64+
*
65+
* @param value
66+
* allowed object is
67+
* {@link String }
68+
*
69+
*/
70+
public void setErrorCode(String value) {
71+
this.errorCode = value;
72+
}
73+
74+
/**
75+
* Gets the value of the errorMessage property.
76+
*
77+
* @return
78+
* possible object is
79+
* {@link String }
80+
*
81+
*/
82+
public String getErrorMessage() {
83+
return errorMessage;
84+
}
85+
86+
/**
87+
* Sets the value of the errorMessage property.
88+
*
89+
* @param value
90+
* allowed object is
91+
* {@link String }
92+
*
93+
*/
94+
public void setErrorMessage(String value) {
95+
this.errorMessage = value;
96+
}
97+
98+
/**
99+
* Gets the value of the jobId property.
100+
*
101+
* @return
102+
* possible object is
103+
* {@link Long }
104+
*
105+
*/
106+
public Long getJobId() {
107+
return jobId;
108+
}
109+
110+
/**
111+
* Sets the value of the jobId property.
112+
*
113+
* @param value
114+
* allowed object is
115+
* {@link Long }
116+
*
117+
*/
118+
public void setJobId(Long value) {
119+
this.jobId = value;
120+
}
121+
122+
/**
123+
* Gets the value of the jobStatus property.
124+
*
125+
* @return
126+
* possible object is
127+
* {@link String }
128+
*
129+
*/
130+
public String getJobStatus() {
131+
return jobStatus;
132+
}
133+
134+
/**
135+
* Sets the value of the jobStatus property.
136+
*
137+
* @param value
138+
* allowed object is
139+
* {@link String }
140+
*
141+
*/
142+
public void setJobStatus(String value) {
143+
this.jobStatus = value;
144+
}
145+
146+
}

‎proxies/com/microsoft/bingads/v13/campaignmanagement/AdSubType.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
public enum AdSubType {
77

88
VIDEO("Video"),
9-
DISPLAY("Display");
9+
DISPLAY("Display"),
10+
H_T_M_L5("HTML5");
1011

1112
private final String value;
1213

‎proxies/com/microsoft/bingads/v13/campaignmanagement/Adapter10.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
66

77
public class Adapter10
8-
extends XmlAdapter<String, Collection<AdExtensionAdditionalField>>
8+
extends XmlAdapter<String, Collection<AdExtensionsTypeFilter>>
99
{
1010

1111

12-
public Collection<AdExtensionAdditionalField> unmarshal(String value) {
13-
return (com.microsoft.bingads.v13.campaignmanagement.AdExtensionAdditionalFieldConverter.convertToList(value));
12+
public Collection<AdExtensionsTypeFilter> unmarshal(String value) {
13+
return (com.microsoft.bingads.v13.campaignmanagement.AdExtensionsTypeFilterConverter.convertToList(value));
1414
}
1515

16-
public String marshal(Collection<AdExtensionAdditionalField> value) {
17-
return (com.microsoft.bingads.v13.campaignmanagement.AdExtensionAdditionalFieldConverter.convertToString(value));
16+
public String marshal(Collection<AdExtensionsTypeFilter> value) {
17+
return (com.microsoft.bingads.v13.campaignmanagement.AdExtensionsTypeFilterConverter.convertToString(value));
1818
}
1919

2020
}

0 commit comments

Comments
 (0)