Update to work with 3.14.0-04 (#80)

💥

Author: DarthHater

Dockerfile

@@ -1,19 +1,19 @@
-ARG NEXUS_VERSION=3.13.0
+ARG NEXUS_VERSION=3.14.0
 
 FROM maven:3-jdk-8-alpine AS build
-ARG NEXUS_VERSION=3.13.0
-ARG NEXUS_BUILD=01
+ARG NEXUS_VERSION=3.14.0
+ARG NEXUS_BUILD=04
 
 COPY . /nexus-repository-apt/
-RUN cd /nexus-repository-apt/; sed -i "s/3.13.0-01/${NEXUS_VERSION}-${NEXUS_BUILD}/g" pom.xml; \
+RUN cd /nexus-repository-apt/; sed -i "s/3.14.0-04/${NEXUS_VERSION}-${NEXUS_BUILD}/g" pom.xml; \
     mvn;
 
 FROM sonatype/nexus3:$NEXUS_VERSION
-ARG NEXUS_VERSION=3.13.0
-ARG NEXUS_BUILD=01
+ARG NEXUS_VERSION=3.14.0
+ARG NEXUS_BUILD=04
 # Will not seem to work in sed without some magick
-ARG APT_VERSION=1.0.8
-ARG COMP_VERSION=1.16.1
+ARG APT_VERSION=1.0.9
+ARG COMP_VERSION=1.18
 ARG XZ_VERSION=1.8
 ARG APT_TARGET=/opt/sonatype/nexus/system/net/staticsnow/nexus-repository-apt/${APT_VERSION}/
 USER root

README.md

@@ -10,6 +10,7 @@ Compatibility Matrix:
 | v1.0.5         | 3.9.0                    |
 | v1.0.7         | 3.11.0                   |
 | v1.0.8         | 3.13.0                   |
+| v1.0.9         | 3.14.0                   |
 
 ### Build
 * Clone the project:
@@ -23,11 +24,11 @@ Compatibility Matrix:
   ```
 ### Build with docker and create an image based on nexus repository 3
 
-``` docker build -t nexus-repository-apt:3.13.0 .```
+``` docker build -t nexus-repository-apt:3.14.0 .```
 
 ### Run a docker container from that image
 
-``` docker run -d -p 8081:8081 --name nexus-repo nexus-repository-apt:3.13.0 ```
+``` docker run -d -p 8081:8081 --name nexus-repo nexus-repository-apt:3.14.0 ```
 
 For further information like how to persist volumes check out [the GitHub Repo for the official Nexus Repository 3 Docker image](https://github.com/sonatype/docker-nexus3).
 
@@ -45,19 +46,19 @@ The application will now be available from your browser at http://localhost:8081
   ./nexus stop
   ```
 
-* Copy the bundle into `<nexus_dir>/system/net/staticsnow/nexus-repository-apt/1.0.8/nexus-repository-apt-1.0.8.jar`
+* Copy the bundle into `<nexus_dir>/system/net/staticsnow/nexus-repository-apt/1.0.9/nexus-repository-apt-1.0.9.jar`
 * Make the following additions marked with + to `<nexus_dir>/system/org/sonatype/nexus/assemblies/nexus-core-feature/3.x.y/nexus-core-feature-3.x.y-features.xml`
    ```
-         <feature prerequisite="false" dependency="false">nexus-repository-maven</feature>
-   +     <feature prerequisite="false" dependency="false">nexus-repository-apt</feature>
+         <feature version="x.y.z" prerequisite="false" dependency="false">nexus-repository-maven</feature>
+   +     <feature version="1.0.9" prerequisite="false" dependency="false">nexus-repository-apt</feature>
      </feature>
    ```
    And
    ```
-   + <feature name="nexus-repository-apt" description="net.staticsnow:nexus-repository-apt" version="1.0.8">
+   + <feature name="nexus-repository-apt" description="net.staticsnow:nexus-repository-apt" version="1.0.9">
    +     <details>net.staticsnow:nexus-repository-apt</details>
-   +     <bundle>mvn:net.staticsnow/nexus-repository-apt/1.0.8</bundle>
-   +     <bundle>mvn:org.apache.commons/commons-compress/1.16.1</bundle>
+   +     <bundle>mvn:net.staticsnow/nexus-repository-apt/1.0.9</bundle>
+   +     <bundle>mvn:org.apache.commons/commons-compress/1.18</bundle>
    +     <bundle>mvn:org.tukaani/xz/1.8</bundle>
    + </feature>
     </features>

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.sonatype.nexus.plugins</groupId>
     <artifactId>nexus-plugins</artifactId>
-    <version>3.13.0-01</version>
+    <version>3.14.0-04</version>
   </parent>
   <groupId>net.staticsnow</groupId>
   <artifactId>nexus-repository-apt</artifactId>
   <name>${project.groupId}:${project.artifactId}</name>
-  <version>1.0.8</version>
+  <version>1.0.9</version>
   <packaging>bundle</packaging>
 
   <dependencies>

src/main/java/net/staticsnow/nexus/repository/apt/internal/hosted/AptHostedComponentMaintenanceFacet.java

@@ -15,6 +15,8 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.util.Collections;
+import java.util.Set;
 
 import javax.inject.Named;
 
@@ -36,14 +38,14 @@ public class AptHostedComponentMaintenanceFacet
 {
   @Transactional(retryOn = ONeedRetryException.class)
   @Override
-  protected void deleteAssetTx(EntityId assetId, boolean deleteBlobs) {
+  protected Set<String> deleteAssetTx(EntityId assetId, boolean deleteBlobs) {
     StorageTx tx = UnitOfWork.currentTx();
     Asset asset = tx.findAsset(assetId, tx.findBucket(getRepository()));
     if (asset == null) {
-      return;
+      return Collections.emptySet();
     }
     String assetKind = asset.formatAttributes().get(P_ASSET_KIND, String.class);
-    super.deleteAssetTx(assetId, deleteBlobs);
+    Set<String> result = super.deleteAssetTx(assetId, deleteBlobs);
     if ("DEB".equals(assetKind)) {
       try {
         getRepository().facet(AptHostedFacet.class)
@@ -56,5 +58,6 @@ protected void deleteAssetTx(EntityId assetId, boolean deleteBlobs) {
         throw new RuntimeException(e);
       }
     }
+    return result;
   }
 }