You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by bi...@apache.org on 2020/04/15 16:07:47 UTC
[axis-axis2-java-rampart] branch 1_7 created (now cea448b)
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a change to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git.
at cea448b RAMPART-446: Merge r1778769 to the 1.7 branch.
This branch includes the following new commits:
new 223a789 [maven-release-plugin] prepare for next development iteration
new b9a734e Switch Axiom and Axis2 to snapshot versions.
new 13d4c4f Add empty release note for 1.7.2.
new 8da5552 Update Axis2 version.
new 6fa2758 Merge r1806320 and r1826038 to the 1.7 branch.
new ebe2624 Update Axis2 version.
new f3ace87 Merge r1837550 and r1837559 to the 1.7 branch.
new 926de4f Merge r1837565 to the 1.7 branch.
new e47d5d8 Merge r1837564 and r1838386 to the 1.7 branch.
new 98948a1 Update snapshot versions.
new 6996e2b Update Axiom version.
new cea448b RAMPART-446: Merge r1778769 to the 1.7 branch.
The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[axis-axis2-java-rampart] 06/12: Update Axis2 version.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit ebe2624f384e39046e93e80857378c5b05e8eb94
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Mon Aug 6 20:24:18 2018 +0000
Update Axis2 version.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f5ae9c9..e94081c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,7 +604,7 @@
</modules>
<properties>
- <axis2.version>1.7.8-SNAPSHOT</axis2.version>
+ <axis2.version>1.7.9-SNAPSHOT</axis2.version>
<axiom.version>1.2.21-SNAPSHOT</axiom.version>
<wss4j.version>1.6.16</wss4j.version>
[axis-axis2-java-rampart] 10/12: Update snapshot versions.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 98948a1e8ef894f6827f332ef280d5013314bb6e
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Fri Nov 16 20:29:05 2018 +0000
Update snapshot versions.
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4e7b20a..603fafd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -621,8 +621,8 @@
</modules>
<properties>
- <axis2.version>1.7.9-SNAPSHOT</axis2.version>
- <axiom.version>1.2.21-SNAPSHOT</axiom.version>
+ <axis2.version>1.7.10-SNAPSHOT</axis2.version>
+ <axiom.version>1.2.22-SNAPSHOT</axiom.version>
<wss4j.version>1.6.16</wss4j.version>
<opensaml.version>2.5.1-1</opensaml.version>
[axis-axis2-java-rampart] 07/12: Merge r1837550 and r1837559 to the
1.7 branch.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit f3ace87c292567022ef5a3b31b74d5fb61494743
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Mon Aug 6 20:31:33 2018 +0000
Merge r1837550 and r1837559 to the 1.7 branch.
---
modules/rampart-integration/pom.xml | 29 ++++++++++++-
modules/rampart-tests/pom.xml | 33 ++++++++++++++
modules/rampart-testutils/pom.xml | 39 +++++++++++++++++
.../testutils/FakeValidationDateAspect.java | 50 ++++++++++++++++++++++
.../src/main/resources/META-INF/aop.xml | 28 ++++++++++++
pom.xml | 17 ++++++++
6 files changed, 195 insertions(+), 1 deletion(-)
diff --git a/modules/rampart-integration/pom.xml b/modules/rampart-integration/pom.xml
index d303d48..7af8813 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -464,10 +464,31 @@
</executions>
</plugin-->
<plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-properties</goal>
+ </goals>
+ <configuration>
+ <name>aspectjweaver</name>
+ <value>%file%</value>
+ <artifacts>
+ <artifact>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Add the Xerces/Xalan versions expected by OpenSAML to the boot classpath so that the build succeeds on older 1.5 JDKs -->
- <argLine>${jacoco.surefireArgLine} -Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar</argLine>
+ <argLine>${jacoco.surefireArgLine} -Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar -javaagent:${aspectjweaver}</argLine>
</configuration>
</plugin>
<plugin>
@@ -517,6 +538,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${axis2.version}</version>
diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml
index 464af67..cf5febc 100644
--- a/modules/rampart-tests/pom.xml
+++ b/modules/rampart-tests/pom.xml
@@ -53,6 +53,33 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-properties</goal>
+ </goals>
+ <configuration>
+ <name>aspectjweaver</name>
+ <value>%file%</value>
+ <artifacts>
+ <artifact>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${jacoco.surefireArgLine} -javaagent:${aspectjweaver}</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -73,6 +100,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
diff --git a/modules/rampart-testutils/pom.xml b/modules/rampart-testutils/pom.xml
new file mode 100644
index 0000000..8cfb432
--- /dev/null
+++ b/modules/rampart-testutils/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-project</artifactId>
+ <version>1.7.2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>rampart-testutils</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/modules/rampart-testutils/src/main/java/org/apache/rampart/testutils/FakeValidationDateAspect.java b/modules/rampart-testutils/src/main/java/org/apache/rampart/testutils/FakeValidationDateAspect.java
new file mode 100644
index 0000000..da89b43
--- /dev/null
+++ b/modules/rampart-testutils/src/main/java/org/apache/rampart/testutils/FakeValidationDateAspect.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rampart.testutils;
+
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+
+/**
+ * Aspect that redirects {@link X509Certificate#checkValidity()} to
+ * {@link X509Certificate#checkValidity(Date)} with a fixed date. This allows
+ * executing unit tests relying on certificates that have expired.
+ */
+@Aspect
+public class FakeValidationDateAspect {
+ private final static Date VALIDATION_DATE;
+
+ static {
+ Calendar cal = Calendar.getInstance();
+ cal.setTimeInMillis(0);
+ cal.set(2018, 0, 1);
+ VALIDATION_DATE = cal.getTime();
+ }
+
+ @Around("call(void java.security.cert.X509Certificate.checkValidity()) && target(cert)")
+ public void aroundCheckValidity(X509Certificate cert) throws CertificateExpiredException, CertificateNotYetValidException {
+ cert.checkValidity(VALIDATION_DATE);
+ }
+}
diff --git a/modules/rampart-testutils/src/main/resources/META-INF/aop.xml b/modules/rampart-testutils/src/main/resources/META-INF/aop.xml
new file mode 100644
index 0000000..735ef2d
--- /dev/null
+++ b/modules/rampart-testutils/src/main/resources/META-INF/aop.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<aspectj>
+ <aspects>
+ <aspect name="org.apache.rampart.testutils.FakeValidationDateAspect"/>
+ </aspects>
+ <weaver options="-showWeaveInfo">
+ <include within="org.apache.rampart..*"/>
+ <include within="org.apache.ws.security..*"/>
+ </weaver>
+</aspectj>
diff --git a/pom.xml b/pom.xml
index e94081c..ce58e43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <version>0.6.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -545,6 +550,17 @@
<artifactId>junit</artifactId>
<version>3.8.2</version>
</dependency>
+
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.8.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -599,6 +615,7 @@
<module>modules/rampart-trust-mar</module>
<module>modules/rampart-integration</module>
<module>modules/rampart-samples</module> <!-- Compile sample codes -->
+ <module>modules/rampart-testutils</module>
<module>modules/distribution</module>
<module>code-coverage</module>
</modules>
[axis-axis2-java-rampart] 04/12: Update Axis2 version.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 8da5552cd40276c7c2288ddfd31085fd1002c5c5
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Thu Nov 30 21:56:12 2017 +0000
Update Axis2 version.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d87acf8..f5ae9c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,7 +604,7 @@
</modules>
<properties>
- <axis2.version>1.7.7-SNAPSHOT</axis2.version>
+ <axis2.version>1.7.8-SNAPSHOT</axis2.version>
<axiom.version>1.2.21-SNAPSHOT</axiom.version>
<wss4j.version>1.6.16</wss4j.version>
[axis-axis2-java-rampart] 09/12: Merge r1837564 and r1838386 to the
1.7 branch.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit e47d5d8a0b7ebcc65624280f5c7452f88d3a0e05
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun Aug 19 17:04:29 2018 +0000
Merge r1837564 and r1838386 to the 1.7 branch.
---
.travis-settings.xml | 13 +++++++++++++
.travis.yml | 17 +++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/.travis-settings.xml b/.travis-settings.xml
new file mode 100644
index 0000000..ab1e4a6
--- /dev/null
+++ b/.travis-settings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>apache.snapshots.https</id>
+ <username>${env.REPO_USERNAME}</username>
+ <password>${env.REPO_PASSWORD}</password>
+ </server>
+ </servers>
+</settings>
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d2a3fee
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+dist: trusty
+language: java
+jdk:
+ - openjdk8
+install: true
+script: '[ "$TRAVIS_REPO_SLUG" == apache/rampart ] && [ "$TRAVIS_BRANCH" == 1_7 ] && [ "$TRAVIS_PULL_REQUEST" == false ] && goal=deploy || goal=verify ; mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true $goal'
+env:
+ global:
+ - secure: "EdhUKPgSqlyvV1WTzEhe91zTiTFzcQCG4FcdgN73j5VRYYU08hDuv7NeOTR7ks2iIhhVRBsKVJ6HdHlr5x7KDLKxelhP9J1zE+wHwQToQoL+pGSHS12h5pTRHwioy9nzCvCcZNM0nkN2w6M3Lbql8UOOjGjzdsOzWhVqYhpDc8c="
+ - secure: "G0DkdCmLgsnwqDsHexziUWiDQ33wvUreMLCl4tQYmp25AGDi5YtVaqzlZrQbZGI6KiaH3Ud2DO3oBaxi553H/LeJMqalDIwQcQPs+xjBru4HfPV3umuIMz+A9DRQ6x/274E9n25H7AwA49JLGmqpcL94vVbwE7ZgQ81Jh4txzWw="
+cache:
+ directories:
+ - $HOME/.m2
+notifications:
+ email:
+ # java-dev@axis.apache.org doesn't work here because it's not an address registered on GitHub.
+ - veithen@apache.org
[axis-axis2-java-rampart] 01/12: [maven-release-plugin] prepare for
next development iteration
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 223a789e391355fe578be2bac26149a4ab57d823
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun Jul 30 22:32:43 2017 +0000
[maven-release-plugin] prepare for next development iteration
---
apidocs/pom.xml | 2 +-
code-coverage/pom.xml | 2 +-
modules/distribution/pom.xml | 2 +-
modules/rampart-core/pom.xml | 2 +-
modules/rampart-integration/pom.xml | 2 +-
modules/rampart-mar/pom.xml | 2 +-
modules/rampart-policy/pom.xml | 2 +-
modules/rampart-samples/pom.xml | 2 +-
modules/rampart-tests/pom.xml | 2 +-
modules/rampart-trust-mar/pom.xml | 2 +-
modules/rampart-trust/pom.xml | 2 +-
pom.xml | 8 ++++----
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index bac66a4..8c8c064 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>apidocs</artifactId>
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
index eabce0b..47eaf36 100644
--- a/code-coverage/pom.xml
+++ b/code-coverage/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>code-coverage</artifactId>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 19283be..22b5b57 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/rampart-core/pom.xml b/modules/rampart-core/pom.xml
index bedd145..885794a 100644
--- a/modules/rampart-core/pom.xml
+++ b/modules/rampart-core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/rampart-integration/pom.xml b/modules/rampart-integration/pom.xml
index f42ad99..d303d48 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/rampart-mar/pom.xml b/modules/rampart-mar/pom.xml
index e5c8719..fae6799 100644
--- a/modules/rampart-mar/pom.xml
+++ b/modules/rampart-mar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/rampart-policy/pom.xml b/modules/rampart-policy/pom.xml
index a3ef33d..f072ede 100644
--- a/modules/rampart-policy/pom.xml
+++ b/modules/rampart-policy/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/rampart-samples/pom.xml b/modules/rampart-samples/pom.xml
index a9e5bc2..34f9da1 100644
--- a/modules/rampart-samples/pom.xml
+++ b/modules/rampart-samples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/rampart-tests/pom.xml b/modules/rampart-tests/pom.xml
index 0187d70..464af67 100644
--- a/modules/rampart-tests/pom.xml
+++ b/modules/rampart-tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/rampart-trust-mar/pom.xml b/modules/rampart-trust-mar/pom.xml
index bbfdfe3..571437b 100644
--- a/modules/rampart-trust-mar/pom.xml
+++ b/modules/rampart-trust-mar/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/rampart-trust/pom.xml b/modules/rampart-trust/pom.xml
index 2b0314a..d25f939 100644
--- a/modules/rampart-trust/pom.xml
+++ b/modules/rampart-trust/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index deeed91..301379a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<artifactId>rampart-project</artifactId>
<packaging>pom</packaging>
<description> WS-Security, WS-Trust and WS-SecureConversation implementaion for Apache Axis2 </description>
- <version>1.7.1</version>
+ <version>1.7.2-SNAPSHOT</version>
<name>Apache Rampart</name>
<url>http://axis.apache.org/axis2/java/rampart</url>
@@ -110,12 +110,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.7.1
+ scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_7
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.7.1
+ scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_7
</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.7.1</url>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_7</url>
</scm>
<distributionManagement>
[axis-axis2-java-rampart] 08/12: Merge r1837565 to the 1.7 branch.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 926de4f27e9f4338767cec8b3c4cf27097844a67
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Mon Aug 6 21:43:12 2018 +0000
Merge r1837565 to the 1.7 branch.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ce58e43..4e7b20a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>20</version>
</parent>
<groupId>org.apache.rampart</groupId>
[axis-axis2-java-rampart] 12/12: RAMPART-446: Merge r1778769 to the
1.7 branch.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit cea448b4f336e0646c335aaafbfe8ae66c5cc738
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Thu Mar 7 23:13:41 2019 +0000
RAMPART-446: Merge r1778769 to the 1.7 branch.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a885a40..4ef9c0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -624,7 +624,7 @@
<axis2.version>1.7.10-SNAPSHOT</axis2.version>
<axiom.version>1.2.23-SNAPSHOT</axiom.version>
- <wss4j.version>1.6.16</wss4j.version>
+ <wss4j.version>1.6.19</wss4j.version>
<opensaml.version>2.5.1-1</opensaml.version>
<bcprov.jdk15.version>1.49</bcprov.jdk15.version>
[axis-axis2-java-rampart] 03/12: Add empty release note for 1.7.2.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 13d4c4fe752fbba5f4927293a8759d7e415d6661
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Mon Jul 31 07:07:05 2017 +0000
Add empty release note for 1.7.2.
---
src/site/markdown/release-notes/1.7.2.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/site/markdown/release-notes/1.7.2.md b/src/site/markdown/release-notes/1.7.2.md
new file mode 100644
index 0000000..e69de29
[axis-axis2-java-rampart] 11/12: Update Axiom version.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 6996e2b8ce8bedf3dc1a2c6b0d2033da7b634653
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Thu Mar 7 23:10:14 2019 +0000
Update Axiom version.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 603fafd..a885a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -622,7 +622,7 @@
<properties>
<axis2.version>1.7.10-SNAPSHOT</axis2.version>
- <axiom.version>1.2.22-SNAPSHOT</axiom.version>
+ <axiom.version>1.2.23-SNAPSHOT</axiom.version>
<wss4j.version>1.6.16</wss4j.version>
<opensaml.version>2.5.1-1</opensaml.version>
[axis-axis2-java-rampart] 02/12: Switch Axiom and Axis2 to snapshot
versions.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit b9a734eeb00318cfb1fe4e3d6535de18fd7aff25
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun Jul 30 22:59:34 2017 +0000
Switch Axiom and Axis2 to snapshot versions.
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 301379a..d87acf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,8 +604,8 @@
</modules>
<properties>
- <axis2.version>1.7.6</axis2.version>
- <axiom.version>1.2.20</axiom.version>
+ <axis2.version>1.7.7-SNAPSHOT</axis2.version>
+ <axiom.version>1.2.21-SNAPSHOT</axiom.version>
<wss4j.version>1.6.16</wss4j.version>
<opensaml.version>2.5.1-1</opensaml.version>
[axis-axis2-java-rampart] 05/12: Merge r1806320 and r1826038 to the
1.7 branch.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 6fa2758747e9bde0893f7148965c9b07079b66e0
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Tue Mar 6 20:30:58 2018 +0000
Merge r1806320 and r1826038 to the 1.7 branch.
---
etc/dist.py | 2 +-
modules/distribution/pom.xml | 9 +++++++--
src/site/markdown/download.md.vm | 12 +++++-------
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/etc/dist.py b/etc/dist.py
index 2f17490..1904041 100644
--- a/etc/dist.py
+++ b/etc/dist.py
@@ -35,7 +35,7 @@ if exists(dist_root):
call(["svn", "checkout", "https://dist.apache.org/repos/dist/dev/axis/axis2/java/rampart/", dist_root])
mkdir(dist_dir)
for classifier in [ "bin", "src" ]:
- for suffix in [ "zip", "zip.asc", "zip.md5", "zip.sha1" ]:
+ for suffix in [ "zip", "zip.asc", "zip.sha512" ]:
file = "rampart-dist-" + release + "-" + classifier + "." + suffix
copyfile(join(root_dir, "modules", "distribution", "target", file), join(dist_dir, file))
call(["svn", "add", dist_dir])
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 22b5b57..f9fe12b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -78,14 +78,19 @@
</executions>
</plugin>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
<executions>
<execution>
<goals>
<goal>artifacts</goal>
</goals>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/site/markdown/download.md.vm b/src/site/markdown/download.md.vm
index b970037..32832bc 100644
--- a/src/site/markdown/download.md.vm
+++ b/src/site/markdown/download.md.vm
@@ -26,9 +26,9 @@ release can be found [here](release-notes/${release_version}.html).
The following distributions are available for download:
| Link | Checksums and signatures
---------------------|----------------------------------------------|----------------------------
-Binary distribution | [rampart-dist-${release_version}-bin.zip][1] | [MD5][2] [SHA1][3] [PGP][4]
-Source distribution | [rampart-dist-${release_version}-src.zip][5] | [MD5][6] [SHA1][7] [PGP][8]
+--------------------|----------------------------------------------|-------------------------
+Binary distribution | [rampart-dist-${release_version}-bin.zip][1] | [SHA512][3] [PGP][4]
+Source distribution | [rampart-dist-${release_version}-src.zip][5] | [SHA512][7] [PGP][8]
The binary distribution contains the following Axis2 modules:
@@ -46,12 +46,10 @@ Distributions for older releases can be found in the [archive][12].
All releases are also available as Maven artifacts in the [central repository][13].
[1]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip
-[2]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.md5
-[3]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.sha1
+[3]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.sha512
[4]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-bin.zip.asc
[5]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip
-[6]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.md5
-[7]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.sha1
+[7]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.sha512
[8]: https://www.apache.org/dist/axis/axis2/java/rampart/${release_version}/rampart-dist-${release_version}-src.zip.asc
[9]: http://www.apache.org/dev/release-signing#verifying-signature
[10]: https://www.apache.org/dist/axis/axis2/java/rampart/KEYS