Skip to content

Commit dccc8ef

Browse files
exexuteexexute
authored
Merge pull request #204 from exexute/main
Release: v1.2.0
2 parents 59096a0 + d0e7ac3 commit dccc8ef

File tree

15 files changed

+54
-38
lines changed

15 files changed

+54
-38
lines changed

‎.github/workflows/release-agent.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ jobs:
3030
3131
- name: Build and Publish Maven Package
3232
run: |
33-
bash .github/workflows/version_update.sh "${{ steps.release.outputs.VERSION }}"
34-
mvn -B package -Dmaven.test.skip=true
35-
mvn -B -Dmaven.test.skip=true -DuseGitHubPackages=true deploy
33+
bash .github/workflows/scripts/version_update.sh "${{ steps.release.outputs.VERSION }}"
3634
env:
3735
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3836

‎.github/workflows/version_update.sh‎ renamed to ‎.github/workflows/scripts/version_update.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,21 @@ OLD_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
22
NEW_VERSION=$1
33

44
echo "curent path: `pwd`, change version $OLD_VERSION to $NEW_VERSION"
5-
exit 0
5+
66
sed -i "s/v$OLD_VERSION/v$NEW_VERSION/g" dongtai-jakarta-api/src/main/java/cn/huoxian/iast/api/ResponseWrapper.java
77
sed -i "s/v$OLD_VERSION/v$NEW_VERSION/g" dongtai-servlet-api/src/main/java/cn/huoxian/iast/api/ResponseWrapper.java
88
sed -i "s/v$OLD_VERSION/v$NEW_VERSION/g" iast-agent/src/main/java/com/secnium/iast/agent/Constant.java
99
sed -i "s/$OLD_VERSION/$NEW_VERSION/g" iast-agent/src/main/resources/iast.properties
1010

11+
mvn -B package -Dmaven.test.skip=true
12+
13+
mvn -q versions:set -DnewVersion="$NEW_VERSION"
14+
mvn -q versions:update-child-modules
15+
mvn -q versions:commit
16+
17+
mvn -B -Dmaven.test.skip=true -DuseGitHubPackages=true deploy
18+
exit 0
19+
1120
# versions:set is a feature in JDK 1.7+ and Maven 3.3.1+
1221
mvn -q versions:set -DnewVersion="$NEW_VERSION"
1322
mvn -q versions:update-child-modules
@@ -19,4 +28,3 @@ git add .
1928
git commit -m "Update: change version from $OLD_VERSION to $NEW_VERSION"
2029

2130
git push "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git" refs/heads/release-$NEW_VERSION:refs/heads/release-$NEW_VERSION
22-

‎CHANGELOG.md‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,19 @@ Changes by Version
22
==================
33
Release Notes.
44

5-
1.1.4
5+
1.2.0
66
------------------
77
## What's Changed
8-
* close #170 by @Nizernizer in https://github.com/HXSecurity/DongTai-agent-java/pull/171
9-
* Closes #156 by @exexute in https://github.com/HXSecurity/DongTai-agent-java/pull/169
10-
* add "map" hashCode to targetHash by @Maskhe in https://github.com/HXSecurity/DongTai-agent-java/pull/176
11-
* Release 1.1.4 by @exexute in https://github.com/HXSecurity/DongTai-agent-java/pull/183
12-
* fix issue#133 by @langligelang in https://github.com/HXSecurity/DongTai-agent-java/pull/177
13-
* close issue-178. by @Nizernizer in https://github.com/HXSecurity/DongTai-agent-java/pull/184
14-
* bugfix: hard code report. by @Nizernizer in https://github.com/HXSecurity/DongTai-agent-java/pull/185
15-
* fix issue#133 by @langligelang in https://github.com/HXSecurity/DongTai-agent-java/pull/186
16-
* Release 1.1.4 by @exexute in https://github.com/HXSecurity/DongTai-agent-java/pull/188
8+
* close #198 by @Nizernizer in https://github.com/HXSecurity/DongTai-agent-java/pull/199
9+
* Update AttachLauncher.java fix https://github.com/HXSecurity/DongTai/issues/396 by @caoshutao in https://github.com/HXSecurity/DongTai-agent-java/pull/201
10+
* Enhancement: fix dubbo vul check by @exexute in https://github.com/HXSecurity/DongTai-agent-java/pull/200
1711

