Skip to content

Commit 43b64ff

Browse files
jknackjknack
committed
Build fix for linux + license headers
1 parent 70f30a0 commit 43b64ff

8 files changed

Lines changed: 138 additions & 12 deletions

File tree

‎jooby-assets-jsass/src/main/java/org/jooby/assets/Sass.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.jooby.assets;
220

321
import java.io.File;

‎jooby-assets-jsass/src/test/java/org/jooby/assets/JSassTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,24 +167,24 @@ public void importDirectiveWithExt() throws Exception {
167167

168168
@Test
169169
public void inlineSourceMap() throws Exception {
170-
assertEquals(".foo {\n" +
170+
String output = new Sass().set("sourcemap", "inline")
171+
.process("/styles.scss",
172+
"@import 'foo.scss';\n$font-stack: Helvetica, sans-serif;\n" +
173+
"$primary-color: #333;\n" +
174+
"\n" +
175+
"body {\n" +
176+
" font: 100% $font-stack;\n" +
177+
" color: $primary-color;\n" +
178+
"}\n",
179+
ConfigFactory.empty());
180+
assertTrue(output.startsWith(".foo {\n" +
171181
" color: #fff; }\n" +
172182
"\n" +
173183
"body {\n" +
174184
" font: 100% Helvetica, sans-serif;\n" +
175185
" color: #333; }\n" +
176186
"\n" +
177-
"/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiLi4vLi4vLi4vLi4vLi4vc3R5bGVzLmNzcyIsCgkic291cmNlcyI6IFsKCQkiLi4vLi4vLi4vLi4vLi4vc3R5bGVzLnNjc3MiLAoJCSIuLi8uLi8uLi8uLi8uLi9zdHlsZXMuc2Nzcy9KU0FTU19DVVNUT00uc2NzcyIsCgkJInRhcmdldC90ZXN0LWNsYXNzZXMvZm9vLnNjc3MvSlNBU1NfUFJFX0lNUE9SVC5zY3NzIiwKCQkidGFyZ2V0L3Rlc3QtY2xhc3Nlcy9mb28uc2NzcyIsCgkJInRhcmdldC90ZXN0LWNsYXNzZXMvZm9vLnNjc3MvSlNBU1NfUE9TVF9JTVBPUlQuc2NzcyIKCV0sCgkibWFwcGluZ3MiOiAiQUdBQSxBQUFBLElBQUksQ0FBQztFQUNILEtBQUssRUFBRSxJQUFLLEdBQ2I7O0FIRUQsQUFBQSxJQUFJLENBQUM7RUFDSCxJQUFJLEVBQUUsSUFBSSxDQUpJLFNBQVMsRUFBRSxVQUFVO0VBS25DLEtBQUssRUFKUyxJQUFJLEdBS25CIiwKCSJuYW1lcyI6IFtdCn0= */",
178-
new Sass().set("sourcemap", "inline")
179-
.process("/styles.scss",
180-
"@import 'foo.scss';\n$font-stack: Helvetica, sans-serif;\n" +
181-
"$primary-color: #333;\n" +
182-
"\n" +
183-
"body {\n" +
184-
" font: 100% $font-stack;\n" +
185-
" color: $primary-color;\n" +
186-
"}\n",
187-
ConfigFactory.empty()));
187+
"/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiLi4vLi4v"));
188188
}
189189

190190
@Test

‎jooby-assets/src/main/java/org/jooby/assets/AssetClassLoader.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.jooby.assets;
220

321
import static java.util.Objects.requireNonNull;

‎jooby-assets/src/main/java/org/jooby/assets/AssetOptions.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.jooby.assets;
220

321
import static java.util.Objects.requireNonNull;

‎jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyPush.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.jooby.internal.jetty;
220

321
import java.util.Map;

‎jooby-netty/src/main/java/org/jooby/internal/netty/NettyPush.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.jooby.internal.netty;
220

321
import java.util.Map;

‎jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowPush.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.jooby.internal.undertow;
220

321
import java.util.Map;

‎jooby/src/main/java/org/jooby/spi/NativePushPromise.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
119
package org.jooby.spi;
220

321
import java.util.Map;

0 commit comments

Comments
 (0)