diff --git a/Readme.md b/Readme.md index 09d493eb6..60c7f65c0 100644 --- a/Readme.md +++ b/Readme.md @@ -26,10 +26,23 @@ The discovery providers are responsible for finding the available endpoint descr ## Releasing +### Dry run the release + +```bash +./mvnw clean release:prepare -DreleaseArguments="-DskipTests=true -Dbnd.testing.skip=true" -DdryRun +./mvnw release:perform -DreleaseArguments="-DskipTests=true -Dbnd.testing.skip=true" -DdryRun +# Check the generated poms and cleanup before real release +git add . +git reset --hard +rm release.properties +``` + ### Maven release - ./mvnw clean release:prepare -DskipTests -Darguments=-DskipTests - ./mvnw release:perform -DskipTests -Darguments=-DskipTests +```bash +./mvnw clean release:prepare -DreleaseArguments="-DskipTests=true -Dbnd.testing.skip=true" +./mvnw release:perform -DreleaseArguments="-DskipTests=true -Dbnd.testing.skip=true" +``` This creates a staging repository. After all artifacts are deployed login to the [Apache maven repo](https://repository.apache.org) and close the staging repository. diff --git a/discovery/mdns/pom.xml b/discovery/mdns/pom.xml index e1d069d2a..e0b112b86 100644 --- a/discovery/mdns/pom.xml +++ b/discovery/mdns/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 diff --git a/parent/pom.xml b/parent/pom.xml index 0cf6c2a84..bac69e7b9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -420,6 +420,58 @@ false + + org.apache.rat + apache-rat-plugin + + + verify + + check + + + + + ${project.build.directory}/${project.build.finalName}.rat + false + + **/target/**/* + **/appended-resources/**/* + **/dependency-reduced-pom.xml + **/velocity.log + **/DEPENDENCIES + + **/*.iml + **/*.ipr + **/*.iws + **/.idea/**/* + + **/.project + **/.classpath + **/.settings/** + **/eclipse-classes/**/* + + **/*.MF + + **/xml.xsd + .gitignore + README.md + **/*.cfg + **/README.md + **/Readme.md + **/NOTICE.vm + + **/*.proto + **/*.class + **/*.jar + **/*.zip + **/*.tar.gz + + **/*.properties + **/generated/**/* + + + diff --git a/pom.xml b/pom.xml index 237c4c7b2..4742e4f14 100644 --- a/pom.xml +++ b/pom.xml @@ -58,17 +58,6 @@ itests - - - rat - - - - - - - - install @@ -96,6 +85,7 @@ true forked-path org.apache.aries.rsa-@{project.version} + -Daether.connector.basic.parallelPut=${releaseParallelPut} ${releaseArguments} diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTLSTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTLSTest.java index 7c6f80296..2efc01733 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTLSTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTLSTest.java @@ -1,3 +1,21 @@ +/* + * 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.aries.rsa.provider.tcp; import org.apache.aries.rsa.provider.tcp.myservice.MyService; diff --git a/spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java b/spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java index a8cf8f43b..c02771cfa 100644 --- a/spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java +++ b/spi/src/main/java/org/apache/aries/rsa/annotations/RSADiscoveryProvider.java @@ -1,3 +1,21 @@ +/* + * 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.aries.rsa.annotations; import org.osgi.annotation.bundle.Attribute; diff --git a/spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java b/spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java index cb732afe5..4adcc4e0c 100644 --- a/spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java +++ b/spi/src/main/java/org/apache/aries/rsa/annotations/RSADistributionProvider.java @@ -1,3 +1,21 @@ +/* + * 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.aries.rsa.annotations; import org.osgi.annotation.bundle.Attribute;