1812
## New Contributors
19-
* @Maskhe made their first contribution in https://github.com/HXSecurity/DongTai-agent-java/pull/176
13+
* @caoshutao made their first contribution in https://github.com/HXSecurity/DongTai-agent-java/pull/201
2014

2115
**Contributors**
2216

23-
@exexute, @langligelang, @Nizernizer and @Maskhe
17+
@Nizernizer, @caoshutao and @exexute
2418

2519

2620
------------------

‎changes/CHANGELOG-1.2.0.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Changes by Version
2+
==================
3+
Release Notes.
4+
5+
1.2.0
6+
------------------
7+
## What's Changed
8+
* close #198 by @Nizernizer in https://github.com/HXSecurity/DongTai-agent-java/pull/199
9+
* Update AttachLauncher.java fix https://github.com/HXSecurity/DongTai/issues/396 by @caoshutao in https://github.com/HXSecurity/DongTai-agent-java/pull/201
10+
* Enhancement: fix dubbo vul check by @exexute in https://github.com/HXSecurity/DongTai-agent-java/pull/200
11+
12+
## New Contributors
13+
* @caoshutao made their first contribution in https://github.com/HXSecurity/DongTai-agent-java/pull/201
14+
15+
**Contributors**
16+
17+
@Nizernizer, @caoshutao and @exexute

‎dongtai-jakarta-api/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>iast</artifactId>
77
<groupId>com.secnium.iast</groupId>
8-
<version>1.1.4</version>
8+
<version>1.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>dongtai-jakarta-api</artifactId>
13-
<version>1.1.4</version>
13+
<version>1.2.0</version>
1414

1515
<properties>
1616
<maven.compiler.source>8</maven.compiler.source>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>cn.huoxian.iast</groupId>
3030
<artifactId>dongtai-spring-api</artifactId>
31-
<version>1.1.4</version>
31+
<version>1.2.0</version>
3232
</dependency>
3333
</dependencies>
3434

‎dongtai-jakarta-api/src/main/java/cn/huoxian/iast/api/ResponseWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static Object cloneResponse(Object response) {
2626

2727
public ResponseWrapper(HttpServletResponse response) {
2828
super(response);
29-
response.addHeader("DongTai", "v1.1.4");
29+
response.addHeader("DongTai", "v1.2.0");
3030
}
3131

3232
@Override

‎dongtai-servlet-api/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<artifactId>iast</artifactId>
77
<groupId>com.secnium.iast</groupId>
8-
<version>1.1.4</version>
8+
<version>1.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<groupId>cn.huoxian.iast</groupId>
1313
<artifactId>dongtai-servlet-api</artifactId>
14-
<version>1.1.4</version>
14+
<version>1.2.0</version>
1515

1616
<properties>
1717
<maven.compiler.source>8</maven.compiler.source>
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>cn.huoxian.iast</groupId>
3737
<artifactId>dongtai-spring-api</artifactId>
38-
<version>1.1.4</version>
38+
<version>1.2.0</version>
3939
</dependency>
4040
</dependencies>
4141

‎dongtai-servlet-api/src/main/java/cn/huoxian/iast/api/ResponseWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static Object cloneResponse(Object response) {
2424

2525
public ResponseWrapper(HttpServletResponse response) {
2626
super(response);
27-
response.addHeader("DongTai", "v1.1.4");
27+
response.addHeader("DongTai", "v1.2.0");
2828
}
2929

3030
@Override

‎dongtai-spring-api/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<artifactId>iast</artifactId>
77
<groupId>com.secnium.iast</groupId>
8-
<version>1.1.4</version>
8+
<version>1.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<groupId>cn.huoxian.iast</groupId>
1313
<artifactId>dongtai-spring-api</artifactId>
14-
<version>1.1.4</version>
14+
<version>1.2.0</version>
1515

1616
<properties>
1717
<maven.compiler.source>8</maven.compiler.source>

‎iast-agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.secnium.iast</groupId>
99
<artifactId>iast</artifactId>
10-
<version>1.1.4</version>
10+
<version>1.2.0</version>
1111
</parent>
1212
<artifactId>iast-agent</artifactId>
1313
<name>iast-agent</name>

0 commit comments

Comments
 (0)