Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 03471d6

Browse files
authored
Update version to 3.9.0-01 (#36)
Bump up the jams
1 parent b36064a commit 03471d6

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
ARG NEXUS_VERSION=3.8.0
1+
ARG NEXUS_VERSION=3.9.0
22

33
FROM maven:3-jdk-8-alpine AS build
4-
ARG NEXUS_VERSION=3.8.0
5-
ARG NEXUS_BUILD=02
4+
ARG NEXUS_VERSION=3.9.0
5+
ARG NEXUS_BUILD=01
66

77
COPY . /nexus-repository-apt/
8-
RUN cd /nexus-repository-apt/; sed -i "s/3.8.0-02/${NEXUS_VERSION}-${NEXUS_BUILD}/g" pom.xml; \
8+
RUN cd /nexus-repository-apt/; sed -i "s/3.9.0-01/${NEXUS_VERSION}-${NEXUS_BUILD}/g" pom.xml; \
99
mvn;
1010

1111
FROM sonatype/nexus3:$NEXUS_VERSION
12-
ARG NEXUS_VERSION=3.8.0
13-
ARG NEXUS_BUILD=02
12+
ARG NEXUS_VERSION=3.9.0
13+
ARG NEXUS_BUILD=01
1414
# Will not seem to work in sed without some magick
15-
ARG APT_VERSION=1.0.4
15+
ARG APT_VERSION=1.0.5
1616
ARG APT_TARGET=/opt/sonatype/nexus/system/net/staticsnow/nexus-repository-apt/${APT_VERSION}/
1717
USER root
1818
RUN mkdir -p ${APT_TARGET}; \
1919
sed -i 's@nexus-repository-npm</feature>@nexus-repository-npm</feature>\n <feature prerequisite="false" dependency="false">nexus-repository-apt</feature>@g' /opt/sonatype/nexus/system/com/sonatype/nexus/assemblies/nexus-oss-feature/${NEXUS_VERSION}-${NEXUS_BUILD}/nexus-oss-feature-${NEXUS_VERSION}-${NEXUS_BUILD}-features.xml; \
20-
sed -i 's@<feature name="nexus-repository-npm"@<feature name="nexus-repository-apt" description="net.staticsnow:nexus-repository-apt" version="1.0.4">\n <details>net.staticsnow:nexus-repository-apt</details>\n <bundle>mvn:net.staticsnow/nexus-repository-apt/1.0.4</bundle>\n </feature>\n <feature name="nexus-repository-npm"@g' /opt/sonatype/nexus/system/com/sonatype/nexus/assemblies/nexus-oss-feature/${NEXUS_VERSION}-${NEXUS_BUILD}/nexus-oss-feature-${NEXUS_VERSION}-${NEXUS_BUILD}-features.xml;
20+
sed -i 's@<feature name="nexus-repository-npm"@<feature name="nexus-repository-apt" description="net.staticsnow:nexus-repository-apt" version="1.0.5">\n <details>net.staticsnow:nexus-repository-apt</details>\n <bundle>mvn:net.staticsnow/nexus-repository-apt/1.0.5</bundle>\n </feature>\n <feature name="nexus-repository-npm"@g' /opt/sonatype/nexus/system/com/sonatype/nexus/assemblies/nexus-oss-feature/${NEXUS_VERSION}-${NEXUS_BUILD}/nexus-oss-feature-${NEXUS_VERSION}-${NEXUS_BUILD}-features.xml;
2121
COPY --from=build /nexus-repository-apt/target/nexus-repository-apt-${APT_VERSION}.jar ${APT_TARGET}
2222
USER nexus

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Nexus repository APT plugin
22

3-
*Version 1.0.4 (master) requires Nexus 3.8.0 - for older Nexus versions use tag 1.0.2*
3+
*Version 1.0.5 (master) requires Nexus 3.9.0 - for older Nexus versions use tag 1.0.2*
44

55
### Build
66
* Clone the project:
@@ -14,11 +14,11 @@
1414
```
1515
### Build with docker and create an image based on nexus repository 3
1616

17-
``` docker build -t nexus-repository-apt:3.8.0 .```
17+
``` docker build -t nexus-repository-apt:3.9.0 .```
1818

1919
### Run a docker container from that image
2020

21-
``` docker run -d -p 8081:8081 --name nexus-repository-apt:3.8.0 ```
21+
``` docker run -d -p 8081:8081 --name nexus-repository-apt:3.9.0 ```
2222

2323
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).
2424

@@ -36,7 +36,7 @@ The application will now be available from your browser at http://localhost:8081
3636
./nexus stop
3737
```
3838

39-
* Copy the bundle into `<nexus_dir>/system/net/staticsnow/nexus-repository-apt/1.0.4/nexus-repository-apt-1.0.4.jar`
39+
* Copy the bundle into `<nexus_dir>/system/net/staticsnow/nexus-repository-apt/1.0.5/nexus-repository-apt-1.0.5.jar`
4040
* Make the following additions marked with + to `<nexus_dir>/system/com/sonatype/nexus/assemblies/nexus-oss-feature/3.x.y/nexus-oss-feature-3.x.y-features.xml` (or `<nexus_dir>/system/com/sonatype/nexus/assemblies/nexus-pro-feature/3.x.y/nexus-pro-feature-3.x.y-features.xml` if using the Professional version)
4141
```
4242
<feature prerequisite="false" dependency="false">nexus-repository-rubygems</feature>
@@ -46,9 +46,9 @@ The application will now be available from your browser at http://localhost:8081
4646
```
4747
And
4848
```
49-
+ <feature name="nexus-repository-apt" description="net.staticsnow:nexus-repository-apt" version="1.0.4">
49+
+ <feature name="nexus-repository-apt" description="net.staticsnow:nexus-repository-apt" version="1.0.5">
5050
+ <details>net.staticsnow:nexus-repository-apt</details>
51-
+ <bundle>mvn:net.staticsnow/nexus-repository-apt/1.0.4</bundle>
51+
+ <bundle>mvn:net.staticsnow/nexus-repository-apt/1.0.5</bundle>
5252
+ </feature>
5353
</features>
5454
```

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.sonatype.nexus.plugins</groupId>
77
<artifactId>nexus-plugins</artifactId>
8-
<version>3.8.0-02</version>
8+
<version>3.9.0-01</version>
99
</parent>
1010
<groupId>net.staticsnow</groupId>
1111
<artifactId>nexus-repository-apt</artifactId>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public class AptHostedComponentMaintenanceFacet
3636
{
3737
@Transactional(retryOn = ONeedRetryException.class)
3838
@Override
39-
protected void deleteAssetTx(EntityId assetId) {
39+
protected void deleteAssetTx(EntityId assetId, boolean deleteBlobs) {
4040
StorageTx tx = UnitOfWork.currentTx();
4141
Asset asset = tx.findAsset(assetId, tx.findBucket(getRepository()));
4242
if (asset == null) {
4343
return;
4444
}
4545
String assetKind = asset.formatAttributes().get(P_ASSET_KIND, String.class);
46-
super.deleteAssetTx(assetId);
46+
super.deleteAssetTx(assetId, deleteBlobs);
4747
if ("DEB".equals(assetKind)) {
4848
try {
4949
getRepository().facet(AptHostedFacet.class)

0 commit comments

Comments
 (0)